Merge 50ac029 into 09762bd

Author: Tomáš Votruba

src/NodeAnalyzer/Contrib/SymfonyContainerCallsAnalyzer.php renamed to src/NodeAnalyzer/Contrib/Symfony/ContainerCallAnalyzer.php

@@ -1,13 +1,13 @@
 <?php declare(strict_types=1);
 
-namespace Rector\NodeAnalyzer\Contrib;
+namespace Rector\NodeAnalyzer\Contrib\Symfony;
 
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Scalar\String_;
 
-final class SymfonyContainerCallsAnalyzer
+final class ContainerCallAnalyzer
 {
     /**
      * Finds $this->get(...);

src/NodeAnalyzer/Contrib/ControllerMethodAnalyzer.php renamed to src/NodeAnalyzer/Contrib/Symfony/ControllerMethodAnalyzer.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\NodeAnalyzer\Contrib;
+namespace Rector\NodeAnalyzer\Contrib\Symfony;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;

src/Rector/Contrib/Symfony/Console/CommandToConstructorInjectionRector.php

@@ -11,7 +11,7 @@
 use Rector\Naming\PropertyNaming;
 use Rector\Node\Attribute;
 use Rector\Node\NodeFactory;
-use Rector\NodeAnalyzer\Contrib\SymfonyContainerCallsAnalyzer;
+use Rector\NodeAnalyzer\Contrib\Symfony\ContainerCallAnalyzer;
 use Rector\Rector\AbstractRector;
 
 /**
@@ -57,9 +57,9 @@ final class CommandToConstructorInjectionRector extends AbstractRector
     private $nodeFactory;
 
     /**
-     * @var SymfonyContainerCallsAnalyzer
+     * @var ContainerCallAnalyzer
      */
-    private $symfonyContainerCallsAnalyzer;
+    private $containerCallAnalyzer;
 
     /**
      * @var ServiceTypeForNameProviderInterface
@@ -70,13 +70,13 @@ public function __construct(
         ClassPropertyCollector $classPropertyCollector,
         PropertyNaming $propertyNaming,
         NodeFactory $nodeFactory,
-        SymfonyContainerCallsAnalyzer $symfonyContainerCallsAnalyzer,
+        ContainerCallAnalyzer $containerCallAnalyzer,
         ServiceTypeForNameProviderInterface $serviceTypeForNameProvider
     ) {
         $this->classPropertyCollector = $classPropertyCollector;
         $this->propertyNaming = $propertyNaming;
         $this->nodeFactory = $nodeFactory;
-        $this->symfonyContainerCallsAnalyzer = $symfonyContainerCallsAnalyzer;
+        $this->containerCallAnalyzer = $containerCallAnalyzer;
         $this->serviceTypeForNameProvider = $serviceTypeForNameProvider;
     }
 
@@ -92,7 +92,7 @@ public function isCandidate(Node $node): bool
             return false;
         }
 
-        return $this->symfonyContainerCallsAnalyzer->isGetContainerCall($node);
+        return $this->containerCallAnalyzer->isGetContainerCall($node);
     }
 
     /**

src/Rector/Contrib/Symfony/Form/FormTypeGetParentRector.php

@@ -11,20 +11,27 @@
 /**
  * Converts all:
  * - getParent() {
- *      return 'some_string';
+ *      return 'collection';
+ * }
+ * - getExtendedType() {
+ *      return 'collection';
  * }
  *
  * into:
  * - getParent() {
  *      return CollectionType::class;
  * }
+ * - getExtendedType() {
+ *      return CollectionType::class;
+ * }
  */
 final class FormTypeGetParentRector extends AbstractRector
 {
     /**
      * @var string[]
      */
     private $nameToClassMap = [
+        'form' => 'Symfony\Component\Form\Extension\Core\Type\FormType',
         'birthday' => 'Symfony\Component\Form\Extension\Core\Type\BirthdayType',
         'checkbox' => 'Symfony\Component\Form\Extension\Core\Type\CheckboxType',
         'collection' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType',
@@ -54,6 +61,7 @@ final class FormTypeGetParentRector extends AbstractRector
         'button' => 'Symfony\Component\Form\Extension\Core\Type\ButtonType',
         'submit' => 'Symfony\Component\Form\Extension\Core\Type\SubmitType',
         'reset' => 'Symfony\Component\Form\Extension\Core\Type\ResetType',
+        'entity' => 'Symfony\Bridge\Doctrine\Form\Type\EntityType',
     ];
 
     /**
@@ -68,21 +76,23 @@ public function __construct(NodeFactory $nodeFactory)
 
     public function isCandidate(Node $node): bool
     {
-        if (! $node instanceof String_ || ! isset($this->nameToClassMap[$node->value])) {
+        if (! $node instanceof String_) {
             return false;
         }
 
-        $parentClassName = $node->getAttribute(Attribute::PARENT_CLASS_NAME);
-        if ($parentClassName !== 'Symfony\Component\Form\AbstractType') {
+        if (! isset($this->nameToClassMap[$node->value])) {
             return false;
         }
 
-        $methodName = $node->getAttribute(Attribute::METHOD_NAME);
-        if ($methodName !== 'getParent') {
-            return false;
+        if ($this->isParentTypeAndMethod($node, 'Symfony\Component\Form\AbstractType', 'getParent')) {
+            return true;
+        }
+
+        if ($this->isParentTypeAndMethod($node, 'Symfony\Component\Form\AbstractTypeExtension', 'getExtendedType')) {
+            return true;
         }
 
-        return true;
+        return false;
     }
 
     /**
@@ -94,4 +104,16 @@ public function refactor(Node $stringNode): ?Node
 
         return $this->nodeFactory->createClassConstantReference($class);
     }
+
+    private function isParentTypeAndMethod(Node $node, string $type, string $method): bool
+    {
+        $parentClassName = $node->getAttribute(Attribute::PARENT_CLASS_NAME);
+        if ($parentClassName !== $type) {
+            return false;
+        }
+
+        $methodName = $node->getAttribute(Attribute::METHOD_NAME);
+
+        return $methodName === $method;
+    }
 }

src/Rector/Contrib/Symfony/HttpKernel/GetRequestRector.php

@@ -7,7 +7,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use Rector\Node\Attribute;
 use Rector\Node\NodeFactory;
-use Rector\NodeAnalyzer\Contrib\ControllerMethodAnalyzer;
+use Rector\NodeAnalyzer\Contrib\Symfony\ControllerMethodAnalyzer;
 use Rector\NodeAnalyzer\MethodCallAnalyzer;
 use Rector\Rector\AbstractRector;
 

src/Rector/Contrib/Symfony/HttpKernel/GetterToPropertyRector.php

@@ -9,7 +9,7 @@
 use Rector\Naming\PropertyNaming;
 use Rector\Node\Attribute;
 use Rector\Node\NodeFactory;
-use Rector\NodeAnalyzer\Contrib\SymfonyContainerCallsAnalyzer;
+use Rector\NodeAnalyzer\Contrib\Symfony\ContainerCallAnalyzer;
 use Rector\Rector\AbstractRector;
 
 /**
@@ -37,9 +37,9 @@ final class GetterToPropertyRector extends AbstractRector
     private $nodeFactory;
 
     /**
-     * @var SymfonyContainerCallsAnalyzer
+     * @var ContainerCallAnalyzer
      */
-    private $symfonyContainerCallsAnalyzer;
+    private $containerCallAnalyzer;
 
     /**
      * @var ServiceTypeForNameProviderInterface
@@ -50,13 +50,13 @@ public function __construct(
         PropertyNaming $propertyNaming,
         ClassPropertyCollector $classPropertyCollector,
         NodeFactory $nodeFactory,
-        SymfonyContainerCallsAnalyzer $symfonyContainerCallsAnalyzer,
+        ContainerCallAnalyzer $containerCallAnalyzer,
         ServiceTypeForNameProviderInterface $serviceTypeForNameProvider
     ) {
         $this->propertyNaming = $propertyNaming;
         $this->classPropertyCollector = $classPropertyCollector;
         $this->nodeFactory = $nodeFactory;
-        $this->symfonyContainerCallsAnalyzer = $symfonyContainerCallsAnalyzer;
+        $this->containerCallAnalyzer = $containerCallAnalyzer;
         $this->serviceTypeForNameProvider = $serviceTypeForNameProvider;
     }
 
@@ -66,7 +66,7 @@ public function isCandidate(Node $node): bool
             return false;
         }
 
-        return $this->symfonyContainerCallsAnalyzer->isThisCall($node);
+        return $this->containerCallAnalyzer->isThisCall($node);
     }
 
     /**

tests/Rector/Contrib/Symfony/Form/FormTypeGetParentRector/Correct/correct2.php.inc

@@ -0,0 +1,11 @@
+<?php declare (strict_types=1);
+
+use Symfony\Component\Form\AbstractTypeExtension;
+
+class TypeExtension extends AbstractTypeExtension
+{
+    public function getExtendedType()
+    {
+        return \Symfony\Component\Form\Extension\Core\Type\FormType::class;
+    }
+}

tests/Rector/Contrib/Symfony/Form/FormTypeGetParentRector/Test.php

@@ -13,6 +13,11 @@ public function test(): void
             __DIR__ . '/Wrong/wrong.php.inc',
             __DIR__ . '/Correct/correct.php.inc'
         );
+
+        $this->doTestFileMatchesExpectedContent(
+            __DIR__ . '/Wrong/wrong2.php.inc',
+            __DIR__ . '/Correct/correct2.php.inc'
+        );
     }
 
     /**

tests/Rector/Contrib/Symfony/Form/FormTypeGetParentRector/Wrong/wrong2.php.inc

@@ -0,0 +1,11 @@
+<?php declare (strict_types=1);
+
+use Symfony\Component\Form\AbstractTypeExtension;
+
+class TypeExtension extends AbstractTypeExtension
+{
+    public function getExtendedType()
+    {
+        return 'form';
+    }
+}