Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Feat: Remove check before get global (!empty, isset)

Browse Source
This commit is contained in:
Dev2a
2023-10-08 22:52:10 +02:00
parent dc4e17a353
commit 2be26dfdf5
1 changed files with 94 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,19 @@
namespace Dolibarr\Rector\Renaming;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
use PhpParser\Node\Expr\BinaryOp\Equal;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Empty_;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Isset_;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Name;
use PhpParser\Node\Scalar\String_;
use Rector\Core\NodeManipulator\BinaryOpManipulator;
use Rector\Core\Rector\AbstractRector;
use Rector\Php71\ValueObject\TwoNodeMatch;
use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -11,6 +23,16 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
class GlobalToFunction extends AbstractRector
{
/**
* @var \Rector\Core\NodeManipulator\BinaryOpManipulator
*/
private BinaryOpManipulator $binaryOpManipulator;
public function __construct(BinaryOpManipulator $binaryOpManipulator)
{
$this->binaryOpManipulator = $binaryOpManipulator;
}
/**
* @throws PoorDocumentationException
*/
@@ -25,31 +47,32 @@ class GlobalToFunction extends AbstractRector
public function getNodeTypes(): array
{
return [Node\Expr\BinaryOp\Equal::class];
return [Equal::class, BooleanAnd::class];
}
/**
* @param \PhpParser\Node $node
* @return \PhpParser\Node\Expr\BinaryOp\Equal|void
* @param Node $node
* @return Equal|void
*/
public function refactor(Node $node)
{
if (!$node instanceof Node\Expr\BinaryOp\Equal) {
if ($node instanceof BooleanAnd) {
$nodes = $this->resolveTwoNodeMatch($node);
if (!isset($nodes)) {
return;
}
/** @var Equal $node */
$node = $nodes->getFirstExpr();
}
if (!$node instanceof Equal) {
return;
};
if (!$node->left instanceof Node\Expr\PropertyFetch) {
return;
}
if (!$this->isName($node->left->var, 'global')) {
return;
}
$global = $node->left->var;
if (!$global instanceof Node\Expr\PropertyFetch) {
return;
}
if (!$this->isName($global->var, 'conf')) {
if (!$this->isGlobalVar($node->left)) {
return;
}
switch ($node->right->getType()) {
case 'Scalar_LNumber':
$funcName = 'getDolGlobalInt';
@@ -65,12 +88,64 @@ class GlobalToFunction extends AbstractRector
if (empty($constName)) {
return;
}
return new Node\Expr\BinaryOp\Equal(
new Node\Expr\FuncCall(
new Node\Name($funcName),
[new Node\Arg(new Node\Scalar\String_($constName))]
return new Equal(
new FuncCall(
new Name($funcName),
[new Arg(new String_($constName))]
),
$node->right
);
}
/**
* Get nodes with check empty
* @param BooleanAnd $booleanAnd
* @return TwoNodeMatch|null
*/
private function resolveTwoNodeMatch(BooleanAnd $booleanAnd): ?TwoNodeMatch
{
return $this->binaryOpManipulator->matchFirstAndSecondConditionNode(
$booleanAnd,
// $conf->global == $value
function (Node $node): bool {
if (!$node instanceof Equal) {
return \false;
}
return $this->isGlobalVar($node->left);
},
// !empty(...) || isset(...)
function (Node $node): bool {
if ($node instanceof BooleanNot && $node->expr instanceof Empty_) {
return $this->isGlobalVar($node->expr->expr);
}
if (!$node instanceof Isset_) {
return $this->isGlobalVar($node);
}
return \true;
}
);
}
/**
* Check node is global access
* @param $node
* @return bool
*/
private function isGlobalVar($node)
{
if (!$node instanceof PropertyFetch) {
return false;
}
if (!$this->isName($node->var, 'global')) {
return false;
}
$global = $node->var;
if (!$global instanceof PropertyFetch) {
return false;
}
if (!$this->isName($global->var, 'conf')) {
return false;
}
return true;
}
}