Updated Rector to commit d29aae07e40b8d640a6c8b5c0edbad3026b1fb52

d29aae07e4 [Scoped] Fix scoped build for casted array_key_last (#1475)

rules/Php80/Rector/Class_/StringableForToStringRector.php

@@ -4,14 +4,20 @@ declare (strict_types=1);
 namespace Rector\Php80\Rector\Class_;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Cast\String_ as CastString_;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Return_;
+use PHPStan\Type\StringType;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\MethodName;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
+use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -31,9 +37,15 @@ final class StringableForToStringRector extends \Rector\Core\Rector\AbstractRect
      * @var \Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer
      */
     private $familyRelationsAnalyzer;
-    public function __construct(\Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer $familyRelationsAnalyzer)
+    /**
+     * @readonly
+     * @var \Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer
+     */
+    private $returnTypeInferer;
+    public function __construct(\Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer $familyRelationsAnalyzer, \Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer $returnTypeInferer)
     {
         $this->familyRelationsAnalyzer = $familyRelationsAnalyzer;
+        $this->returnTypeInferer = $returnTypeInferer;
     }
     public function provideMinPhpVersion() : int
     {
@@ -83,6 +95,10 @@ CODE_SAMPLE
         if (\in_array(self::STRINGABLE, $classLikeAncestorNames, \true)) {
             return null;
         }
+        $returnType = $this->returnTypeInferer->inferFunctionLike($toStringClassMethod);
+        if (!$returnType instanceof \PHPStan\Type\StringType) {
+            $this->processNotStringType($toStringClassMethod);
+        }
         // add interface
         $node->implements[] = new \PhpParser\Node\Name\FullyQualified(self::STRINGABLE);
         // add return type
@@ -91,4 +107,30 @@ CODE_SAMPLE
         }
         return $node;
     }
+    private function processNotStringType(\PhpParser\Node\Stmt\ClassMethod $toStringClassMethod) : void
+    {
+        $hasReturn = $this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($toStringClassMethod, \PhpParser\Node\Stmt\Return_::class);
+        if (!$hasReturn) {
+            $stmts = (array) $toStringClassMethod->stmts;
+            \end($stmts);
+            $lastKey = \key($stmts);
+            $lastKey = $lastKey === null ? 0 : (int) $lastKey + 1;
+            $toStringClassMethod->stmts[$lastKey] = new \PhpParser\Node\Stmt\Return_(new \PhpParser\Node\Scalar\String_(''));
+            return;
+        }
+        $this->traverseNodesWithCallable((array) $toStringClassMethod->stmts, function (\PhpParser\Node $subNode) : void {
+            if (!$subNode instanceof \PhpParser\Node\Stmt\Return_) {
+                return;
+            }
+            if (!$subNode->expr instanceof \PhpParser\Node\Expr) {
+                $subNode->expr = new \PhpParser\Node\Scalar\String_('');
+                return;
+            }
+            $type = $this->nodeTypeResolver->getType($subNode->expr);
+            if ($type instanceof \PHPStan\Type\StringType) {
+                return;
+            }
+            $subNode->expr = new \PhpParser\Node\Expr\Cast\String_($subNode->expr);
+        });
+    }
 }

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = '2bde6b32625ce9e74d59d3fcc2eacfe56271dda4';
+    public const PACKAGE_VERSION = 'd29aae07e40b8d640a6c8b5c0edbad3026b1fb52';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2021-12-13 12:56:26';
+    public const RELEASE_DATE = '2021-12-13 12:26:43';
     public static function resolvePackageVersion() : string
     {
         $process = new \RectorPrefix20211213\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1::getLoader();
+return ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1
+class ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInite2c02485d6f75c568cbb1a1764eb6af1::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit1555182e687ebd47bc4a287f601771d2::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ class ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInite2c02485d6f75c568cbb1a1764eb6af1::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit1555182e687ebd47bc4a287f601771d2::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequiree2c02485d6f75c568cbb1a1764eb6af1($fileIdentifier, $file);
+            composerRequire1555182e687ebd47bc4a287f601771d2($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequiree2c02485d6f75c568cbb1a1764eb6af1($fileIdentifier, $file)
+function composerRequire1555182e687ebd47bc4a287f601771d2($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInite2c02485d6f75c568cbb1a1764eb6af1
+class ComposerStaticInit1555182e687ebd47bc4a287f601771d2
 {
     public static $files = array (
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -3822,9 +3822,9 @@ class ComposerStaticInite2c02485d6f75c568cbb1a1764eb6af1
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInite2c02485d6f75c568cbb1a1764eb6af1::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInite2c02485d6f75c568cbb1a1764eb6af1::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInite2c02485d6f75c568cbb1a1764eb6af1::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit1555182e687ebd47bc4a287f601771d2::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit1555182e687ebd47bc4a287f601771d2::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit1555182e687ebd47bc4a287f601771d2::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -2807,7 +2807,7 @@
             "description": "Instant fixes for your TYPO3 code by using Rector.",
             "support": {
                 "issues": "https:\/\/github.com\/sabbelasichon\/typo3-rector\/issues",
-                "source": "https:\/\/github.com\/sabbelasichon\/typo3-rector\/tree\/main"
+                "source": "https:\/\/github.com\/sabbelasichon\/typo3-rector\/tree\/v.0.11.33"
             },
             "funding": [
                 {

vendor/scoper-autoload.php

@@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
 if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
     spl_autoload_call('RectorPrefix20211213\AutoloadIncluder');
 }
-if (!class_exists('ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1', false) && !interface_exists('ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1', false) && !trait_exists('ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1', false)) {
-    spl_autoload_call('RectorPrefix20211213\ComposerAutoloaderInite2c02485d6f75c568cbb1a1764eb6af1');
+if (!class_exists('ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2', false) && !interface_exists('ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2', false) && !trait_exists('ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2', false)) {
+    spl_autoload_call('RectorPrefix20211213\ComposerAutoloaderInit1555182e687ebd47bc4a287f601771d2');
 }
 if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
     spl_autoload_call('RectorPrefix20211213\Helmich\TypoScriptParser\Parser\AST\Statement');
@@ -81,9 +81,9 @@ if (!function_exists('print_node')) {
         return \RectorPrefix20211213\print_node(...func_get_args());
     }
 }
-if (!function_exists('composerRequiree2c02485d6f75c568cbb1a1764eb6af1')) {
-    function composerRequiree2c02485d6f75c568cbb1a1764eb6af1() {
-        return \RectorPrefix20211213\composerRequiree2c02485d6f75c568cbb1a1764eb6af1(...func_get_args());
+if (!function_exists('composerRequire1555182e687ebd47bc4a287f601771d2')) {
+    function composerRequire1555182e687ebd47bc4a287f601771d2() {
+        return \RectorPrefix20211213\composerRequire1555182e687ebd47bc4a287f601771d2(...func_get_args());
     }
 }
 if (!function_exists('scanPath')) {