Fixing Compiler

compiler/build/scoper.inc.php

@@ -20,7 +20,7 @@
     'files-whitelist' => $whitelistedStubsProvider->provide(),
     'patchers' => [
         function (string $filePath, string $prefix, string $content): string {
-            if ($filePath !== 'bin/rector') {
+            if ($filePath !== 'bin/rector' /* && ! Strings::contains($filePath, 'config/')*/) {
                 return $content;
             }
 
@@ -61,7 +61,7 @@ function (string $filePath, string $prefix, string $content): string {
             );
         },
         function (string $filePath, string $prefix, string $content): string {
-            if ($filePath !== 'src/Testing/TestCase.php') {
+            if ($filePath !== 'vendor/phpstan/phpstan-src/src/Testing/TestCase.php') {
                 return $content;
             }
 
@@ -72,7 +72,7 @@ function (string $filePath, string $prefix, string $content): string {
             );
         },
         function (string $filePath, string $prefix, string $content): string {
-            if ($filePath !== 'src/Testing/LevelsTestCase.php') {
+            if ($filePath !== 'vendor/phpstan/phpstan-src/src/Testing/LevelsTestCase.php') {
                 return $content;
             }
 
@@ -86,18 +86,15 @@ function (string $filePath, string $prefix, string $content): string {
             );
         },
 
-        // unprefix configuraion in sets, @see https://github.com/rectorphp/rector/issues/3227
+        // unprefix excluded classes
+        // fixes https://github.com/humbug/box/issues/470
         function (string $filePath, string $prefix, string $content): string {
-            // only *.yaml files
-            if (! Strings::endsWith($filePath, '.yaml')) {
-                return $content;
-            }
-
-            if (! Strings::startsWith($filePath, 'config/set/')) {
-                return $content;
+            foreach (StaticEasyPrefixer::EXCLUDED_CLASSES as $excludedClass) {
+                $prefixedClassPattern = '#' . $prefix . '\\\\' . preg_quote($excludedClass, '#') . '#';
+                $content = Strings::replace($content, $prefixedClassPattern, $excludedClass);
             }
 
-            return StaticEasyPrefixer::unPrefixQuotedValues($prefix, $content);
+            return $content;
         },
 
         // mimics https://github.com/phpstan/phpstan-src/commit/5a6a22e5c4d38402c8cc888d8732360941c33d43#diff-463a36e4a5687fb2366b5ee56cdad92d
@@ -150,6 +147,44 @@ function (string $filePath, string $prefix, string $content): string {
 
             return StaticEasyPrefixer::unPreSlashQuotedValues($content);
         },
+
+        // mimics
+        // https://github.com/phpstan/phpstan-src/commit/9c2eb91b630bdfee2c1bb642a4c81ebfa0f1ca9a#diff-87f75ce3f908a819a9a2c77ffeffcc38
+        // https://github.com/phpstan/phpstan-src/commit/7048109ab17aa16102dc0fd21190782e6d6d5e7e#diff-87f75ce3f908a819a9a2c77ffeffcc38
+        function (string $filePath, string $prefix, string $content): string {
+            if (! in_array($filePath, [
+                'vendor/phpstan/phpstan-src/src/Type/TypehintHelper.php',
+                'vendor/ondrejmirtes/better-reflection/src/Reflection/Adapter/ReflectionUnionType.php',
+            ], true)) {
+                return $content;
+            }
+
+            return str_replace(sprintf('%s\\ReflectionUnionType', $prefix), 'ReflectionUnionType', $content);
+        },
+
+        // mimics: https://github.com/phpstan/phpstan-src/commit/6bb92ed7b92b186bb1eb5111bc49ec7679ed780f#diff-87f75ce3f908a819a9a2c77ffeffcc38
+        function (string $filePath, string $prefix, string $content): string {
+            return str_replace('private static final', 'private static', $content);
+        },
+
+        // mimics: https://github.com/phpstan/phpstan-src/commit/1c63a785e5fce8d031b04f52c61904bd57b51e27#diff-87f75ce3f908a819a9a2c77ffeffcc38
+        function (string $filePath, string $prefix, string $content): string {
+            if (! in_array($filePath, [
+                'vendor/phpstan/phpstan-src/src/Testing/TestCaseSourceLocatorFactory.php',
+                'vendor/phpstan/phpstan-src/src/Testing/TestCase.php',
+            ], true)) {
+                return $content;
+            }
+
+            return str_replace(
+                sprintf('%s\\Composer\\Autoload\\ClassLoader', $prefix),
+                'Composer\\Autoload\\ClassLoader',
+                $content
+            );
+        },
+
+
+
     ],
-    'whitelist' => StaticEasyPrefixer::EXCLUDED_NAMESPACES_AND_CLASSES,
+    'whitelist' => StaticEasyPrefixer::getExcludedNamespacesAndClasses(),
 ];

compiler/config/config.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+use OndraM\CiDetector\CiDetector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symfony\Component\Filesystem\Filesystem;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+
+    $parameters->set('dataDir', __DIR__ . '/../build');
+
+    $parameters->set('buildDir', __DIR__ . '/../..');
+
+    $services = $containerConfigurator->services();
+
+    $services->defaults()
+        ->public()
+        ->autowire();
+
+    $services->load('Rector\Compiler\\', __DIR__ . '/../src')
+        ->exclude([
+            __DIR__ . '/../src/Exception/*',
+            __DIR__ . '/../src/DependencyInjection/*',
+            __DIR__ . '/../src/HttpKernel/*',
+            __DIR__ . '/../src/PhpScoper/*',
+        ]);
+
+    $services->set(Filesystem::class);
+
+    $services->set(CiDetector::class);
+};

compiler/src/Composer/ComposerJsonManipulator.php

@@ -65,7 +65,9 @@ public function fixComposerJson(string $composerJsonFile): void
         $encodedJson = Json::encode($json, Json::PRETTY);
 
         // show diff
-        $this->consoleDiffer->diff($this->originalComposerJsonFileContent, $encodedJson);
+        if ($encodedJson !== $this->originalComposerJsonFileContent) {
+            $this->consoleDiffer->diff($this->originalComposerJsonFileContent, $encodedJson);
+        }
 
         $this->filesystem->dumpFile($composerJsonFile, $encodedJson);
     }

compiler/src/Console/Command/CompileCommand.php

@@ -20,6 +20,11 @@
  */
 final class CompileCommand extends Command
 {
+    /**
+     * @var string
+     */
+    private const ANSI = '--ansi';
+
     /**
      * @var string
      */
@@ -80,6 +85,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $composerJsonFile = $this->buildDir . '/composer.json';
 
         $this->symfonyStyle->title('1. Adding "phpstan/phpstan-src" to ' . $composerJsonFile);
+
         $this->composerJsonManipulator->fixComposerJson($composerJsonFile);
 
         $this->symfonyStyle->newLine(2);
@@ -93,39 +99,43 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             '--prefer-dist',
             '--no-interaction',
             '--classmap-authoritative',
-            '--ansi',
+            self::ANSI,
         ], $this->buildDir, null, null, null);
-
         $process->mustRun(static function (string $type, string $buffer) use ($output): void {
             $output->write($buffer);
         });
 
         $this->symfonyStyle->newLine(2);
 
+        $this->symfonyStyle->title('3. Downgrading PHPStan code to PHP 7.1');
+
         $this->downgradePHPStanCodeToPHP71($output);
 
-        $this->symfonyStyle->title('3. Renaming PHPStorm stubs from "*.php" to ".stub"');
+        $this->symfonyStyle->title('4. Renaming PHPStorm stubs from "*.php" to ".stub"');
 
         $this->jetbrainsStubsRenamer->renamePhpStormStubs($this->buildDir);
-
         $this->symfonyStyle->newLine(2);
 
         // the '--no-parallel' is needed, so "scoper.php.inc" can "require __DIR__ ./vendor/autoload.php"
         // and "Nette\Neon\Neon" class can be used there
-        $this->symfonyStyle->title('4. Packing and prefixing rector.phar with Box and PHP Scoper');
-
-        $process = new Process(['php', 'box.phar', 'compile', '--no-parallel'], $this->dataDir, null, null, null);
+        $this->symfonyStyle->title('5. Packing and prefixing rector.phar with Box and PHP Scoper');
 
+        $process = new Process([
+            'php',
+            'box.phar',
+            'compile',
+            '--no-parallel',
+            self::ANSI,
+        ], $this->dataDir, null, null, null);
         $process->mustRun(static function (string $type, string $buffer) use ($output): void {
             $output->write($buffer);
         });
 
         $this->symfonyStyle->newLine(2);
 
-        $this->symfonyStyle->title('5. Restoring root composer.json with "require-dev"');
+        $this->symfonyStyle->title('6. Restoring root composer.json with "require-dev"');
 
         $this->composerJsonManipulator->restoreComposerJson($composerJsonFile);
-
         $this->restoreDependenciesLocallyIfNotCi($output);
 
         return ShellCode::SUCCESS;
@@ -137,7 +147,7 @@ private function restoreDependenciesLocallyIfNotCi(OutputInterface $output): voi
             return;
         }
 
-        $process = new Process(['composer', 'install'], $this->buildDir, null, null, null);
+        $process = new Process(['composer', 'install', self::ANSI], $this->buildDir, null, null, null);
         $process->mustRun(static function (string $type, string $buffer) use ($output): void {
             $output->write($buffer);
         });

compiler/src/HttpKernel/RectorCompilerKernel.php

@@ -27,7 +27,7 @@ public function getLogDir(): string
 
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
-        $loader->load(__DIR__ . '/../../config/config.yaml');
+        $loader->load(__DIR__ . '/../../config/config.php');
     }
 
     /**

compiler/src/PhpScoper/StaticEasyPrefixer.php

@@ -11,22 +11,30 @@ final class StaticEasyPrefixer
     /**
      * @var string[]
      */
-    public const EXCLUDED_NAMESPACES_AND_CLASSES = [
+    public const EXCLUDED_CLASSES = [
+        'Symfony\Component\EventDispatcher\EventSubscriberInterface',
+        'Symfony\Component\Console\Style\SymfonyStyle',
+        // doctrine annotations to autocomplete
+        'JMS\DiExtraBundle\Annotation\Inject',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private const EXCLUDED_NAMESPACES = [
         'Hoa\*',
         'PhpParser\*',
         'PHPStan\*',
         'Rector\*',
         'Symplify\SmartFileSystem\*',
-        'Symfony\Component\EventDispatcher\EventSubscriberInterface',
-        'Symfony\Component\Console\Style\SymfonyStyle',
+        'Symplify\ConsoleColorDiff\*',
         // doctrine annotations to autocomplete
         'Doctrine\ORM\Mapping\*',
-        'JMS\DiExtraBundle\Annotation\Inject',
     ];
 
     public static function prefixClass(string $class, string $prefix): string
     {
-        foreach (self::EXCLUDED_NAMESPACES_AND_CLASSES as $excludedNamespace) {
+        foreach (self::EXCLUDED_NAMESPACES as $excludedNamespace) {
             $excludedNamespace = Strings::substring($excludedNamespace, 0, -2) . '\\';
             if (Strings::startsWith($class, $excludedNamespace)) {
                 return $class;
@@ -54,4 +62,12 @@ public static function unPreSlashQuotedValues(string $content): string
     {
         return Strings::replace($content, '#\'\\\\(\w|@)#', "'$1");
     }
+
+    /**
+     * @return string[]
+     */
+    public static function getExcludedNamespacesAndClasses(): array
+    {
+        return array_merge(self::EXCLUDED_NAMESPACES, self::EXCLUDED_CLASSES);
+    }
 }

config/services.php

@@ -16,10 +16,12 @@
 use Rector\Core\PhpParser\Parser\NikicPhpParserFactory;
 use Symfony\Component\Console\Application as SymfonyApplication;
 use Symfony\Component\Console\Descriptor\TextDescriptor;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Filesystem\Filesystem;
+use Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory;
 use Symplify\PackageBuilder\Parameter\ParameterProvider;
 use Symplify\PackageBuilder\Reflection\PrivatesAccessor;
 use Symplify\PackageBuilder\Reflection\PrivatesCaller;
@@ -89,4 +91,9 @@
     $services->alias(EventDispatcherInterface::class, AutowiredEventDispatcher::class);
 
     $services->set(SmartFileSystem::class);
+
+    $services->set(SymfonyStyleFactory::class);
+
+    $services->set(SymfonyStyle::class)
+        ->factory([ref(SymfonyStyleFactory::class), 'create']);
 };

packages/console-differ/config/config.php

@@ -8,12 +8,10 @@
 use SebastianBergmann\Diff\Differ;
 use SebastianBergmann\Diff\Output\StrictUnifiedDiffOutputBuilder;
 use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
-use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
 use Symplify\ConsoleColorDiff\Console\Formatter\ColorConsoleDiffFormatter;
 use Symplify\ConsoleColorDiff\Console\Output\ConsoleDiffer;
-use Symplify\PackageBuilder\Console\Style\SymfonyStyleFactory;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
@@ -50,9 +48,4 @@
     $services->set(ColorConsoleDiffFormatter::class);
 
     $services->set(ConsoleDiffer::class);
-
-    $services->set(SymfonyStyleFactory::class);
-
-    $services->set(SymfonyStyle::class)
-        ->factory([ref(SymfonyStyleFactory::class), 'create']);
 };