Merge pull request #2800 from rectorphp/phpstan-phar-deps

Update to PHPStan 0.12.9 and fix scoping deps

.github/workflows/test_with_doctrine.yaml → .github/inactive_workflows/test_with_doctrine.yaml

@@ -1,3 +1,5 @@
+# temporary disabled till PHPStan autolaod bug is fixed
+# https://github.com/rectorphp/rector/pull/2800
 name: Test With Doctrine
 
 on:
@@ -27,6 +29,7 @@ jobs:
 
                     # remove phsptan config to prevent rector loading configs
                     rm phpstan.neon
+                    rm orm/phpstan.neon.dist
 
                     # do not intall doctrine/orm phpstan, it conflicts with Retor's one
                     composer install -d orm --no-dev

bin/rector

@@ -19,7 +19,8 @@ error_reporting(E_ALL);
 ini_set('display_errors', 'stderr');
 gc_disable();
 
-define('__RECTOR_RUNNING__', true);
+// temporary hackaround
+include_once 'phar://vendor/phpstan/phpstan/phpstan.phar/vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php';
 
 // Require Composer autoload.php
 $autoloadIncluder = new AutoloadIncluder();

compiler/build/scoper.inc.php

@@ -17,6 +17,11 @@
     ->in(__DIR__ . '/../../vendor/jetbrains/phpstorm-stubs');
 
 foreach ($stubFinder->getIterator() as $fileInfo) {
+    // mirrors https://github.com/phpstan/phpstan-src/commit/04f777bc4445725d17dac65c989400485454b145
+    if ($file->getPathName() === '../../vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php') {
+        continue;
+    }
+
     /** @var SplFileInfo $fileInfo */
     $stubs[] = $fileInfo->getPathName();
 }

composer.json

@@ -21,7 +21,7 @@
         "nikic/php-parser": "^4.3",
         "ondram/ci-detector": "^3.1",
         "phpstan/phpdoc-parser": "^0.4",
-        "phpstan/phpstan": "0.12.7",
+        "phpstan/phpstan": "^0.12.9",
         "phpstan/phpstan-phpunit": "^0.12",
         "sebastian/diff": "^3.0",
         "symfony/console": "^4.4|^5.0",

packages/CakePHP/src/Rector/Name/ChangeSnakedFixtureNameToCamelRector.php

@@ -5,6 +5,7 @@
 namespace Rector\CakePHP\Rector\Name;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Property;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -13,6 +14,8 @@
 use Rector\RectorDefinition\RectorDefinition;
 
 /**
+ * @see \Rector\CakePHP\Tests\Rector\Name\ChangeSnakedFixtureNameToCamel\ChangeSnakedFixtureNameToCamelTest
+ *
  * @see https://book.cakephp.org/3.0/en/appendices/3-7-migration-guide.html
  */
 final class ChangeSnakedFixtureNameToCamelRector extends AbstractRector
@@ -62,21 +65,27 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        foreach ($node->props as $i => $prop) {
-            if (! isset($prop->default->items)) {
+        foreach ($node->props as $prop) {
+            if (! $prop->default instanceof Array_) {
                 continue;
             }
-            foreach ($prop->default->items as $j => $item) {
-                $node->props[$i]->default->items[$j]->value = $this->renameFixtureName($item->value);
+
+            foreach ($prop->default->items as $item) {
+                if (! $item->value instanceof String_) {
+                    continue;
+                }
+
+                $this->renameFixtureName($item->value);
             }
         }
 
         return $node;
     }
 
-    private function renameFixtureName(String_ $name): String_
+    private function renameFixtureName(String_ $string): void
     {
-        [$prefix, $table] = explode('.', $name->value);
+        [$prefix, $table] = explode('.', $string->value);
+
         $table = array_map(
             function ($token): string {
                 $tokens = explode('_', $token);
@@ -85,8 +94,9 @@ function ($token): string {
             },
             explode('/', $table)
         );
+
         $table = implode('/', $table);
 
-        return new String_(sprintf('%s.%s', $prefix, $table), $name->getAttributes());
+        $string->value = sprintf('%s.%s', $prefix, $table);
     }
 }

tests/bootstrap.php

@@ -6,6 +6,8 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
+require_once 'phar://vendor/phpstan/phpstan/phpstan.phar/vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php';
+
 // silent deprecations, since we test them
 error_reporting(E_ALL ^ E_DEPRECATED);