use more configs

rectorphp · Feb 9, 2021 · 495b778 · 495b778
1 parent 49a3725
commit 495b778
Show file tree

Hide file tree

Showing 39 changed files with 274 additions and 247 deletions.
diff --git a/docs/rector_rules_overview.md b/docs/rector_rules_overview.md
@@ -13965,7 +13965,7 @@ return static function (ContainerConfigurator $containerConfigurator): void {
 
     $services->set(InferParamFromClassMethodReturnRector::class)
         ->call('configure', [[
-            InferParamFromClassMethodReturnRector::INFER_PARAMS_FROM_CLASS_METHOD_RETURNS => ValueObjectInliner::inline([
+            InferParamFromClassMethodReturnRector::PARAM_FROM_CLASS_METHOD_RETURNS => ValueObjectInliner::inline([
                 new InferParamFromClassMethodReturn('SomeClass', 'process', 'getNodeTypes'),
             ]),
         ]]);

diff --git a/packages/testing/src/PHPUnit/AbstractRectorTestCase.php b/packages/testing/src/PHPUnit/AbstractRectorTestCase.php
@@ -101,11 +101,6 @@ abstract class AbstractRectorTestCase extends AbstractKernelTestCase
      */
     private $autoloadTestFixture = true;
 
-    /**
-     * @var mixed[]
-     */
-    private $oldParameterValues = [];
-
     /**
      * @var BetterStandardPrinter
      */
@@ -167,18 +162,6 @@ protected function setUp(): void
         $this->nodeScopeResolver = $this->getService(NodeScopeResolver::class);
 
         $this->configurePhpVersionFeatures();
-
-        $this->oldParameterValues = [];
-    }
-
-    protected function tearDown(): void
-    {
-        $this->restoreOldParameterValues();
-
-        // restore PHP version if changed
-        if ($this->getPhpVersion() !== self::PHP_VERSION_UNDEFINED) {
-            $this->setParameter(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_10);
-        }
     }
 
     protected function getRectorClass(): string
@@ -211,25 +194,10 @@ protected function yieldFilesFromDirectory(string $directory, string $suffix = '
         return StaticFixtureFinder::yieldDirectory($directory, $suffix);
     }
 
-    /**
-     * @param mixed $value
-     */
-    protected function setParameter(string $name, $value): void
-    {
-        $parameterProvider = $this->getService(ParameterProvider::class);
-
-        if ($name !== Option::PHP_VERSION_FEATURES) {
-            $oldParameterValue = $parameterProvider->provideParameter($name);
-            $this->oldParameterValues[$name] = $oldParameterValue;
-        }
-
-        $parameterProvider->changeParameter($name, $value);
-    }
-
     protected function getPhpVersion(): int
     {
-        // to be implemented
-        return self::PHP_VERSION_UNDEFINED;
+        // default value to be implemented for testing lower versions
+        return PhpVersion::PHP_10;
     }
 
     protected function doTestFileInfoWithoutAutoload(SmartFileInfo $fileInfo): void
@@ -379,20 +347,7 @@ private function configurePhpVersionFeatures(): void
             return;
         }
 
-        $this->setParameter(Option::PHP_VERSION_FEATURES, $this->getPhpVersion());
-    }
-
-    private function restoreOldParameterValues(): void
-    {
-        if ($this->oldParameterValues === []) {
-            return;
-        }
-
-        $parameterProvider = $this->getService(ParameterProvider::class);
-
-        foreach ($this->oldParameterValues as $name => $oldParameterValue) {
-            $parameterProvider->changeParameter($name, $oldParameterValue);
-        }
+        $this->parameterProvider->changeParameter(Option::PHP_VERSION_FEATURES, $this->getPhpVersion());
     }
 
     private function ensureRectorClassIsValid(string $rectorClass, string $methodName): void
@@ -418,7 +373,7 @@ private function doTestFileMatchesExpectedContent(
         SmartFileInfo $fixtureFileInfo,
         array $extraFiles = []
     ): void {
-        $this->setParameter(Option::SOURCE, [$originalFileInfo->getRealPath()]);
+        $this->parameterProvider->changeParameter(Option::SOURCE, [$originalFileInfo->getRealPath()]);
 
         if (! Strings::endsWith($originalFileInfo->getFilename(), '.blade.php') && in_array(
             $originalFileInfo->getSuffix(),

diff --git a/rector.php b/rector.php
@@ -25,7 +25,7 @@
     ]);
     $services->set(InferParamFromClassMethodReturnRector::class)
         ->call('configure', [[
-            InferParamFromClassMethodReturnRector::INFER_PARAMS_FROM_CLASS_METHOD_RETURNS => $configuration,
+            InferParamFromClassMethodReturnRector::PARAM_FROM_CLASS_METHOD_RETURNS => $configuration,
         ]]);
 
     $services->set(PreferThisOrSelfMethodCallRector::class)

diff --git a/.../tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php b/.../tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php
@@ -6,7 +6,6 @@
 
 use Iterator;
 use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
-use Rector\Core\Configuration\Option;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
@@ -22,8 +21,6 @@ final class SimplifyUselessVariableRectorTest extends AbstractRectorTestCase
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->setParameter(Option::AUTO_IMPORT_NAMES, true);
-
         $this->doTestFileInfo($fileInfo);
     }
 

diff --git a/rules/coding-style/tests/Rector/FuncCall/PreslashSimpleFunctionRector/AutoImportTest.php b/rules/coding-style/tests/Rector/FuncCall/PreslashSimpleFunctionRector/AutoImportTest.php
@@ -5,8 +5,6 @@
 namespace Rector\CodingStyle\Tests\Rector\FuncCall\PreslashSimpleFunctionRector;
 
 use Iterator;
-use Rector\CodingStyle\Rector\FuncCall\PreslashSimpleFunctionRector;
-use Rector\Core\Configuration\Option;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
@@ -17,7 +15,6 @@ final class AutoImportTest extends AbstractRectorTestCase
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->setParameter(Option::AUTO_IMPORT_NAMES, true);
         $this->doTestFileInfo($fileInfo);
     }
 
@@ -26,8 +23,8 @@ public function provideData(): Iterator
         return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureAutoImport');
     }
 
-    protected function getRectorClass(): string
+    protected function provideConfigFileInfo(): ?SmartFileInfo
     {
-        return PreslashSimpleFunctionRector::class;
+        return new SmartFileInfo(__DIR__ . '/config/auto_import.php');
     }
 }
diff --git a/rules/coding-style/tests/Rector/FuncCall/PreslashSimpleFunctionRector/config/auto_import.php b/rules/coding-style/tests/Rector/FuncCall/PreslashSimpleFunctionRector/config/auto_import.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodingStyle\Rector\FuncCall\PreslashSimpleFunctionRector;
+use Rector\Core\Configuration\Option;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
+
+    $services = $containerConfigurator->services();
+    $services->set(PreslashSimpleFunctionRector::class);
+};
diff --git a/...ding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/DocBlockRectorTest.php b/...ding-style/tests/Rector/Namespace_/ImportFullyQualifiedNamesRector/DocBlockRectorTest.php
@@ -5,8 +5,6 @@
 namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector;
 
 use Iterator;
-use Rector\Core\Configuration\Option;
-use Rector\Renaming\Rector\Name\RenameClassRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
@@ -20,9 +18,6 @@ final class DocBlockRectorTest extends AbstractRectorTestCase
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->setParameter(Option::AUTO_IMPORT_NAMES, true);
-        $this->setParameter(Option::IMPORT_DOC_BLOCKS, true);
-
         $this->doTestFileInfo($fileInfo);
     }
 
@@ -31,9 +26,8 @@ public function provideData(): Iterator
         return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureDocBlock');
     }
 
-    protected function getRectorClass(): string
+    protected function provideConfigFileInfo(): ?SmartFileInfo
     {
-        // here can be any Rector rule, as we're testing \Rector\PostRector\Rector\NameImportingPostRector in the full Retcor life cycle
-        return RenameClassRector::class;
+        return new SmartFileInfo(__DIR__ . '/config/import_doc_block_config.php');
     }
 }
diff --git a/...tor/Namespace_/ImportFullyQualifiedNamesRector/ImportRootNamespaceClassesDisabledTest.php b/...tor/Namespace_/ImportFullyQualifiedNamesRector/ImportRootNamespaceClassesDisabledTest.php
@@ -5,8 +5,6 @@
 namespace Rector\CodingStyle\Tests\Rector\Namespace_\ImportFullyQualifiedNamesRector;
 
 use Iterator;
-use Rector\Core\Configuration\Option;
-use Rector\Renaming\Rector\Name\RenameClassRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
@@ -20,9 +18,6 @@ final class ImportRootNamespaceClassesDisabledTest extends AbstractRectorTestCas
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->setParameter(Option::AUTO_IMPORT_NAMES, true);
-        $this->setParameter(Option::IMPORT_SHORT_CLASSES, false);
-
         $this->doTestFileInfo($fileInfo);
     }
 
@@ -34,9 +29,8 @@ public function provideData(): iterable
         return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureRoot');
     }
 
-    protected function getRectorClass(): string
+    protected function provideConfigFileInfo(): ?SmartFileInfo
     {
-        // the must be any rector class to run
-        return RenameClassRector::class;
+        return new SmartFileInfo(__DIR__ . '/config/not_import_short_classes.php');
     }
 }
diff --git a/...ests/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_doc_block_config.php b/...ests/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/import_doc_block_config.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Renaming\Rector\Name\RenameClassRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
+    $parameters->set(Option::IMPORT_DOC_BLOCKS, true);
+
+    $services = $containerConfigurator->services();
+    $services->set(RenameClassRector::class);
+};
diff --git a/...sts/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/not_import_short_classes.php b/...sts/Rector/Namespace_/ImportFullyQualifiedNamesRector/config/not_import_short_classes.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Renaming\Rector\Name\RenameClassRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
+    $parameters->set(Option::IMPORT_SHORT_CLASSES, false);
+
+    $services = $containerConfigurator->services();
+    $services->set(RenameClassRector::class);
+};
diff --git a/...ead-code/tests/Rector/ClassConst/RemoveUnusedClassConstantRector/OpenSourceRectorTest.php b/...ead-code/tests/Rector/ClassConst/RemoveUnusedClassConstantRector/OpenSourceRectorTest.php
@@ -5,9 +5,6 @@
 namespace Rector\DeadCode\Tests\Rector\ClassConst\RemoveUnusedClassConstantRector;
 
 use Iterator;
-use Rector\Core\Configuration\Option;
-use Rector\Core\ValueObject\ProjectType;
-use Rector\DeadCode\Rector\ClassConst\RemoveUnusedClassConstantRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
@@ -18,7 +15,6 @@ final class OpenSourceRectorTest extends AbstractRectorTestCase
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->setParameter(Option::PROJECT_TYPE, ProjectType::OPEN_SOURCE);
         $this->doTestFileInfo($fileInfo);
     }
 
@@ -27,8 +23,8 @@ public function provideData(): Iterator
         return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureOpenSource');
     }
 
-    protected function getRectorClass(): string
+    protected function provideConfigFileInfo(): ?SmartFileInfo
     {
-        return RemoveUnusedClassConstantRector::class;
+        return new SmartFileInfo(__DIR__ . '/config/project_open_source.php');
     }
 }
diff --git a/...de/tests/Rector/ClassConst/RemoveUnusedClassConstantRector/config/project_open_source.php b/...de/tests/Rector/ClassConst/RemoveUnusedClassConstantRector/config/project_open_source.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Core\ValueObject\ProjectType;
+use Rector\DeadCode\Rector\ClassConst\RemoveUnusedClassConstantRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PROJECT_TYPE, ProjectType::OPEN_SOURCE);
+
+    $services = $containerConfigurator->services();
+    $services->set(RemoveUnusedClassConstantRector::class);
+};
diff --git a/...s/dead-code/tests/Rector/ClassMethod/RemoveUnusedParameterRector/OpenSourceRectorTest.php b/...s/dead-code/tests/Rector/ClassMethod/RemoveUnusedParameterRector/OpenSourceRectorTest.php
@@ -5,9 +5,6 @@
 namespace Rector\DeadCode\Tests\Rector\ClassMethod\RemoveUnusedParameterRector;
 
 use Iterator;
-use Rector\Core\Configuration\Option;
-use Rector\Core\ValueObject\ProjectType;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedParameterRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
@@ -18,7 +15,6 @@ final class OpenSourceRectorTest extends AbstractRectorTestCase
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->setParameter(Option::PROJECT_TYPE, ProjectType::OPEN_SOURCE);
         $this->doTestFileInfo($fileInfo);
     }
 
@@ -27,8 +23,8 @@ public function provideData(): Iterator
         return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureOpenSource');
     }
 
-    protected function getRectorClass(): string
+    protected function provideConfigFileInfo(): ?SmartFileInfo
     {
-        return RemoveUnusedParameterRector::class;
+        return new SmartFileInfo(__DIR__ . '/config/project_open_source.php');
     }
 }
diff --git a/...-code/tests/Rector/ClassMethod/RemoveUnusedParameterRector/config/project_open_source.php b/...-code/tests/Rector/ClassMethod/RemoveUnusedParameterRector/config/project_open_source.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Core\ValueObject\ProjectType;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedParameterRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PROJECT_TYPE, ProjectType::OPEN_SOURCE);
+
+    $services = $containerConfigurator->services();
+    $services->set(RemoveUnusedParameterRector::class);
+};
diff --git a/...ead-code/tests/Rector/ClassMethod/RemoveUnusedPublicMethodRector/OpenSourceRectorTest.php b/...ead-code/tests/Rector/ClassMethod/RemoveUnusedPublicMethodRector/OpenSourceRectorTest.php
@@ -5,9 +5,6 @@
 namespace Rector\DeadCode\Tests\Rector\ClassMethod\RemoveUnusedPublicMethodRector;
 
 use Iterator;
-use Rector\Core\Configuration\Option;
-use Rector\Core\ValueObject\ProjectType;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPublicMethodRector;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
@@ -18,7 +15,6 @@ final class OpenSourceRectorTest extends AbstractRectorTestCase
      */
     public function test(SmartFileInfo $fileInfo): void
     {
-        $this->setParameter(Option::PROJECT_TYPE, ProjectType::OPEN_SOURCE);
         $this->doTestFileInfo($fileInfo);
     }
 
@@ -27,8 +23,8 @@ public function provideData(): Iterator
         return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureOpenSource');
     }
 
-    protected function getRectorClass(): string
+    protected function provideConfigFileInfo(): ?SmartFileInfo
     {
-        return RemoveUnusedPublicMethodRector::class;
+        return new SmartFileInfo(__DIR__ . '/config/projet_open_source.php');
     }
 }