Updated Rector to commit 72df0f63c5

72df0f63c5 [DeadCode] Mirror comment on RemoveUnusedNonEmptyArrayBeforeForeachRector (#610)

rules/DeadCode/Rector/Expression/RemoveDeadStmtRector.php

@@ -4,9 +4,14 @@ declare (strict_types=1);
 namespace Rector\DeadCode\Rector\Expression;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\PropertyFetch;
+use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Nop;
+use PHPStan\Reflection\Php\PhpPropertyReflection;
+use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Core\Reflection\ReflectionResolver;
 use Rector\DeadCode\NodeManipulator\LivingCodeManipulator;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -20,9 +25,19 @@ final class RemoveDeadStmtRector extends \Rector\Core\Rector\AbstractRector
      * @var \Rector\DeadCode\NodeManipulator\LivingCodeManipulator
      */
     private $livingCodeManipulator;
-    public function __construct(\Rector\DeadCode\NodeManipulator\LivingCodeManipulator $livingCodeManipulator)
+    /**
+     * @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
+     */
+    private $propertyFetchAnalyzer;
+    /**
+     * @var \Rector\Core\Reflection\ReflectionResolver
+     */
+    private $reflectionResolver;
+    public function __construct(\Rector\DeadCode\NodeManipulator\LivingCodeManipulator $livingCodeManipulator, \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer $propertyFetchAnalyzer, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver)
     {
         $this->livingCodeManipulator = $livingCodeManipulator;
+        $this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
+        $this->reflectionResolver = $reflectionResolver;
     }
     public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
     {
@@ -48,6 +63,9 @@ CODE_SAMPLE
      */
     public function refactor(\PhpParser\Node $node)
     {
+        if ($this->hasGetMagic($node)) {
+            return null;
+        }
         $livingCode = $this->livingCodeManipulator->keepLivingCodeFromExpr($node->expr);
         if ($livingCode === []) {
             return $this->removeNodeAndKeepComments($node);
@@ -64,6 +82,20 @@ CODE_SAMPLE
         $newNodes[] = $node;
         return $newNodes;
     }
+    private function hasGetMagic(\PhpParser\Node\Stmt\Expression $expression) : bool
+    {
+        if (!$this->propertyFetchAnalyzer->isPropertyFetch($expression->expr)) {
+            return \false;
+        }
+        /** @var PropertyFetch|StaticPropertyFetch $propertyFetch */
+        $propertyFetch = $expression->expr;
+        $phpPropertyReflection = $this->reflectionResolver->resolvePropertyReflectionFromPropertyFetch($propertyFetch);
+        /**
+         *  property not found assume has class has __get method
+         *  that can call non-defined property, that can have some special handling, eg: throw on special case
+         */
+        return !$phpPropertyReflection instanceof \PHPStan\Reflection\Php\PhpPropertyReflection;
+    }
     private function removeNodeAndKeepComments(\PhpParser\Node\Stmt\Expression $expression) : ?\PhpParser\Node
     {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($expression);

rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php

@@ -10,6 +10,7 @@ use Rector\Core\NodeManipulator\IfManipulator;
 use Rector\Core\Rector\AbstractRector;
 use Rector\DeadCode\NodeManipulator\CountManipulator;
 use Rector\DeadCode\UselessIfCondBeforeForeachDetector;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 /**
@@ -80,7 +81,12 @@ CODE_SAMPLE
         if (!$this->isUselessBeforeForeachCheck($node)) {
             return null;
         }
-        return $node->stmts[0];
+        $stmt = $node->stmts[0];
+        $ifComments = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::COMMENTS) ?? [];
+        $stmtComments = $stmt->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::COMMENTS) ?? [];
+        $comments = \array_merge($ifComments, $stmtComments);
+        $stmt->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::COMMENTS, $comments);
+        return $stmt;
     }
     private function isUselessBeforeForeachCheck(\PhpParser\Node\Stmt\If_ $if) : bool
     {

rules/DeadCode/Rector/Stmt/RemoveUnreachableStatementRector.php

@@ -128,7 +128,7 @@ CODE_SAMPLE
             if ($node->name instanceof \PhpParser\Node\Expr\StaticCall) {
                 return \false;
             }
-            return $this->isName($node->name, 'markTestSkipped');
+            return $this->isNames($node->name, ['markTestSkipped', 'markTestIncomplete']);
         });
     }
     /**

src/Application/VersionResolver.php

@@ -16,11 +16,11 @@ final class VersionResolver
     /**
      * @var string
      */
-    public const PACKAGE_VERSION = '7e0859efe177331b53a327b60f5d6c48d7087bee';
+    public const PACKAGE_VERSION = '72df0f63c5015db2db86bf1b17a0d8393ad90911';
     /**
      * @var string
      */
-    public const RELEASE_DATE = '2021-08-07 13:24:57';
+    public const RELEASE_DATE = '2021-08-07 13:32:36';
     public static function resolvePackageVersion() : string
     {
         $process = new \RectorPrefix20210807\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 ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d::getLoader();
+return ComposerAutoloaderInit63e8dd4dabcc3dc33d7808f874cbcc45::getLoader();

vendor/composer/autoload_real.php

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

vendor/composer/autoload_static.php

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

vendor/scoper-autoload.php

@@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
 if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
     spl_autoload_call('RectorPrefix20210807\AutoloadIncluder');
 }
-if (!class_exists('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', false) && !interface_exists('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', false) && !trait_exists('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', false)) {
-    spl_autoload_call('RectorPrefix20210807\ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d');
+if (!class_exists('ComposerAutoloaderInit63e8dd4dabcc3dc33d7808f874cbcc45', false) && !interface_exists('ComposerAutoloaderInit63e8dd4dabcc3dc33d7808f874cbcc45', false) && !trait_exists('ComposerAutoloaderInit63e8dd4dabcc3dc33d7808f874cbcc45', false)) {
+    spl_autoload_call('RectorPrefix20210807\ComposerAutoloaderInit63e8dd4dabcc3dc33d7808f874cbcc45');
 }
 if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) {
     spl_autoload_call('RectorPrefix20210807\AjaxLogin');
@@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) {
         return \RectorPrefix20210807\print_node(...func_get_args());
     }
 }
-if (!function_exists('composerRequire99d0fb8da44b4089c90e97ba15b5dc3d')) {
-    function composerRequire99d0fb8da44b4089c90e97ba15b5dc3d() {
-        return \RectorPrefix20210807\composerRequire99d0fb8da44b4089c90e97ba15b5dc3d(...func_get_args());
+if (!function_exists('composerRequire63e8dd4dabcc3dc33d7808f874cbcc45')) {
+    function composerRequire63e8dd4dabcc3dc33d7808f874cbcc45() {
+        return \RectorPrefix20210807\composerRequire63e8dd4dabcc3dc33d7808f874cbcc45(...func_get_args());
     }
 }
 if (!function_exists('parseArgs')) {