[Php72] Handle crash on CreateFunctionToAnonymousFunctionRector on qu…

…oted variable arg concat (#3300) Co-authored-by: GitHub Action <action@github.com>
rectorphp · Jan 22, 2023 · 93b225a · 93b225a
1 parent d2a553c
commit 93b225a
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 6 deletions.
diff --git a/...ncCall/CreateFunctionToAnonymousFunctionRector/Fixture/quoted_variable_arg_concat.php.inc b/...ncCall/CreateFunctionToAnonymousFunctionRector/Fixture/quoted_variable_arg_concat.php.inc
@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Tests\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector\Fixture;
+
+class QuotedVariableArgConcat
+{
+    public function pk_gen()
+    {
+        $argL = func_get_args();
+        $strFunc = array_shift($argL);
+        $strArgs = join(', ',$argL);
+
+        return create_function('$v', 'return '.$strFunc.'($v'.$strArgs.');');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector\Fixture;
+
+class QuotedVariableArgConcat
+{
+    public function pk_gen()
+    {
+        $argL = func_get_args();
+        $strFunc = array_shift($argL);
+        $strArgs = join(', ',$argL);
+
+        return function ($v) use ($strFunc, $strArgs) {
+            return $strFunc($v . $strArgs);
+        };
+    }
+}
+
+?>
diff --git a/...cCall/CreateFunctionToAnonymousFunctionRector/Fixture/quoted_variable_arg_concat2.php.inc b/...cCall/CreateFunctionToAnonymousFunctionRector/Fixture/quoted_variable_arg_concat2.php.inc
@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Tests\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector\Fixture;
+
+class QuotedVariableArgConcat2
+{
+    public function pk_gen()
+    {
+        $argL = func_get_args();
+        $strFunc = array_shift($argL);
+        $strArgs = join(', ',$argL);
+
+        return create_function('$v', 'return '.$strFunc.'('.$strArgs.'$v);');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector\Fixture;
+
+class QuotedVariableArgConcat2
+{
+    public function pk_gen()
+    {
+        $argL = func_get_args();
+        $strFunc = array_shift($argL);
+        $strArgs = join(', ',$argL);
+
+        return function ($v) use ($strFunc, $strArgs) {
+            return $strFunc($strArgs . $v);
+        };
+    }
+}
+
+?>
diff --git a/src/PhpParser/Parser/InlineCodeParser.php b/src/PhpParser/Parser/InlineCodeParser.php
@@ -8,12 +8,14 @@
 use Nette\Utils\Strings;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp\Concat;
+use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Scalar\Encapsed;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt;
 use Rector\Core\Contract\PhpParser\NodePrinterInterface;
 use Rector\Core\PhpParser\Node\Value\ValueResolver;
 use Rector\Core\Util\StringUtils;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator;
 
 final class InlineCodeParser
@@ -113,14 +115,31 @@ public function stringify(Expr $expr): string
         }
 
         if ($expr instanceof Concat) {
-            $string = $this->stringify($expr->left) . $this->stringify($expr->right);
-            return Strings::replace(
-                $string,
-                self::VARIABLE_IN_SINGLE_QUOTED_REGEX,
-                static fn (array $match) => $match['variable']
-            );
+            return $this->resolveConcatValue($expr);
         }
 
         return $this->nodePrinter->print($expr);
     }
+
+    private function resolveConcatValue(Concat $concat): string
+    {
+        if ($concat->left instanceof Concat &&
+            $concat->right instanceof String_ && str_starts_with($concat->right->value, '$')) {
+            $concat->right->value = '.' . $concat->right->value;
+        }
+
+        if ($concat->right instanceof String_ && str_starts_with($concat->right->value, '($')) {
+            $node = $concat->getAttribute(AttributeKey::NEXT_NODE);
+            if ($node instanceof Variable) {
+                $concat->right->value .= '.';
+            }
+        }
+
+        $string = $this->stringify($concat->left) . $this->stringify($concat->right);
+        return Strings::replace(
+            $string,
+            self::VARIABLE_IN_SINGLE_QUOTED_REGEX,
+            static fn (array $match) => $match['variable']
+        );
+    }
 }