Updated Rector to commit 156d28cc16a35822d6739d8c5337efa6fddda1dc

156d28cc16 Remove unused PregMatchTypeCorrector, the 3rd param in preg_match_* is now handled natively by PHPStan (#3824)

packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php

@@ -1,101 +0,0 @@
-<?php
-
-declare (strict_types=1);
-namespace Rector\NodeTypeResolver\NodeTypeCorrector;
-
-use PhpParser\Node;
-use PhpParser\Node\Arg;
-use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\FuncCall;
-use PhpParser\Node\Expr\Variable;
-use PHPStan\Type\ArrayType;
-use PHPStan\Type\MixedType;
-use PHPStan\Type\Type;
-use Rector\Core\PhpParser\Comparing\NodeComparator;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
-use Rector\NodeNameResolver\NodeNameResolver;
-use Rector\NodeNestingScope\ParentScopeFinder;
-use Rector\NodeTypeResolver\Node\AttributeKey;
-final class PregMatchTypeCorrector
-{
-    /**
-     * @readonly
-     * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
-     */
-    private $betterNodeFinder;
-    /**
-     * @readonly
-     * @var \Rector\NodeNameResolver\NodeNameResolver
-     */
-    private $nodeNameResolver;
-    /**
-     * @readonly
-     * @var \Rector\NodeNestingScope\ParentScopeFinder
-     */
-    private $parentScopeFinder;
-    /**
-     * @readonly
-     * @var \Rector\Core\PhpParser\Comparing\NodeComparator
-     */
-    private $nodeComparator;
-    public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver $nodeNameResolver, ParentScopeFinder $parentScopeFinder, NodeComparator $nodeComparator)
-    {
-        $this->betterNodeFinder = $betterNodeFinder;
-        $this->nodeNameResolver = $nodeNameResolver;
-        $this->parentScopeFinder = $parentScopeFinder;
-        $this->nodeComparator = $nodeComparator;
-    }
-    /**
-     * Special case for "preg_match(), preg_match_all()" - with 3rd argument
-     * @see https://github.com/rectorphp/rector/issues/786
-     */
-    public function correct(Expr $expr, Type $originalType) : Type
-    {
-        if (!$expr instanceof Variable) {
-            return $originalType;
-        }
-        if ($originalType instanceof ArrayType) {
-            return $originalType;
-        }
-        $variableUsages = $this->getVariableUsages($expr);
-        foreach ($variableUsages as $variableUsage) {
-            $possiblyArg = $variableUsage->getAttribute(AttributeKey::PARENT_NODE);
-            if (!$possiblyArg instanceof Arg) {
-                continue;
-            }
-            $funcCallNode = $possiblyArg->getAttribute(AttributeKey::PARENT_NODE);
-            if (!$funcCallNode instanceof FuncCall) {
-                continue;
-            }
-            $thirdArg = $funcCallNode->getArgs()[2] ?? null;
-            if (!$thirdArg instanceof Arg) {
-                continue;
-            }
-            if (!$this->nodeNameResolver->isNames($funcCallNode, ['preg_match', 'preg_match_all'])) {
-                continue;
-            }
-            // are the same variables
-            if (!$this->nodeComparator->areNodesEqual($thirdArg->value, $expr)) {
-                continue;
-            }
-            return new ArrayType(new MixedType(), new MixedType());
-        }
-        return $originalType;
-    }
-    /**
-     * @return Node[]
-     */
-    private function getVariableUsages(Variable $variable) : array
-    {
-        $scope = $this->parentScopeFinder->find($variable);
-        if ($scope === null) {
-            return [];
-        }
-        return $this->betterNodeFinder->find((array) $scope->stmts, static function (Node $node) use($variable) : bool {
-            if (!$node instanceof Variable) {
-                return \false;
-            }
-            return $node->name === $variable->name;
-        });
-    }
-}

packages/NodeTypeResolver/TypeAnalyzer/ArrayTypeAnalyzer.php

@@ -23,7 +23,6 @@ use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\NodeNameResolver\NodeNameResolver;
-use Rector\NodeTypeResolver\NodeTypeCorrector\PregMatchTypeCorrector;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 final class ArrayTypeAnalyzer
 {
@@ -37,11 +36,6 @@ final class ArrayTypeAnalyzer
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
-    /**
-     * @readonly
-     * @var \Rector\NodeTypeResolver\NodeTypeCorrector\PregMatchTypeCorrector
-     */
-    private $pregMatchTypeCorrector;
     /**
      * @readonly
      * @var \Rector\Core\PhpParser\Node\BetterNodeFinder
@@ -57,11 +51,10 @@ final class ArrayTypeAnalyzer
      * @var \Rector\Core\Reflection\ReflectionResolver
      */
     private $reflectionResolver;
-    public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, PregMatchTypeCorrector $pregMatchTypeCorrector, BetterNodeFinder $betterNodeFinder, PhpDocInfoFactory $phpDocInfoFactory, ReflectionResolver $reflectionResolver)
+    public function __construct(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, BetterNodeFinder $betterNodeFinder, PhpDocInfoFactory $phpDocInfoFactory, ReflectionResolver $reflectionResolver)
     {
         $this->nodeNameResolver = $nodeNameResolver;
         $this->nodeTypeResolver = $nodeTypeResolver;
-        $this->pregMatchTypeCorrector = $pregMatchTypeCorrector;
         $this->betterNodeFinder = $betterNodeFinder;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->reflectionResolver = $reflectionResolver;
@@ -69,7 +62,6 @@ final class ArrayTypeAnalyzer
     public function isArrayType(Expr $expr) : bool
     {
         $nodeType = $this->nodeTypeResolver->getType($expr);
-        $nodeType = $this->pregMatchTypeCorrector->correct($expr, $nodeType);
         if ($this->isIntersectionArrayType($nodeType)) {
             return \true;
         }

packages/NodeTypeResolver/TypeAnalyzer/CountableTypeAnalyzer.php

@@ -5,7 +5,6 @@ namespace Rector\NodeTypeResolver\TypeAnalyzer;
 
 use PhpParser\Node\Expr;
 use PHPStan\Type\ObjectType;
-use Rector\NodeTypeResolver\NodeTypeCorrector\PregMatchTypeCorrector;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 final class CountableTypeAnalyzer
 {
@@ -23,22 +22,15 @@ final class CountableTypeAnalyzer
      * @var \Rector\NodeTypeResolver\NodeTypeResolver
      */
     private $nodeTypeResolver;
-    /**
+    public function __construct(\Rector\NodeTypeResolver\TypeAnalyzer\ArrayTypeAnalyzer $arrayTypeAnalyzer, NodeTypeResolver $nodeTypeResolver)
-     * @readonly
-     * @var \Rector\NodeTypeResolver\NodeTypeCorrector\PregMatchTypeCorrector
-     */
-    private $pregMatchTypeCorrector;
-    public function __construct(\Rector\NodeTypeResolver\TypeAnalyzer\ArrayTypeAnalyzer $arrayTypeAnalyzer, NodeTypeResolver $nodeTypeResolver, PregMatchTypeCorrector $pregMatchTypeCorrector)
     {
         $this->arrayTypeAnalyzer = $arrayTypeAnalyzer;
         $this->nodeTypeResolver = $nodeTypeResolver;
-        $this->pregMatchTypeCorrector = $pregMatchTypeCorrector;
         $this->countableObjectTypes = [new ObjectType('Countable'), new ObjectType('SimpleXMLElement'), new ObjectType('ResourceBundle')];
     }
     public function isCountableType(Expr $expr) : bool
     {
         $nodeType = $this->nodeTypeResolver->getType($expr);
-        $nodeType = $this->pregMatchTypeCorrector->correct($expr, $nodeType);
         foreach ($this->countableObjectTypes as $countableObjectType) {
             if ($countableObjectType->isSuperTypeOf($nodeType)->yes()) {
                 return \true;

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '645071a650fc50d7e084378facaebcc868a52ba1';
+    public const PACKAGE_VERSION = '156d28cc16a35822d6739d8c5337efa6fddda1dc';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-05-13 17:16:07';
+    public const RELEASE_DATE = '2023-05-13 17:23:20';
     /**
      * @var int
      */

vendor/autoload.php

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

vendor/composer/autoload_classmap.php

@@ -1971,7 +1971,6 @@ return array(
     'Rector\\NodeTypeResolver\\NodeTypeCorrector\\AccessoryNonEmptyStringTypeCorrector' => $baseDir . '/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php',
     'Rector\\NodeTypeResolver\\NodeTypeCorrector\\GenericClassStringTypeCorrector' => $baseDir . '/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php',
     'Rector\\NodeTypeResolver\\NodeTypeCorrector\\HasOffsetTypeCorrector' => $baseDir . '/packages/NodeTypeResolver/NodeTypeCorrector/HasOffsetTypeCorrector.php',
-    'Rector\\NodeTypeResolver\\NodeTypeCorrector\\PregMatchTypeCorrector' => $baseDir . '/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php',
     'Rector\\NodeTypeResolver\\NodeTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver.php',
     'Rector\\NodeTypeResolver\\NodeTypeResolver\\CastTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/CastTypeResolver.php',
     'Rector\\NodeTypeResolver\\NodeTypeResolver\\ClassAndInterfaceTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/ClassAndInterfaceTypeResolver.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit2febda954f156b62ed0020df63598e12
+class ComposerAutoloaderInit84dd59fdecbec98ea5f5279aec177a11
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ class ComposerAutoloaderInit2febda954f156b62ed0020df63598e12
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit2febda954f156b62ed0020df63598e12', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit84dd59fdecbec98ea5f5279aec177a11', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit2febda954f156b62ed0020df63598e12', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit84dd59fdecbec98ea5f5279aec177a11', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit2febda954f156b62ed0020df63598e12::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit84dd59fdecbec98ea5f5279aec177a11::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit2febda954f156b62ed0020df63598e12::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit84dd59fdecbec98ea5f5279aec177a11::$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 ComposerStaticInit2febda954f156b62ed0020df63598e12
+class ComposerStaticInit84dd59fdecbec98ea5f5279aec177a11
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -2213,7 +2213,6 @@ class ComposerStaticInit2febda954f156b62ed0020df63598e12
         'Rector\\NodeTypeResolver\\NodeTypeCorrector\\AccessoryNonEmptyStringTypeCorrector' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php',
         'Rector\\NodeTypeResolver\\NodeTypeCorrector\\GenericClassStringTypeCorrector' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php',
         'Rector\\NodeTypeResolver\\NodeTypeCorrector\\HasOffsetTypeCorrector' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeCorrector/HasOffsetTypeCorrector.php',
-        'Rector\\NodeTypeResolver\\NodeTypeCorrector\\PregMatchTypeCorrector' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeCorrector/PregMatchTypeCorrector.php',
         'Rector\\NodeTypeResolver\\NodeTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver.php',
         'Rector\\NodeTypeResolver\\NodeTypeResolver\\CastTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/CastTypeResolver.php',
         'Rector\\NodeTypeResolver\\NodeTypeResolver\\ClassAndInterfaceTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/ClassAndInterfaceTypeResolver.php',
@@ -3111,9 +3110,9 @@ class ComposerStaticInit2febda954f156b62ed0020df63598e12
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit2febda954f156b62ed0020df63598e12::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit84dd59fdecbec98ea5f5279aec177a11::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit2febda954f156b62ed0020df63598e12::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit84dd59fdecbec98ea5f5279aec177a11::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit2febda954f156b62ed0020df63598e12::$classMap;
+            $loader->classMap = ComposerStaticInit84dd59fdecbec98ea5f5279aec177a11::$classMap;
 
         }, null, ClassLoader::class);
     }