Skip to content

Commit

Permalink
[Core] Remove deprecated ContainerConfigurator warning since RectorCo…
Browse files Browse the repository at this point in the history
…nfig available since 0.12 (#3217)

Co-authored-by: GitHub Action <action@github.com>
  • Loading branch information
samsonasik and actions-user committed Dec 18, 2022
1 parent 135483f commit 8354587
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
declare(strict_types=1);

use Rector\CodeQuality\Rector\ClassConstFetch\ConvertStaticPrivateConstantToSelfRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Rector\Config\RectorConfig;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();
$services->set(ConvertStaticPrivateConstantToSelfRector::class);
return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(ConvertStaticPrivateConstantToSelfRector::class);
};
13 changes: 0 additions & 13 deletions src/DependencyInjection/RectorContainerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@

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\Exception\DeprecatedException;
use Rector\Core\Kernel\RectorKernel;
use Rector\Core\ValueObject\Bootstrap\BootstrapConfigs;

Expand All @@ -21,17 +19,6 @@ public function createFromBootstrapConfigs(BootstrapConfigs $bootstrapConfigs):
$mainConfigFile = $bootstrapConfigs->getMainConfigFile();

if ($mainConfigFile !== null) {
// warning about old syntax before RectorConfig
$fileContents = FileSystem::read($mainConfigFile);
if (str_contains($fileContents, 'ContainerConfigurator $containerConfigurator')) {
$warningMessage = sprintf(
'Your "%s" config uses deprecated syntax with "ContainerConfigurator".%sUpgrade to "RectorConfig": https://getrector.org/blog/new-in-rector-012-introducing-rector-config-with-autocomplete',
$mainConfigFile,
PHP_EOL,
);
throw new DeprecatedException($warningMessage);
}

/** @var ChangedFilesDetector $changedFilesDetector */
$changedFilesDetector = $container->get(ChangedFilesDetector::class);
$changedFilesDetector->setFirstResolvedConfigFileInfo($mainConfigFile);
Expand Down
3 changes: 3 additions & 0 deletions src/Exception/DeprecatedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

use Exception;

/**
* @api
*/
final class DeprecatedException extends Exception
{
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\Core\Tests\Issues\PartialValueDocblockUpdate\Source\TestRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$services = $containerConfigurator->services();
$services->set(TestRector::class);
return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(TestRector::class);
};

0 comments on commit 8354587

Please sign in to comment.