From 38cb4c9684920ceeb121ced398fd7e3c70f6435e Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 28 May 2022 02:41:24 +0700 Subject: [PATCH] Move Bootstrap file includer to load in RectorContainerFactory (#2382) * Move Bootstrap file includer to load in RectorContainerFactory * [ci-review] Rector Rectify * keep in test * back to ^1.7.1 Co-authored-by: GitHub Action --- build/target-repository/composer.json | 2 +- composer.json | 2 +- src/Console/Command/ProcessCommand.php | 5 ----- src/DependencyInjection/RectorContainerFactory.php | 5 +++++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/target-repository/composer.json b/build/target-repository/composer.json index 782b0a18823..7bd64ca3121 100644 --- a/build/target-repository/composer.json +++ b/build/target-repository/composer.json @@ -7,7 +7,7 @@ ], "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "1.7.1" + "phpstan/phpstan": "^1.7.1" }, "autoload": { "files": [ diff --git a/composer.json b/composer.json index 3b54083e6e5..b6163d78f94 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "nikic/php-parser": "^4.13.2", "ondram/ci-detector": "^4.1", "phpstan/phpdoc-parser": "^1.5.1", - "phpstan/phpstan": "1.7.1", + "phpstan/phpstan": "^1.7.1", "phpstan/phpstan-phpunit": "^1.0", "react/child-process": "^0.6.4", "react/event-loop": "^1.3", diff --git a/src/Console/Command/ProcessCommand.php b/src/Console/Command/ProcessCommand.php index e740101db0a..33828bdaeda 100644 --- a/src/Console/Command/ProcessCommand.php +++ b/src/Console/Command/ProcessCommand.php @@ -8,7 +8,6 @@ use Rector\Caching\Detector\ChangedFilesDetector; use Rector\ChangesReporting\Output\JsonOutputFormatter; use Rector\Core\Application\ApplicationFileProcessor; use Rector\Core\Autoloading\AdditionalAutoloader; -use Rector\Core\Autoloading\BootstrapFilesIncluder; use Rector\Core\Configuration\Option; use Rector\Core\Console\Output\OutputFormatterCollector; use Rector\Core\Contract\Console\OutputStyleInterface; @@ -33,7 +32,6 @@ final class ProcessCommand extends AbstractProcessCommand private readonly ChangedFilesDetector $changedFilesDetector, private readonly MissingRectorRulesReporter $missingRectorRulesReporter, private readonly ApplicationFileProcessor $applicationFileProcessor, - private readonly BootstrapFilesIncluder $bootstrapFilesIncluder, private readonly ProcessResultFactory $processResultFactory, private readonly DynamicSourceLocatorDecorator $dynamicSourceLocatorDecorator, private readonly EmptyConfigurableRectorChecker $emptyConfigurableRectorChecker, @@ -67,9 +65,6 @@ final class ProcessCommand extends AbstractProcessCommand $this->rectorOutputStyle->setVerbosity(OutputInterface::VERBOSITY_QUIET); } - // register autoloaded and included files - $this->bootstrapFilesIncluder->includeBootstrapFiles(); - $this->additionalAutoloader->autoloadInput($input); $this->additionalAutoloader->autoloadPaths(); diff --git a/src/DependencyInjection/RectorContainerFactory.php b/src/DependencyInjection/RectorContainerFactory.php index 5cae4ce3e29..2da6f8e262e 100644 --- a/src/DependencyInjection/RectorContainerFactory.php +++ b/src/DependencyInjection/RectorContainerFactory.php @@ -7,6 +7,7 @@ namespace Rector\Core\DependencyInjection; use Nette\Utils\FileSystem; use Psr\Container\ContainerInterface; use Rector\Caching\Detector\ChangedFilesDetector; +use Rector\Core\Autoloading\BootstrapFilesIncluder; use Rector\Core\Kernel\RectorKernel; use Rector\Core\ValueObject\Bootstrap\BootstrapConfigs; use Symfony\Component\Console\Style\SymfonyStyle; @@ -42,6 +43,10 @@ final class RectorContainerFactory $changedFilesDetector->setFirstResolvedConfigFileInfo($mainConfigFile); } + /** @var BootstrapFilesIncluder $bootstrapFilesIncluder */ + $bootstrapFilesIncluder = $container->get(BootstrapFilesIncluder::class); + $bootstrapFilesIncluder->includeBootstrapFiles(); + return $container; }