Merge 2614c4c into 032dd51

.github/workflows/compiler-tests.yml

@@ -32,7 +32,7 @@ jobs:
         run: "composer install --no-dev --no-interaction --no-progress"
 
       - name: "Transform source code"
-        run: php bin/transform-source.php
+        run: build/transform-source
 
       - name: "Tests"
         run: |

.github/workflows/lint.yml

@@ -46,7 +46,7 @@ jobs:
 
       - name: "Transform source code"
         if: matrix.php-version != '7.4' && matrix.php-version != '8.0' && matrix.php-version != '8.1'
-        run: php bin/transform-source.php
+        run: build/transform-source
 
       - name: "Lint"
         run: "make lint"

.github/workflows/phar-old.yml

@@ -34,7 +34,7 @@ jobs:
         run: "composer install --no-interaction --no-progress --working-dir=compiler"
 
       - name: "Transform source code"
-        run: php bin/transform-source.php
+        run: build/transform-source
 
       - name: "Compile PHAR"
         run: php compiler/bin/compile

.github/workflows/phar.yml

@@ -36,7 +36,7 @@ jobs:
         run: "composer install --no-interaction --no-progress --working-dir=compiler"
 
       - name: "Transform source code"
-        run: php bin/transform-source.php
+        run: build/transform-source
 
       - name: "Compile PHAR"
         run: php compiler/bin/compile

.github/workflows/static-analysis.yml

@@ -47,14 +47,15 @@ jobs:
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress"
 
+      - name: "Transform source code"
+        if: matrix.php-version != '7.4' && matrix.php-version != '8.0' && matrix.php-version != '8.1'
+        shell: bash
+        run: build/transform-source
+
       - name: "Downgrade PHPUnit"
         if: matrix.php-version == '7.1' || matrix.php-version == '7.2'
         run: "composer require --dev phpunit/phpunit:^7.5.20 brianium/paratest:^4.0 --update-with-dependencies"
 
-      - name: "Transform source code"
-        if: matrix.php-version != '7.4' && matrix.php-version != '8.0' && matrix.php-version != '8.1'
-        run: php bin/transform-source.php
-
       - name: "PHPStan"
         run: ${{ matrix.script }}
 

.github/workflows/tests.yml

@@ -49,7 +49,8 @@ jobs:
 
       - name: "Transform source code"
         if: matrix.php-version != '7.4' && matrix.php-version != '8.0' && matrix.php-version != '8.1'
-        run: php bin/transform-source.php
+        shell: bash
+        run: build/transform-source
 
       - name: "Tests"
         run: "${{ matrix.script }}"
@@ -87,12 +88,13 @@ jobs:
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress"
 
+      - name: "Transform source code"
+        shell: bash
+        run: build/transform-source
+
       - name: "Downgrade PHPUnit"
         run: "composer require --dev phpunit/phpunit:^7.5.20 brianium/paratest:^4.0 --update-with-dependencies"
 
-      - name: "Transform source code"
-        run: php bin/transform-source.php
-
       - name: "Tests"
         run: "${{ matrix.script }}"
 

build/rector-downgrade.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+	$parameters = $containerConfigurator->parameters();
+
+	$parameters->set(Option::SKIP, [
+		'tests/*/data/*',
+		'tests/PHPStan/Analyser/traits/*',
+		'tests/PHPStan/Generics/functions.php',
+	]);
+
+	$services = $containerConfigurator->services();
+	$services->set(DowngradeTypedPropertyRector::class);
+};

build/transform-source

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+docker run --rm -v $(pwd):/app -w /app php:8.0-cli vendor/bin/rector process src tests/PHPStan -c build/rector-downgrade.php

composer.json

@@ -48,6 +48,7 @@
 		"phpstan/phpstan-phpunit": "^1.0",
 		"phpstan/phpstan-strict-rules": "^1.0",
 		"phpunit/phpunit": "^9.5.4",
+		"rector/rector": "0.12.5",
 		"vaimo/composer-patches": "^4.22"
 	},
 	"config": {

patches/PHPStanNodeScopeResolver.patch

@@ -0,0 +1,21 @@
+@package rector/rector
+
+--- packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php	2021-12-16 21:10:20.000000000 +0100
++++ packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php	2021-12-16 21:10:27.000000000 +0100
+@@ -226,12 +226,12 @@
+     {
+         // 1. get PHPStan locator
+         /** @var ClassReflector $classReflector */
+-        $classReflector = $this->privatesAccessor->getPrivateProperty($nodeScopeResolver, 'classReflector');
++        //$classReflector = $this->privatesAccessor->getPrivateProperty($nodeScopeResolver, 'classReflector');
+         /** @var SourceLocator $sourceLocator */
+-        $sourceLocator = $this->privatesAccessor->getPrivateProperty($classReflector, 'sourceLocator');
++        //$sourceLocator = $this->privatesAccessor->getPrivateProperty($classReflector, 'sourceLocator');
+         // 2. get Rector locator
+-        $aggregateSourceLocator = new \PHPStan\BetterReflection\SourceLocator\Type\AggregateSourceLocator([$sourceLocator, $this->renamedClassesSourceLocator, $this->parentAttributeSourceLocator]);
+-        $this->privatesAccessor->setPrivateProperty($classReflector, 'sourceLocator', $aggregateSourceLocator);
++        //$aggregateSourceLocator = new \PHPStan\BetterReflection\SourceLocator\Type\AggregateSourceLocator([$sourceLocator, $this->renamedClassesSourceLocator, $this->parentAttributeSourceLocator]);
++        //$this->privatesAccessor->setPrivateProperty($classReflector, 'sourceLocator', $aggregateSourceLocator);
+     }
+     private function createDummyClassScopeContext(\PHPStan\Analyser\MutatingScope $mutatingScope) : \PHPStan\Analyser\ScopeContext
+     {

tests/PHPStan/Composer/AutoloadFilesTest.php

@@ -15,6 +15,7 @@
 use function sort;
 use function strlen;
 use function substr;
+use const DIRECTORY_SEPARATOR;
 use const PHP_VERSION_ID;
 
 class AutoloadFilesTest extends TestCase
@@ -43,7 +44,10 @@ public function testExpectedFiles(): void
 			}
 
 			foreach ($json['autoload']['files'] as $file) {
-				$autoloadFile = substr(dirname($realpath) . '/' . $file, strlen($vendorPath) + 1);
+				$autoloadFile = substr(dirname($realpath) . DIRECTORY_SEPARATOR . $file, strlen($vendorPath) + 1);
+				if (strpos($autoloadFile, 'rector' . DIRECTORY_SEPARATOR . 'rector' . DIRECTORY_SEPARATOR) === 0) {
+					continue;
+				}
 				$autoloadFiles[] = $fileHelper->normalizePath($autoloadFile);
 			}
 		}