Updated Rector to commit fa8e597

rectorphp/rector-src@fa8e597 Use local version resolver (#36)

bin/rector.php

@@ -42,11 +42,6 @@
     $symfonyStyle->error($throwable->getMessage());
     exit(\RectorPrefix20210514\Symplify\PackageBuilder\Console\ShellCode::ERROR);
 }
-// preload local InstalledVersions.php - to fix incorrect version by same-named class in phpstan
-$currentlyInstalledVersions = __DIR__ . '/../../../../vendor/composer/InstalledVersions.php';
-if (\file_exists($currentlyInstalledVersions)) {
-    require_once $currentlyInstalledVersions;
-}
 /** @var ConsoleApplication $application */
 $application = $container->get(\Rector\Core\Console\ConsoleApplication::class);
 exit($application->run());

packages/ChangesReporting/Output/JsonOutputFormatter.php

@@ -39,7 +39,7 @@ public function getName() : string
     }
     public function report(\Rector\Core\ValueObject\ProcessResult $processResult) : void
     {
-        $errorsArray = ['meta' => ['version' => $this->configuration->getPrettyVersion(), 'config' => $this->configuration->getMainConfigFilePath()], 'totals' => ['changed_files' => \count($processResult->getFileDiffs()), 'removed_and_added_files_count' => $processResult->getRemovedAndAddedFilesCount(), 'removed_node_count' => $processResult->getRemovedNodeCount()]];
+        $errorsArray = ['meta' => ['config' => $this->configuration->getMainConfigFilePath()], 'totals' => ['changed_files' => \count($processResult->getFileDiffs()), 'removed_and_added_files_count' => $processResult->getRemovedAndAddedFilesCount(), 'removed_node_count' => $processResult->getRemovedNodeCount()]];
         $fileDiffs = $processResult->getFileDiffs();
         \ksort($fileDiffs);
         foreach ($fileDiffs as $fileDiff) {

src/Application/VersionResolver.php

@@ -0,0 +1,46 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\Core\Application;
+
+use RectorPrefix20210514\Composer\InstalledVersions;
+use RectorPrefix20210514\Nette\Utils\Strings;
+/**
+ * Inspired by https://github.com/symplify/symplify/pull/3179/files
+ * Local resolver is needed, because PHPStan is unprefixing its InstalledVersion classes and the API is changing way too often.
+ * This makes sure it works without dependency on external conditions.
+ */
+final class VersionResolver
+{
+    public function resolve() : string
+    {
+        // give local IntalledVersions a priority above anything else
+        $intalledVersionsFilepath = __DIR__ . '/../../vendor/composer/InstalledVersions.php';
+        if (\file_exists($intalledVersionsFilepath)) {
+            require_once $intalledVersionsFilepath;
+        }
+        $installedRawData = \RectorPrefix20210514\Composer\InstalledVersions::getRawData();
+        $rectorPackageData = $this->resolvePackageData($installedRawData);
+        if ($rectorPackageData === null) {
+            return 'Unknown';
+        }
+        if (isset($rectorPackageData['replaced'])) {
+            return 'replaced@' . $rectorPackageData['replaced'][0];
+        }
+        if ($rectorPackageData['version'] === 'dev-main') {
+            $reference = $rectorPackageData['reference'] ?? null;
+            if ($reference === null) {
+                return 'dev-main';
+            }
+            return 'dev-main@' . \RectorPrefix20210514\Nette\Utils\Strings::substring($rectorPackageData['reference'], 0, 7);
+        }
+        return $rectorPackageData['version'];
+    }
+    /**
+     * @param mixed[] $installedRawData
+     */
+    private function resolvePackageData(array $installedRawData) : ?array
+    {
+        return $installedRawData['versions']['rector/rector-src'] ?? $installedRawData['versions']['rector/rector'] ?? $installedRawData['root'] ?? null;
+    }
+}

src/Configuration/Configuration.php

@@ -3,7 +3,6 @@
 declare (strict_types=1);
 namespace Rector\Core\Configuration;
 
-use RectorPrefix20210514\Jean85\PrettyVersions;
 use RectorPrefix20210514\Nette\Utils\Strings;
 use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
 use Rector\Core\Exception\Configuration\InvalidConfigurationException;
@@ -89,11 +88,6 @@ public function resolveFromInput(\RectorPrefix20210514\Symfony\Component\Console
             $this->paths = $commandLinePaths;
         }
     }
-    public function getPrettyVersion() : string
-    {
-        $version = \RectorPrefix20210514\Jean85\PrettyVersions::getVersion('rector/rector');
-        return $version->getPrettyVersion();
-    }
     /**
      * @forTests
      */

src/Console/ConsoleApplication.php

@@ -4,9 +4,8 @@
 namespace Rector\Core\Console;
 
 use RectorPrefix20210514\Composer\XdebugHandler\XdebugHandler;
-use OutOfBoundsException;
 use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
-use Rector\Core\Configuration\Configuration;
+use Rector\Core\Application\VersionResolver;
 use Rector\Core\Configuration\Option;
 use Rector\Core\Console\Command\ProcessCommand;
 use Rector\Core\Exception\Configuration\InvalidConfigurationException;
@@ -26,13 +25,9 @@ final class ConsoleApplication extends \RectorPrefix20210514\Symfony\Component\C
     /**
      * @param Command[] $commands
      */
-    public function __construct(\Rector\Core\Configuration\Configuration $configuration, \RectorPrefix20210514\Symplify\PackageBuilder\Console\Command\CommandNaming $commandNaming, array $commands = [])
+    public function __construct(\Rector\Core\Application\VersionResolver $versionResolver, \RectorPrefix20210514\Symplify\PackageBuilder\Console\Command\CommandNaming $commandNaming, array $commands = [])
     {
-        try {
-            $version = $configuration->getPrettyVersion();
-        } catch (\OutOfBoundsException $exception) {
-            $version = 'Unknown';
-        }
+        $version = $versionResolver->resolve();
         parent::__construct(self::NAME, $version);
         foreach ($commands as $command) {
             $commandName = $commandNaming->resolveFromCommand($command);

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit4fc2c55889d3d94c2b1d3f0602fe6e7d::getLoader();
+return ComposerAutoloaderInitf6d96ea7adfab7704dfa6631d285d1fa::getLoader();

vendor/composer/autoload_classmap.php

@@ -393,8 +393,6 @@
     'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\EditorConfigFile' => $vendorDir . '/idiosyncratic/editorconfig/src/EditorConfigFile.php',
     'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\Exception\\InvalidValue' => $vendorDir . '/idiosyncratic/editorconfig/src/Exception/InvalidValue.php',
     'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\Section' => $vendorDir . '/idiosyncratic/editorconfig/src/Section.php',
-    'RectorPrefix20210514\\Jean85\\PrettyVersions' => $vendorDir . '/jean85/pretty-package-versions/src/PrettyVersions.php',
-    'RectorPrefix20210514\\Jean85\\Version' => $vendorDir . '/jean85/pretty-package-versions/src/Version.php',
     'RectorPrefix20210514\\Nette\\ArgumentOutOfRangeException' => $vendorDir . '/nette/utils/src/exceptions.php',
     'RectorPrefix20210514\\Nette\\Bridges\\CacheDI\\CacheExtension' => $vendorDir . '/nette/caching/src/Bridges/CacheDI/CacheExtension.php',
     'RectorPrefix20210514\\Nette\\Bridges\\CacheLatte\\CacheMacro' => $vendorDir . '/nette/caching/src/Bridges/CacheLatte/CacheMacro.php',
@@ -462,9 +460,6 @@
     'RectorPrefix20210514\\Nette\\Utils\\UnknownImageFileException' => $vendorDir . '/nette/utils/src/Utils/exceptions.php',
     'RectorPrefix20210514\\Nette\\Utils\\Validators' => $vendorDir . '/nette/utils/src/Utils/Validators.php',
     'RectorPrefix20210514\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
-    'RectorPrefix20210514\\PackageVersions\\FallbackVersions' => $vendorDir . '/composer/package-versions-deprecated/src/PackageVersions/FallbackVersions.php',
-    'RectorPrefix20210514\\PackageVersions\\Installer' => $vendorDir . '/composer/package-versions-deprecated/src/PackageVersions/Installer.php',
-    'RectorPrefix20210514\\PackageVersions\\Versions' => $vendorDir . '/composer/package-versions-deprecated/src/PackageVersions/Versions.php',
     'RectorPrefix20210514\\PrettyXml\\Formatter' => $vendorDir . '/shanethehat/pretty-xml/src/PrettyXml/Formatter.php',
     'RectorPrefix20210514\\Psr\\Container\\ContainerExceptionInterface' => $vendorDir . '/psr/container/src/ContainerExceptionInterface.php',
     'RectorPrefix20210514\\Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
@@ -1693,6 +1688,7 @@
     'Rector\\Core\\Application\\FileProcessor\\PhpFileProcessor' => $baseDir . '/src/Application/FileProcessor/PhpFileProcessor.php',
     'Rector\\Core\\Application\\FileSystem\\RemovedAndAddedFilesCollector' => $baseDir . '/src/Application/FileSystem/RemovedAndAddedFilesCollector.php',
     'Rector\\Core\\Application\\FileSystem\\RemovedAndAddedFilesProcessor' => $baseDir . '/src/Application/FileSystem/RemovedAndAddedFilesProcessor.php',
+    'Rector\\Core\\Application\\VersionResolver' => $baseDir . '/src/Application/VersionResolver.php',
     'Rector\\Core\\Autoloading\\AdditionalAutoloader' => $baseDir . '/src/Autoloading/AdditionalAutoloader.php',
     'Rector\\Core\\Autoloading\\BootstrapFilesIncluder' => $baseDir . '/src/Autoloading/BootstrapFilesIncluder.php',
     'Rector\\Core\\Bootstrap\\ExtensionConfigResolver' => $baseDir . '/src/Bootstrap/ExtensionConfigResolver.php',

vendor/composer/autoload_psr4.php

@@ -58,8 +58,6 @@
     'RectorPrefix20210514\\Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
     'RectorPrefix20210514\\Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'RectorPrefix20210514\\PrettyXml\\' => array($vendorDir . '/shanethehat/pretty-xml/src/PrettyXml'),
-    'RectorPrefix20210514\\PackageVersions\\' => array($vendorDir . '/composer/package-versions-deprecated/src/PackageVersions'),
-    'RectorPrefix20210514\\Jean85\\' => array($vendorDir . '/jean85/pretty-package-versions/src'),
     'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\' => array($vendorDir . '/idiosyncratic/editorconfig/src'),
     'RectorPrefix20210514\\Ergebnis\\Json\\Printer\\' => array($vendorDir . '/ergebnis/json-printer/src'),
     'RectorPrefix20210514\\Doctrine\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib/Doctrine/Inflector'),

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit4fc2c55889d3d94c2b1d3f0602fe6e7d
+class ComposerAutoloaderInitf6d96ea7adfab7704dfa6631d285d1fa
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit4fc2c55889d3d94c2b1d3f0602fe6e7d', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitf6d96ea7adfab7704dfa6631d285d1fa', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit4fc2c55889d3d94c2b1d3f0602fe6e7d', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitf6d96ea7adfab7704dfa6631d285d1fa', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitf6d96ea7adfab7704dfa6631d285d1fa::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitf6d96ea7adfab7704dfa6631d285d1fa::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire4fc2c55889d3d94c2b1d3f0602fe6e7d($fileIdentifier, $file);
+            composerRequiref6d96ea7adfab7704dfa6631d285d1fa($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire4fc2c55889d3d94c2b1d3f0602fe6e7d($fileIdentifier, $file)
+function composerRequiref6d96ea7adfab7704dfa6631d285d1fa($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d
+class ComposerStaticInitf6d96ea7adfab7704dfa6631d285d1fa
 {
     public static $files = array (
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -82,8 +82,6 @@ class ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d
             'RectorPrefix20210514\\Psr\\EventDispatcher\\' => 41,
             'RectorPrefix20210514\\Psr\\Container\\' => 35,
             'RectorPrefix20210514\\PrettyXml\\' => 31,
-            'RectorPrefix20210514\\PackageVersions\\' => 37,
-            'RectorPrefix20210514\\Jean85\\' => 28,
             'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\' => 48,
             'RectorPrefix20210514\\Ergebnis\\Json\\Printer\\' => 43,
             'RectorPrefix20210514\\Doctrine\\Inflector\\' => 40,
@@ -308,14 +306,6 @@ class ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d
         array (
             0 => __DIR__ . '/..' . '/shanethehat/pretty-xml/src/PrettyXml',
         ),
-        'RectorPrefix20210514\\PackageVersions\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/composer/package-versions-deprecated/src/PackageVersions',
-        ),
-        'RectorPrefix20210514\\Jean85\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/jean85/pretty-package-versions/src',
-        ),
         'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\' => 
         array (
             0 => __DIR__ . '/..' . '/idiosyncratic/editorconfig/src',
@@ -738,8 +728,6 @@ class ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d
         'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\EditorConfigFile' => __DIR__ . '/..' . '/idiosyncratic/editorconfig/src/EditorConfigFile.php',
         'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\Exception\\InvalidValue' => __DIR__ . '/..' . '/idiosyncratic/editorconfig/src/Exception/InvalidValue.php',
         'RectorPrefix20210514\\Idiosyncratic\\EditorConfig\\Section' => __DIR__ . '/..' . '/idiosyncratic/editorconfig/src/Section.php',
-        'RectorPrefix20210514\\Jean85\\PrettyVersions' => __DIR__ . '/..' . '/jean85/pretty-package-versions/src/PrettyVersions.php',
-        'RectorPrefix20210514\\Jean85\\Version' => __DIR__ . '/..' . '/jean85/pretty-package-versions/src/Version.php',
         'RectorPrefix20210514\\Nette\\ArgumentOutOfRangeException' => __DIR__ . '/..' . '/nette/utils/src/exceptions.php',
         'RectorPrefix20210514\\Nette\\Bridges\\CacheDI\\CacheExtension' => __DIR__ . '/..' . '/nette/caching/src/Bridges/CacheDI/CacheExtension.php',
         'RectorPrefix20210514\\Nette\\Bridges\\CacheLatte\\CacheMacro' => __DIR__ . '/..' . '/nette/caching/src/Bridges/CacheLatte/CacheMacro.php',
@@ -807,9 +795,6 @@ class ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d
         'RectorPrefix20210514\\Nette\\Utils\\UnknownImageFileException' => __DIR__ . '/..' . '/nette/utils/src/Utils/exceptions.php',
         'RectorPrefix20210514\\Nette\\Utils\\Validators' => __DIR__ . '/..' . '/nette/utils/src/Utils/Validators.php',
         'RectorPrefix20210514\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
-        'RectorPrefix20210514\\PackageVersions\\FallbackVersions' => __DIR__ . '/..' . '/composer/package-versions-deprecated/src/PackageVersions/FallbackVersions.php',
-        'RectorPrefix20210514\\PackageVersions\\Installer' => __DIR__ . '/..' . '/composer/package-versions-deprecated/src/PackageVersions/Installer.php',
-        'RectorPrefix20210514\\PackageVersions\\Versions' => __DIR__ . '/..' . '/composer/package-versions-deprecated/src/PackageVersions/Versions.php',
         'RectorPrefix20210514\\PrettyXml\\Formatter' => __DIR__ . '/..' . '/shanethehat/pretty-xml/src/PrettyXml/Formatter.php',
         'RectorPrefix20210514\\Psr\\Container\\ContainerExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerExceptionInterface.php',
         'RectorPrefix20210514\\Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
@@ -2038,6 +2023,7 @@ class ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d
         'Rector\\Core\\Application\\FileProcessor\\PhpFileProcessor' => __DIR__ . '/../..' . '/src/Application/FileProcessor/PhpFileProcessor.php',
         'Rector\\Core\\Application\\FileSystem\\RemovedAndAddedFilesCollector' => __DIR__ . '/../..' . '/src/Application/FileSystem/RemovedAndAddedFilesCollector.php',
         'Rector\\Core\\Application\\FileSystem\\RemovedAndAddedFilesProcessor' => __DIR__ . '/../..' . '/src/Application/FileSystem/RemovedAndAddedFilesProcessor.php',
+        'Rector\\Core\\Application\\VersionResolver' => __DIR__ . '/../..' . '/src/Application/VersionResolver.php',
         'Rector\\Core\\Autoloading\\AdditionalAutoloader' => __DIR__ . '/../..' . '/src/Autoloading/AdditionalAutoloader.php',
         'Rector\\Core\\Autoloading\\BootstrapFilesIncluder' => __DIR__ . '/../..' . '/src/Autoloading/BootstrapFilesIncluder.php',
         'Rector\\Core\\Bootstrap\\ExtensionConfigResolver' => __DIR__ . '/../..' . '/src/Bootstrap/ExtensionConfigResolver.php',
@@ -3484,9 +3470,9 @@ class ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit4fc2c55889d3d94c2b1d3f0602fe6e7d::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitf6d96ea7adfab7704dfa6631d285d1fa::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitf6d96ea7adfab7704dfa6631d285d1fa::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitf6d96ea7adfab7704dfa6631d285d1fa::$classMap;
 
         }, null, ClassLoader::class);
     }