typos, skip empty class

rectorphp · Jul 1, 2020 · 78a97fb · 78a97fb
1 parent e091457
commit 78a97fb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/rules/phpunit/src/Rector/MethodCall/composer.json b/rules/phpunit/src/Rector/MethodCall/composer.json
@@ -1,4 +1,4 @@
-e{
+{
     "name": "vendor_name/MethodCall",
     "description": "description",
     "minimum-stability": "stable",

diff --git a/rules/privatization/src/Rector/ClassConst/PrivatizeLocalClassConstantRector.php b/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

diff --git a/utils/project-validator/src/Process/ParallelTaskRunner.php b/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