Updated Rector to commit 8046b81dd2

8046b81dd2 [NodeTypeResolver] Remove deprecated NodeTypeResolver getStaticType method (#1230)

packages/NodeTypeResolver/NodeTypeResolver.php

@@ -19,16 +19,11 @@ use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
 use PhpParser\Node\Scalar;
 use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\Return_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Type\Accessory\NonEmptyArrayType;
-use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\FloatType;
-use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\IntegerType;
-use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
@@ -47,20 +42,14 @@ use Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyStringTypeCorrect
 use Rector\NodeTypeResolver\NodeTypeCorrector\GenericClassStringTypeCorrector;
 use Rector\NodeTypeResolver\NodeTypeCorrector\HasOffsetTypeCorrector;
 use Rector\NodeTypeResolver\NodeTypeResolver\IdentifierTypeResolver;
-use Rector\NodeTypeResolver\TypeAnalyzer\ArrayTypeAnalyzer;
 use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
 use Rector\TypeDeclaration\PHPStan\Type\ObjectTypeSpecifier;
-use RectorPrefix20211114\Symfony\Contracts\Service\Attribute\Required;
 final class NodeTypeResolver
 {
     /**
      * @var array<class-string<Node>, NodeTypeResolverInterface>
      */
     private $nodeTypeResolvers = [];
-    /**
-     * @var \Rector\NodeTypeResolver\TypeAnalyzer\ArrayTypeAnalyzer
-     */
-    private $arrayTypeAnalyzer;
     /**
      * @var \Rector\TypeDeclaration\PHPStan\Type\ObjectTypeSpecifier
      */
@@ -115,14 +104,6 @@ final class NodeTypeResolver
             $this->addNodeTypeResolver($nodeTypeResolver);
         }
     }
-    // Prevents circular dependency
-    /**
-     * @required
-     */
-    public function autowireNodeTypeResolver(\Rector\NodeTypeResolver\TypeAnalyzer\ArrayTypeAnalyzer $arrayTypeAnalyzer) : void
-    {
-        $this->arrayTypeAnalyzer = $arrayTypeAnalyzer;
-    }
     /**
      * @param ObjectType[] $requiredTypes
      */
@@ -246,41 +227,6 @@ final class NodeTypeResolver
         }
         return $scope->getNativeType($expr);
     }
-    /**
-     * @deprecated
-     * @see Use NodeTypeResolver::getType() instead
-     */
-    public function getStaticType(\PhpParser\Node $node) : \PHPStan\Type\Type
-    {
-        $errorMessage = \sprintf('Method "%s" is deprecated. Use "getType()" instead', __METHOD__);
-        \trigger_error($errorMessage, \E_USER_WARNING);
-        \sleep(3);
-        if ($node instanceof \PhpParser\Node\Param || $node instanceof \PhpParser\Node\Expr\New_ || $node instanceof \PhpParser\Node\Stmt\Return_) {
-            return $this->getType($node);
-        }
-        if (!$node instanceof \PhpParser\Node\Expr) {
-            return new \PHPStan\Type\MixedType();
-        }
-        if ($this->arrayTypeAnalyzer->isArrayType($node)) {
-            return $this->resolveArrayType($node);
-        }
-        if ($node instanceof \PhpParser\Node\Scalar) {
-            return $this->getType($node);
-        }
-        $scope = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
-        if (!$scope instanceof \PHPStan\Analyser\Scope) {
-            return new \PHPStan\Type\MixedType();
-        }
-        $staticType = $scope->getType($node);
-        if ($staticType instanceof \PHPStan\Type\Generic\GenericObjectType) {
-            return $staticType;
-        }
-        if ($staticType instanceof \PHPStan\Type\ObjectType) {
-            $scope = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
-            return $this->objectTypeSpecifier->narrowToFullyQualifiedOrAliasedObjectType($node, $staticType, $scope);
-        }
-        return $this->accessoryNonEmptyStringTypeCorrector->correct($staticType);
-    }
     public function isNumberType(\PhpParser\Node $node) : bool
     {
         $nodeType = $this->getType($node);
@@ -349,17 +295,6 @@ final class NodeTypeResolver
         }
         return $type->isInstanceOf($requiredObjectType->getClassName())->yes();
     }
-    private function resolveArrayType(\PhpParser\Node\Expr $expr) : \PHPStan\Type\Type
-    {
-        /** @var Scope|null $scope */
-        $scope = $expr->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
-        if ($scope instanceof \PHPStan\Analyser\Scope) {
-            $arrayType = $scope->getType($expr);
-            $arrayType = $this->genericClassStringTypeCorrector->correct($arrayType);
-            return $this->removeNonEmptyArrayFromIntersectionWithArrayType($arrayType);
-        }
-        return new \PHPStan\Type\ArrayType(new \PHPStan\Type\MixedType(), new \PHPStan\Type\MixedType());
-    }
     private function resolveByNodeTypeResolvers(\PhpParser\Node $node) : ?\PHPStan\Type\Type
     {
         foreach ($this->nodeTypeResolvers as $nodeClass => $nodeTypeResolver) {
@@ -370,30 +305,6 @@ final class NodeTypeResolver
         }
         return null;
     }
-    private function removeNonEmptyArrayFromIntersectionWithArrayType(\PHPStan\Type\Type $type) : \PHPStan\Type\Type
-    {
-        if (!$type instanceof \PHPStan\Type\IntersectionType) {
-            return $type;
-        }
-        if (\count($type->getTypes()) !== 2) {
-            return $type;
-        }
-        if (!$type->isSubTypeOf(new \PHPStan\Type\Accessory\NonEmptyArrayType())->yes()) {
-            return $type;
-        }
-        $otherType = null;
-        foreach ($type->getTypes() as $intersectionedType) {
-            if ($intersectionedType instanceof \PHPStan\Type\Accessory\NonEmptyArrayType) {
-                continue;
-            }
-            $otherType = $intersectionedType;
-            break;
-        }
-        if ($otherType === null) {
-            return $type;
-        }
-        return $otherType;
-    }
     private function isObjectTypeOfObjectType(\PHPStan\Type\ObjectType $resolvedObjectType, \PHPStan\Type\ObjectType $requiredObjectType) : bool
     {
         if ($resolvedObjectType->isInstanceOf($requiredObjectType->getClassName())->yes()) {

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = '4b3a51cff96bcca65a8178465c3c00d6ff520da9';
+    public const PACKAGE_VERSION = '8046b81dd24ea4b2624f54886892185133416fb7';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2021-11-14 11:34:06';
+    public const RELEASE_DATE = '2021-11-14 11:34:50';
     public static function resolvePackageVersion() : string
     {
         $process = new \RectorPrefix20211114\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

src/Rector/AbstractRector.php

@@ -331,14 +331,6 @@ abstract class AbstractRector extends \PhpParser\NodeVisitorAbstract implements
     {
         return $this->nodeTypeResolver->getType($node);
     }
-    /**
-     * @deprecated
-     * Use @see AbstractRector::getType() instead, as single method to get types
-     */
-    protected function getStaticType(\PhpParser\Node $node) : \PHPStan\Type\Type
-    {
-        return $this->nodeTypeResolver->getType($node);
-    }
     /**
      * @param mixed[]|\PhpParser\Node $nodes
      */

vendor/autoload.php

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

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b
+class ComposerAutoloaderInit4417226e0e1da0bec63d770dcec6217c
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ class ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4417226e0e1da0bec63d770dcec6217c', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4417226e0e1da0bec63d770dcec6217c', '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\ComposerStaticInit066918b5ecba7ccaceeb1a73324a9e0b::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit4417226e0e1da0bec63d770dcec6217c::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ class ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit066918b5ecba7ccaceeb1a73324a9e0b::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit4417226e0e1da0bec63d770dcec6217c::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire066918b5ecba7ccaceeb1a73324a9e0b($fileIdentifier, $file);
+            composerRequire4417226e0e1da0bec63d770dcec6217c($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire066918b5ecba7ccaceeb1a73324a9e0b($fileIdentifier, $file)
+function composerRequire4417226e0e1da0bec63d770dcec6217c($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

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

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('RectorPrefix20211114\AutoloadIncluder');
 }
-if (!class_exists('ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b', false) && !interface_exists('ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b', false) && !trait_exists('ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b', false)) {
-    spl_autoload_call('RectorPrefix20211114\ComposerAutoloaderInit066918b5ecba7ccaceeb1a73324a9e0b');
+if (!class_exists('ComposerAutoloaderInit4417226e0e1da0bec63d770dcec6217c', false) && !interface_exists('ComposerAutoloaderInit4417226e0e1da0bec63d770dcec6217c', false) && !trait_exists('ComposerAutoloaderInit4417226e0e1da0bec63d770dcec6217c', false)) {
+    spl_autoload_call('RectorPrefix20211114\ComposerAutoloaderInit4417226e0e1da0bec63d770dcec6217c');
 }
 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('RectorPrefix20211114\Helmich\TypoScriptParser\Parser\AST\Statement');
@@ -3309,9 +3309,9 @@ if (!function_exists('print_node')) {
         return \RectorPrefix20211114\print_node(...func_get_args());
     }
 }
-if (!function_exists('composerRequire066918b5ecba7ccaceeb1a73324a9e0b')) {
-    function composerRequire066918b5ecba7ccaceeb1a73324a9e0b() {
-        return \RectorPrefix20211114\composerRequire066918b5ecba7ccaceeb1a73324a9e0b(...func_get_args());
+if (!function_exists('composerRequire4417226e0e1da0bec63d770dcec6217c')) {
+    function composerRequire4417226e0e1da0bec63d770dcec6217c() {
+        return \RectorPrefix20211114\composerRequire4417226e0e1da0bec63d770dcec6217c(...func_get_args());
     }
 }
 if (!function_exists('parseArgs')) {