Updated Rector to commit fe4d90d829b8bd17eff843f0e3de7a5a9cf0e023

rectorphp/rector-src@fe4d90d [DX] Remove complementary interface, as not practical (#4757)
rectorphp · Aug 10, 2023 · 90a98ad · 90a98ad
1 parent f594570
commit 90a98ad
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 43 deletions.
diff --git a/packages/PostRector/Contract/Rector/ComplementaryRectorInterface.php b/packages/PostRector/Contract/Rector/ComplementaryRectorInterface.php
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '0.17.11';
+    public const PACKAGE_VERSION = 'fe4d90d829b8bd17eff843f0e3de7a5a9cf0e023';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-08-10 11:50:12';
+    public const RELEASE_DATE = '2023-08-10 12:58:03';
     /**
      * @var int
      */

diff --git a/src/Configuration/ConfigInitializer.php b/src/Configuration/ConfigInitializer.php
@@ -8,7 +8,6 @@
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\FileSystem\InitFilePathsResolver;
 use Rector\Core\Php\PhpVersionProvider;
-use Rector\PostRector\Contract\Rector\ComplementaryRectorInterface;
 use Rector\PostRector\Contract\Rector\PostRectorInterface;
 use RectorPrefix202308\Symfony\Component\Console\Style\SymfonyStyle;
 use RectorPrefix202308\Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
@@ -41,11 +40,7 @@ public function __construct(iterable $rectors, InitFilePathsResolver $initFilePa
         $this->initFilePathsResolver = $initFilePathsResolver;
         $this->symfonyStyle = $symfonyStyle;
         $this->phpVersionProvider = $phpVersionProvider;
-        if ($rectors instanceof RewindableGenerator) {
-            $this->rectors = \iterator_to_array($rectors->getIterator());
-        } else {
-            $this->rectors = $rectors;
-        }
+        $this->rectors = $rectors instanceof RewindableGenerator ? \iterator_to_array($rectors->getIterator()) : $rectors;
     }
     public function createConfig(string $projectDirectory) : void
     {
@@ -77,10 +72,7 @@ public function areSomeRectorsLoaded() : bool
     private function filterActiveRectors(array $rectors) : array
     {
         return \array_filter($rectors, static function (RectorInterface $rector) : bool {
-            if ($rector instanceof PostRectorInterface) {
-                return \false;
-            }
-            return !$rector instanceof ComplementaryRectorInterface;
+            return !$rector instanceof PostRectorInterface;
         });
     }
     private function replacePhpLevelContents(string $rectorPhpTemplateContents) : string

diff --git a/src/Console/Command/ListRulesCommand.php b/src/Console/Command/ListRulesCommand.php
@@ -7,7 +7,6 @@
 use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
 use Rector\Core\Configuration\Option;
 use Rector\Core\Contract\Rector\RectorInterface;
-use Rector\PostRector\Contract\Rector\ComplementaryRectorInterface;
 use Rector\PostRector\Contract\Rector\PostRectorInterface;
 use Rector\Skipper\SkipCriteriaResolver\SkippedClassResolver;
 use RectorPrefix202308\Symfony\Component\Console\Command\Command;
@@ -75,10 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output) : int
     private function resolveRectorClasses() : array
     {
         $customRectors = \array_filter($this->rectors, static function (RectorInterface $rector) : bool {
-            if ($rector instanceof PostRectorInterface) {
-                return \false;
-            }
-            return !$rector instanceof ComplementaryRectorInterface;
+            return !$rector instanceof PostRectorInterface;
         });
         $rectorClasses = \array_map(static function (RectorInterface $rector) : string {
             return \get_class($rector);

diff --git a/src/NonPhpFile/Rector/RenameClassNonPhpRector.php b/src/NonPhpFile/Rector/RenameClassNonPhpRector.php
@@ -7,12 +7,11 @@
 use Rector\Core\Configuration\RenamedClassesDataCollector;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Contract\Rector\NonPhpRectorInterface;
-use Rector\PostRector\Contract\Rector\ComplementaryRectorInterface;
 use Symplify\RuleDocGenerator\Contract\ConfigurableRuleInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use RectorPrefix202308\Webmozart\Assert\Assert;
-final class RenameClassNonPhpRector implements NonPhpRectorInterface, ConfigurableRuleInterface, ConfigurableRectorInterface, ComplementaryRectorInterface
+final class RenameClassNonPhpRector implements NonPhpRectorInterface, ConfigurableRuleInterface, ConfigurableRectorInterface
 {
     /**
      * @readonly

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit16ae27751232a06317e2f21c28d3d598::getLoader();
+return ComposerAutoloaderInitbfb8584841a8ff684295ce35ac926789::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
@@ -2300,7 +2300,6 @@
     'Rector\\PostRector\\Application\\PostFileProcessor' => $baseDir . '/packages/PostRector/Application/PostFileProcessor.php',
     'Rector\\PostRector\\Collector\\UseNodesToAddCollector' => $baseDir . '/packages/PostRector/Collector/UseNodesToAddCollector.php',
     'Rector\\PostRector\\Contract\\Collector\\NodeCollectorInterface' => $baseDir . '/packages/PostRector/Contract/Collector/NodeCollectorInterface.php',
-    'Rector\\PostRector\\Contract\\Rector\\ComplementaryRectorInterface' => $baseDir . '/packages/PostRector/Contract/Rector/ComplementaryRectorInterface.php',
     'Rector\\PostRector\\Contract\\Rector\\PostRectorDependencyInterface' => $baseDir . '/packages/PostRector/Contract/Rector/PostRectorDependencyInterface.php',
     'Rector\\PostRector\\Contract\\Rector\\PostRectorInterface' => $baseDir . '/packages/PostRector/Contract/Rector/PostRectorInterface.php',
     'Rector\\PostRector\\Rector\\AbstractPostRector' => $baseDir . '/packages/PostRector/Rector/AbstractPostRector.php',

diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit16ae27751232a06317e2f21c28d3d598
+class ComposerAutoloaderInitbfb8584841a8ff684295ce35ac926789
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit16ae27751232a06317e2f21c28d3d598', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitbfb8584841a8ff684295ce35ac926789', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit16ae27751232a06317e2f21c28d3d598', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitbfb8584841a8ff684295ce35ac926789', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit16ae27751232a06317e2f21c28d3d598::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitbfb8584841a8ff684295ce35ac926789::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit16ae27751232a06317e2f21c28d3d598::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitbfb8584841a8ff684295ce35ac926789::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit16ae27751232a06317e2f21c28d3d598
+class ComposerStaticInitbfb8584841a8ff684295ce35ac926789
 {
     public static $files = array (
         'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@@ -2554,7 +2554,6 @@ class ComposerStaticInit16ae27751232a06317e2f21c28d3d598
         'Rector\\PostRector\\Application\\PostFileProcessor' => __DIR__ . '/../..' . '/packages/PostRector/Application/PostFileProcessor.php',
         'Rector\\PostRector\\Collector\\UseNodesToAddCollector' => __DIR__ . '/../..' . '/packages/PostRector/Collector/UseNodesToAddCollector.php',
         'Rector\\PostRector\\Contract\\Collector\\NodeCollectorInterface' => __DIR__ . '/../..' . '/packages/PostRector/Contract/Collector/NodeCollectorInterface.php',
-        'Rector\\PostRector\\Contract\\Rector\\ComplementaryRectorInterface' => __DIR__ . '/../..' . '/packages/PostRector/Contract/Rector/ComplementaryRectorInterface.php',
         'Rector\\PostRector\\Contract\\Rector\\PostRectorDependencyInterface' => __DIR__ . '/../..' . '/packages/PostRector/Contract/Rector/PostRectorDependencyInterface.php',
         'Rector\\PostRector\\Contract\\Rector\\PostRectorInterface' => __DIR__ . '/../..' . '/packages/PostRector/Contract/Rector/PostRectorInterface.php',
         'Rector\\PostRector\\Rector\\AbstractPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/AbstractPostRector.php',
@@ -3000,9 +2999,9 @@ class ComposerStaticInit16ae27751232a06317e2f21c28d3d598
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit16ae27751232a06317e2f21c28d3d598::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit16ae27751232a06317e2f21c28d3d598::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit16ae27751232a06317e2f21c28d3d598::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitbfb8584841a8ff684295ce35ac926789::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitbfb8584841a8ff684295ce35ac926789::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitbfb8584841a8ff684295ce35ac926789::$classMap;
 
         }, null, ClassLoader::class);
     }