add class const fetch renames

rectorphp · Jan 27, 2021 · ed316d4 · ed316d4
1 parent b305983
commit ed316d4
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 6 deletions.
diff --git a/config/set/symfony51.php b/config/set/symfony51.php
@@ -2,12 +2,18 @@
 
 declare(strict_types=1);
 
+use PHPStan\Type\ObjectType;
+use Rector\Renaming\Rector\ClassConstFetch\RenameClassConstantRector;
 use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Renaming\Rector\Name\RenameClassRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
+use Rector\Renaming\ValueObject\RenameClassConstant;
 use Rector\Transform\Rector\New_\NewArgToMethodCallRector;
+use Rector\Transform\Rector\StaticCall\StaticCallToNewRector;
 use Rector\Transform\ValueObject\NewArgToMethodCall;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector;
+use Rector\TypeDeclaration\ValueObject\AddParamTypeDeclaration;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\SymfonyPhpConfig\ValueObjectInliner;
 
@@ -20,6 +26,9 @@
         ->call('configure', [[
             RenameClassRector::OLD_TO_NEW_CLASSES => [
                 'Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy' => 'Symfony\Component\EventDispatcher\EventDispatcherInterface',
+                'Symfony\Component\Form\Extension\Validator\Util\ServerParams' => [
+                    'Symfony\Component\Form\Util\ServerParams',
+                ],
             ],
         ]]);
 
@@ -59,4 +68,69 @@
                 new NewArgToMethodCall('Symfony\Component\Dotenv\Dotenv', true, 'usePutenv'),
             ]),
         ]]);
+
+    $services->set(RenameClassConstantRector::class)
+        ->call('configure', [[
+            RenameClassConstantRector::CLASS_CONSTANT_RENAME => ValueObjectInliner::inline([
+                new RenameClassConstant(
+                    'Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer',
+                    'ROUND_FLOOR',
+                    'NumberFormatter::ROUND_FLOOR'
+                ),
+                new RenameClassConstant(
+                    'Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer',
+                    'ROUND_DOWN',
+                    'NumberFormatter::ROUND_DOWN'
+                ),
+                new RenameClassConstant(
+                    'Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer',
+                    'ROUND_HALF_DOWN',
+                    'NumberFormatter::ROUND_HALFDOWN'
+                ),
+                new RenameClassConstant(
+                    'Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer',
+                    'ROUND_HALF_EVEN',
+                    'NumberFormatter::ROUND_HALFEVEN'
+                ),
+                new RenameClassConstant(
+                    'Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer',
+                    'ROUND_HALFUP',
+                    'NumberFormatter::ROUND_HALFUP'
+                ),
+                new RenameClassConstant(
+                    'Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer',
+                    'ROUND_UP',
+                    'NumberFormatter::ROUND_UP'
+                ),
+                new RenameClassConstant(
+                    'Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer',
+                    'ROUND_CEILING',
+                    'NumberFormatter::ROUND_CEILING'
+                ),
+            ]),
+        ]]);
+
+    $services->set(AddParamTypeDeclarationRector::class)
+        ->call('configure', [[
+            // see https://github.com/symfony/symfony/pull/36943
+            AddParamTypeDeclarationRector::PARAMETER_TYPEHINTS => ValueObjectInliner::inline([
+                new AddParamTypeDeclaration(
+                    'Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait',
+                    'configureRoutes',
+                    0,
+                    new ObjectType('Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator'),
+                ),
+            ]),
+        ]]);
+
+    $services->set(StaticCallToNewRector::class)
+        ->call('configure', [[
+            // see https://github.com/symfony/symfony/pull/36943
+            StaticCallToNewRector::METHODS_BY_TYPES => [
+                'Symfony\Component\HttpFoundation\Response' => 'create',
+                'Symfony\Component\HttpFoundation\JsonResponse' => 'create',
+                'Symfony\Component\HttpFoundation\RedirectResponse' => 'create',
+                'Symfony\Component\HttpFoundation\StreamedResponse' => 'create',
+            ],
+        ]]);
 };
diff --git a/packages/rector-generator/src/NodeFactory/ConfigurationNodeFactory.php b/packages/rector-generator/src/NodeFactory/ConfigurationNodeFactory.php
@@ -84,6 +84,7 @@ public function createConfigurationConstants(array $ruleConfiguration): array
         $classConsts = [];
 
         foreach (array_keys($ruleConfiguration) as $constantName) {
+            $constantName = strtoupper($constantName);
             $constantValue = strtolower($constantName);
             $classConst = $this->nodeFactory->createPublicClassConst($constantName, $constantValue);
             $classConsts[] = $classConst;

diff --git a/packages/rector-generator/src/TemplateVariablesFactory.php b/packages/rector-generator/src/TemplateVariablesFactory.php
@@ -160,6 +160,8 @@ private function createRuleConfiguration(string $rectorClass, array $configurati
     {
         $arrayItems = [];
         foreach ($configuration as $constantName => $variableConfiguration) {
+            $constantName = strtoupper($constantName);
+
             if ($rectorClass === self::SELF) {
                 $class = new Name(self::SELF);
             } else {

diff --git a/rules/generic/src/Rector/ClassConstFetch/RenameClassConstantsUseToStringsRector.php b/rules/generic/src/Rector/ClassConstFetch/RenameClassConstantsUseToStringsRector.php
@@ -31,16 +31,18 @@ final class RenameClassConstantsUseToStringsRector extends AbstractRector implem
 
     public function getRuleDefinition(): RuleDefinition
     {
+        $configuration = [
+            self::CLASS_CONST_FETCHES_TO_VALUES => [
+                new ClassConstFetchToValue('Nette\Configurator', 'DEVELOPMENT', 'development'),
+                new ClassConstFetchToValue('Nette\Configurator', 'PRODUCTION', 'production'),
+            ],
+        ];
+
         return new RuleDefinition('Replaces constant by value', [
             new ConfiguredCodeSample(
                 '$value === Nette\Configurator::DEVELOPMENT',
                 '$value === "development"',
-                [
-                    self::CLASS_CONST_FETCHES_TO_VALUES => [
-                        new ClassConstFetchToValue('Nette\Configurator', 'DEVELOPMENT', 'development'),
-                        new ClassConstFetchToValue('Nette\Configurator', 'PRODUCTION', 'production'),
-                    ],
-                ]
+                $configuration
             ),
         ]);
     }

diff --git a/rules/transform/src/Rector/StaticCall/StaticCallToNewRector.php b/rules/transform/src/Rector/StaticCall/StaticCallToNewRector.php
@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Transform\Rector\StaticCall;
+
+use PhpParser\Node;
+use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see https://github.com/symfony/symfony/pull/35308
+ *
+ * @see \Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\StaticCallToNewRectorTest
+ */
+final class StaticCallToNewRector extends AbstractRector implements ConfigurableRectorInterface
+{
+    /**
+     * @var string
+     */
+    public const METHODS_BY_TYPES = 'methods_by_types';
+
+    /**
+     * @var array<string, string>
+     */
+    private $methodsByTypes = [];
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Change static call to new instance', [
+            new ConfiguredCodeSample(
+                <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function run()
+    {
+        $dotenv = JsonResponse::create(true);
+    }
+}
+CODE_SAMPLE
+,
+                <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function run()
+    {
+        $dotenv = new JsonResponse();
+    }
+}
+CODE_SAMPLE
+,
+                [
+                    self::METHODS_BY_TYPES => [
+                        'JsonResponse' => 'create',
+                    ],
+                ]
+            ),
+        ]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [Node\Expr\StaticCall::class];
+    }
+
+    /**
+     * @param Node\Expr\StaticCall $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        foreach ($this->methodsByTypes as $type => $method) {
+            if (! $this->isName($node->class, $type)) {
+                continue;
+            }
+
+            if (! $this->isName($node->name, $method)) {
+                continue;
+            }
+
+            $class = $this->getName($node->class);
+            if ($class === null) {
+                continue;
+            }
+
+            return new Node\Expr\New_(new Node\Name\FullyQualified($class));
+        }
+
+        return $node;
+    }
+
+    /**
+     * @param mixed[] $configuration
+     */
+    public function configure(array $configuration): void
+    {
+        $this->methodsByTypes = $configuration[self::METHODS_BY_TYPES] ?? [];
+    }
+}
diff --git a/rules/transform/src/ValueObject/NewArgToMethodCall.php b/rules/transform/src/ValueObject/NewArgToMethodCall.php
@@ -36,6 +36,9 @@ public function getType(): string
         return $this->type;
     }
 
+    /**
+     * @return mixed
+     */
     public function getValue()
     {
         return $this->value;

diff --git a/rules/transform/tests/Rector/StaticCall/StaticCallToNewRector/Fixture/some_class.php.inc b/rules/transform/tests/Rector/StaticCall/StaticCallToNewRector/Fixture/some_class.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\Fixture;
+
+use Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\Source\SomeJsonResponse;
+
+class SomeClass
+{
+    public function run()
+    {
+        $dotenv = SomeJsonResponse::create(true);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\Fixture;
+
+use Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\Source\SomeJsonResponse;
+
+class SomeClass
+{
+    public function run()
+    {
+        $dotenv = new \Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\Source\SomeJsonResponse();
+    }
+}
+
+?>
diff --git a/rules/transform/tests/Rector/StaticCall/StaticCallToNewRector/Source/SomeJsonResponse.php b/rules/transform/tests/Rector/StaticCall/StaticCallToNewRector/Source/SomeJsonResponse.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\Source;
+
+final class SomeJsonResponse
+{
+
+}
diff --git a/rules/transform/tests/Rector/StaticCall/StaticCallToNewRector/StaticCallToNewRectorTest.php b/rules/transform/tests/Rector/StaticCall/StaticCallToNewRector/StaticCallToNewRectorTest.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector;
+
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Transform\Tests\Rector\StaticCall\StaticCallToNewRector\Source\SomeJsonResponse;
+
+final class StaticCallToNewRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(\Symplify\SmartFileSystem\SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    public function provideData(): \Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    /**
+     * @return mixed[]
+     */
+    protected function getRectorsWithConfiguration(): array
+    {
+        return [
+            \Rector\Transform\Rector\StaticCall\StaticCallToNewRector::class =>
+                [
+                    \Rector\Transform\Rector\StaticCall\StaticCallToNewRector::METHODS_BY_TYPES => [
+                        SomeJsonResponse::class => 'create',
+                    ],
+                ],
+        ];
+    }
+}