Updated Rector to commit 8ec3a2722663bd6cc8e5d0714178ba03bc43056f

8ec3a27226 [1.0] Add public method BetterNodeFinder::resolvePreviousNode() and BetterNodeFinder::resolveNextNode() (#3896)

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'e1f19806fb24f507172f8e8b17ebd51c159b3fe6';
+    public const PACKAGE_VERSION = '8ec3a2722663bd6cc8e5d0714178ba03bc43056f';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-05-21 16:29:38';
+    public const RELEASE_DATE = '2023-05-22 00:24:55';
     /**
      * @var int
      */

src/Kernel/RectorKernel.php

@@ -15,7 +15,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v16';
+    private const CACHE_KEY = 'v17';
     /**
      * @var \Symfony\Component\DependencyInjection\ContainerInterface|null
      */

src/PhpParser/Node/BetterNodeFinder.php

@@ -521,7 +521,7 @@ final class BetterNodeFinder
             /** @var StmtsAwareInterface|ClassLike|Declare_ $parentNode */
             $nextNode = $this->resolveNeighborNextStmt($parentNode, $node, $currentStmtKey);
         } else {
-            $nextNode = $this->resolveNextNodeFromOtherNode($node);
+            $nextNode = $this->resolveNextNode($node);
         }
         if (!$nextNode instanceof Node) {
             return null;
@@ -618,9 +618,11 @@ final class BetterNodeFinder
         return $newStmts[$currentStmtKey];
     }
     /**
-     * Resolve previous node from not an Stmt, eg: Expr, Identifier, Name, etc
+     * @api
+     *
+     * Resolve previous node from any Node, eg: Expr, Identifier, Name, etc
      */
-    private function resolvePreviousNodeFromOtherNode(Node $node) : ?Node
+    public function resolvePreviousNode(Node $node) : ?Node
     {
         $currentStmt = $this->resolveCurrentStatement($node);
         // just added
@@ -647,9 +649,11 @@ final class BetterNodeFinder
         return \end($nodes);
     }
     /**
-     * Resolve next node from not an Stmt, eg: Expr, Identifier, Name, etc
+     * @api
+     *
+     * Resolve next node from any Node, eg: Expr, Identifier, Name, etc
      */
-    private function resolveNextNodeFromOtherNode(Node $node) : ?Node
+    public function resolveNextNode(Node $node) : ?Node
     {
         $currentStmt = $this->resolveCurrentStatement($node);
         // just added
@@ -696,7 +700,7 @@ final class BetterNodeFinder
             /** @var StmtsAwareInterface|ClassLike|Declare_ $parentNode */
             $previousNode = $parentNode->stmts[$currentStmtKey - 1] ?? null;
         } else {
-            $previousNode = $this->resolvePreviousNodeFromOtherNode($node);
+            $previousNode = $this->resolvePreviousNode($node);
         }
         if (!$previousNode instanceof Node) {
             return null;

src/PhpParser/Parser/InlineCodeParser.php

@@ -3,6 +3,7 @@
 declare (strict_types=1);
 namespace Rector\Core\PhpParser\Parser;
 
+use PhpParser\Node\Expr\Variable;
 use RectorPrefix202305\Nette\Utils\FileSystem;
 use RectorPrefix202305\Nette\Utils\Strings;
 use PhpParser\Node\Expr;
@@ -11,10 +12,9 @@ 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\BetterNodeFinder;
 use Rector\Core\PhpParser\Node\Value\ValueResolver;
-use Rector\Core\Provider\CurrentFileProvider;
 use Rector\Core\Util\StringUtils;
-use Rector\Core\ValueObject\Application\File;
 final class InlineCodeParser
 {
     /**
@@ -69,15 +69,15 @@ final class InlineCodeParser
     private $valueResolver;
     /**
      * @readonly
-     * @var \Rector\Core\Provider\CurrentFileProvider
+     * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
      */
-    private $currentFileProvider;
-    public function __construct(NodePrinterInterface $nodePrinter, \Rector\Core\PhpParser\Parser\SimplePhpParser $simplePhpParser, ValueResolver $valueResolver, CurrentFileProvider $currentFileProvider)
+    private $betterNodeFinder;
+    public function __construct(NodePrinterInterface $nodePrinter, \Rector\Core\PhpParser\Parser\SimplePhpParser $simplePhpParser, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder)
     {
         $this->nodePrinter = $nodePrinter;
         $this->simplePhpParser = $simplePhpParser;
         $this->valueResolver = $valueResolver;
-        $this->currentFileProvider = $currentFileProvider;
+        $this->betterNodeFinder = $betterNodeFinder;
     }
     /**
      * @return Stmt[]
@@ -138,11 +138,9 @@ final class InlineCodeParser
         if ($concat->left instanceof Concat && $concat->right instanceof String_ && \strncmp($concat->right->value, '$', \strlen('$')) === 0) {
             $concat->right->value = '.' . $concat->right->value;
         }
-        $file = $this->currentFileProvider->getFile();
-        if ($concat->right instanceof String_ && \strncmp($concat->right->value, '($', \strlen('($')) === 0 && $file instanceof File) {
-            $oldTokens = $file->getOldTokens();
-            $endTokenPos = $concat->right->getEndTokenPos();
-            if (isset($oldTokens[$endTokenPos][1]) && \strncmp((string) $oldTokens[$endTokenPos][1], "'(\$", \strlen("'(\$")) === 0) {
+        if ($concat->right instanceof String_ && \strncmp($concat->right->value, '($', \strlen('($')) === 0) {
+            $node = $this->betterNodeFinder->resolveNextNode($concat);
+            if ($node instanceof Variable) {
                 $concat->right->value .= '.';
             }
         }

vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit6d2634a272cd261cf6d27f0d423db670::getLoader();
+return ComposerAutoloaderInit8e86438ae7a33bee4febe2fa6c3d4cce::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit6d2634a272cd261cf6d27f0d423db670
+class ComposerAutoloaderInit8e86438ae7a33bee4febe2fa6c3d4cce
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ class ComposerAutoloaderInit6d2634a272cd261cf6d27f0d423db670
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit6d2634a272cd261cf6d27f0d423db670', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit8e86438ae7a33bee4febe2fa6c3d4cce', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit6d2634a272cd261cf6d27f0d423db670', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit8e86438ae7a33bee4febe2fa6c3d4cce', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit6d2634a272cd261cf6d27f0d423db670::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit8e86438ae7a33bee4febe2fa6c3d4cce::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit6d2634a272cd261cf6d27f0d423db670::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit8e86438ae7a33bee4febe2fa6c3d4cce::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit6d2634a272cd261cf6d27f0d423db670
+class ComposerStaticInit8e86438ae7a33bee4febe2fa6c3d4cce
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -3115,9 +3115,9 @@ class ComposerStaticInit6d2634a272cd261cf6d27f0d423db670
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit6d2634a272cd261cf6d27f0d423db670::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit6d2634a272cd261cf6d27f0d423db670::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit6d2634a272cd261cf6d27f0d423db670::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit8e86438ae7a33bee4febe2fa6c3d4cce::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit8e86438ae7a33bee4febe2fa6c3d4cce::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit8e86438ae7a33bee4febe2fa6c3d4cce::$classMap;
 
         }, null, ClassLoader::class);
     }