Merge pull request #3628 from rectorphp/fix-phpstan-reflection

Fix PHPStan Reflection break from 0.12.26

.github/workflows/broken_reflection.yaml

@@ -0,0 +1,20 @@
+name: Broken Reflection
+
+on:
+    pull_request: null
+    push:
+        branches:
+            - master
+
+jobs:
+    broken_reflection:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: shivammathur/setup-php@v1
+                with:
+                    php-version: 7.4
+
+            -   run: composer install --no-progress --ansi
+
+            -   run: bin/rector p src/Rector/AbstractRector.php -n --debug

composer.json

@@ -22,7 +22,7 @@
         "nikic/php-parser": "^4.5",
         "ondram/ci-detector": "^3.4",
         "phpstan/phpdoc-parser": "^0.4.7",
-        "phpstan/phpstan": "^0.12.25",
+        "phpstan/phpstan": "^0.12.32",
         "phpstan/phpstan-phpunit": "^0.12.10",
         "psr/simple-cache": "^1.0",
         "sebastian/diff": "^3.0|^4.0",

docs/rector_rules_overview.md

@@ -1,4 +1,4 @@
-# All 513 Rectors Overview
+# All 514 Rectors Overview
 
 - [Projects](#projects)
 - [General](#general)
@@ -4573,8 +4573,8 @@ services:
 
 ### `ReturnThisRemoveRector`
 
-- class: [`Rector\MagicDisclosure\Rector\ClassMethod\ReturnThisRemoveRector`](/../master/rules/magic-disclosure/src/Rector/MethodBody/ReturnThisRemoveRector.php)
-- [test fixtures](/../master/rules/magic-disclosure/tests/Rector/MethodBody/ReturnThisRemoveRector/Fixture)
+- class: [`Rector\MagicDisclosure\Rector\ClassMethod\ReturnThisRemoveRector`](/../master/rules/magic-disclosure/src/Rector/ClassMethod/ReturnThisRemoveRector.php)
+- [test fixtures](/../master/rules/magic-disclosure/tests/Rector/ClassMethod/ReturnThisRemoveRector/Fixture)
 
 Removes "return $this;" from *fluent interfaces* for specified classes.
 

rules/php80/src/Rector/Identical/StrStartsWithRector.php

@@ -88,5 +88,7 @@ public function refactor(Node $node): ?Node
 
             return $strStartWithMatchAndRefactor->refactor($strStartsWithValueObject);
         }
+
+        return null;
     }
 }

rules/php80/src/Rector/NotIdentical/StrContainsRector.php

@@ -5,7 +5,6 @@
 namespace Rector\Php80\Rector\NotIdentical;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\BinaryOp\Identical;
 use PhpParser\Node\Expr\BinaryOp\NotIdentical;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
@@ -59,7 +58,7 @@ public function run()
      */
     public function getNodeTypes(): array
     {
-        return [NotIdentical::class, Identical::class];
+        return [NotIdentical::class];
     }
 
     /**

rules/privatization/src/Rector/ClassConst/PrivatizeLocalClassConstantRector.php

@@ -100,15 +100,12 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        /** @var string $class */
+        $class = $node->getAttribute(AttributeKey::CLASS_NAME);
+
         // Remember when we have already processed this constant recursively
         $node->setAttribute(self::HAS_NEW_ACCESS_LEVEL, true);
 
-        /** @var string|null $class */
-        $class = $node->getAttribute(AttributeKey::CLASS_NAME);
-        if ($class === null) {
-            return null;
-        }
-
         // 0. constants declared in interfaces have to be public
         if ($this->classLikeParsedNodesFinder->findInterface($class) !== null) {
             $this->makePublic($node);
@@ -150,7 +147,13 @@ private function shouldSkip(ClassConst $classConst): bool
             return true;
         }
 
-        return count($classConst->consts) !== 1;
+        if (count($classConst->consts) !== 1) {
+            return true;
+        }
+
+        /** @var string|null $class */
+        $class = $classConst->getAttribute(AttributeKey::CLASS_NAME);
+        return $class === null;
     }
 
     private function findParentClassConstantAndRefactorIfPossible(string $class, string $constant): ?ConstantVisibility

src/Stubs/StubLoader.php

@@ -35,6 +35,7 @@ public function loadStubs(): void
         $robotLoader->addDirectory($stubDirectory);
         $robotLoader->setTempDirectory(sys_get_temp_dir() . '/_rector_stubs');
         $robotLoader->register();
+        $robotLoader->refresh();
 
         $this->areStubsLoaded = true;
     }

utils/project-validator/src/Process/ParallelTaskRunner.php

@@ -179,6 +179,7 @@ private function createProcessFromSetTask(SetTask $setTask): Process
             '--set',
             $setTask->getSetName(),
             '--dry-run',
+            '--debug',
         ];
 
         return new Process($command, $this->cwd);
@@ -203,15 +204,14 @@ private function evaluateProcess(Process $process): void
 
         $fullOutput = array_filter([$process->getOutput(), $process->getErrorOutput()]);
 
-        $ouptput = implode("\n", $fullOutput);
-
-        $actualErrorHappened = Strings::match($ouptput, '#(Fatal error)|(\[ERROR\])#');
+        $output = implode("\n", $fullOutput);
+        $actualErrorHappened = Strings::match($output, '#(Fatal error)|(\[ERROR\])#');
 
         if (! $actualErrorHappened) {
             return;
         }
 
-        throw new ProcessResultInvalidException($ouptput);
+        throw new ProcessResultInvalidException($output);
     }
 
     private function printSuccess(string $set, int $totalTasks): void