Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 00:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

New: Add concat et array index fetch (#26188)

Browse Source
This commit is contained in:
dev2a
2023-10-11 17:58:28 +02:00
committed by GitHub
parent 72ae107471
commit 205a863aef
1 changed files with 73 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
dev/tools/rector/src/Renaming/GlobalToFunction.php
View File

@@ -4,7 +4,9 @@ namespace Dolibarr\Rector\Renaming;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
use PhpParser\Node\Expr\BinaryOp\Concat;
use PhpParser\Node\Expr\BinaryOp\Equal;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Empty_;
@@ -28,12 +30,12 @@ class GlobalToFunction extends AbstractRector
/**
* @var \Rector\Core\NodeManipulator\BinaryOpManipulator
*/
private BinaryOpManipulator $binaryOpManipulator;
private $binaryOpManipulator;
/**
* Constructor
*
* @param BinaryOpManipulator $binaryOpManipulator The $binaryOpManipulator
* @param BinaryOpManipulator $binaryOpManipulator The $binaryOpManipulator
*/
public function __construct(BinaryOpManipulator $binaryOpManipulator)
{
@@ -51,7 +53,7 @@ class GlobalToFunction extends AbstractRector
return new RuleDefinition(
'Change $conf->global to getDolGlobal',
[new CodeSample('$conf->global->CONSTANT',
'getDolGlobalInt(\'CONSTANT\')'
'getDolGlobalInt(\'CONSTANT\')'
)]);
}
@@ -62,17 +64,61 @@ class GlobalToFunction extends AbstractRector
*/
public function getNodeTypes(): array
{
return [Equal::class, BooleanAnd::class];
return [Equal::class, BooleanAnd::class, Concat::class, ArrayDimFetch::class];
}
/**
* refactor
*
* @param Node $node A node
* @return Equal|void
* @param Node $node A node
* @return Equal|Concat|ArrayDimFetch|void
*/
public function refactor(Node $node)
{
if ($node instanceof Node\Expr\ArrayDimFetch) {
if (!isset($node->dim)) {
return;
}
if ($this->isGlobalVar($node->dim)) {
$constName = $this->getConstName($node->dim);
if (empty($constName)) {
return;
}
$node->dim = new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
);
}
return $node;
}
if ($node instanceof Concat) {
if ($this->isGlobalVar($node->left)) {
$constName = $this->getConstName($node->left);
if (empty($constName)) {
return;
}
$leftConcat = new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
);
$rightConcat = $node->right;
}
if ($this->isGlobalVar($node->right)) {
$constName = $this->getConstName($node->right);
if (empty($constName)) {
return;
}
$rightConcat = new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
);
$leftConcat = $node->left;
}
if (!isset($leftConcat, $rightConcat)) {
return;
}
return new Concat($leftConcat, $rightConcat);
}
if ($node instanceof BooleanAnd) {
$nodes = $this->resolveTwoNodeMatch($node);
if (!isset($nodes)) {
@@ -100,14 +146,14 @@ class GlobalToFunction extends AbstractRector
default:
return;
}
$constName = $this->getName($node->left);
$constName = $this->getConstName($node->left);
if (empty($constName)) {
return;
}
return new Equal(
new FuncCall(
new Name($funcName),
[new Arg(new String_($constName))]
[new Arg($constName)]
),
$node->right
);
@@ -116,8 +162,8 @@ class GlobalToFunction extends AbstractRector
/**
* Get nodes with check empty
*
* @param BooleanAnd $booleanAnd A BooleandAnd
* @return TwoNodeMatch|null
* @param BooleanAnd $booleanAnd A BooleandAnd
* @return TwoNodeMatch|null
*/
private function resolveTwoNodeMatch(BooleanAnd $booleanAnd): ?TwoNodeMatch
{
@@ -146,7 +192,7 @@ class GlobalToFunction extends AbstractRector
/**
* Check node is global access
*
* @param $node A node
* @param Node $node A node
* @return bool
*/
private function isGlobalVar($node)
@@ -166,4 +212,20 @@ class GlobalToFunction extends AbstractRector
}
return true;
}
/**
* @param Node $node node to be parsed
* @return Node|void
*/
private function getConstName($node)
{
if ($node instanceof PropertyFetch && $node->name instanceof Node\Expr) {
return $node->name;
}
$name = $this->getName($node);
if (empty($name)) {
return;
}
return new String_($name);
}
}