rectorphp · TomasVotruba · Dec 25, 2019 · Dec 25, 2019
diff --git a/config/set/cakephp/cakephp40.yaml b/config/set/cakephp/cakephp40.yaml
@@ -69,67 +69,66 @@ services:
             Cake\View\Helper:
                 initialize: 'void'
 
-    Rector\Rector\Typehint\ParentTypehintedArgumentRector:
-        $typehintForArgumentByMethodAndClass:
+    Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector:
+        $typehintForParameterByMethodByClass:
             Cake\ORM\Behavior:
                 beforeFind:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 buildValidator:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 buildRules:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeRules:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 afterRules:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeSave:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 afterSave:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeDelete:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 afterDelete:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
             Cake\ORM\Table:
                 beforeFind:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 buildValidator:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 buildRules:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeRules:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 afterRules:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeSave:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 afterSave:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeDelete:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 afterDelete:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
             Cake\Controller\Controller:
                 beforeFilter:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 afterFilter:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeRender:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeRedirect:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
             Cake\Controller\Component:
                 shutdown:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 startup:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeFilter:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeRender:
-                    $event: 'Cake\Event\EventInterface'
+                    0: 'Cake\Event\EventInterface'
                 beforeRedirect:
-                    $event: 'Cake\Event\EventInterface'
-
+                    0: 'Cake\Event\EventInterface'
 
     Rector\CakePHP\Rector\MethodCall\RenameMethodCallBasedOnParameterRector:
         $methodNamesByTypes:

diff --git a/config/set/doctrine/doctrine25.yaml b/config/set/doctrine/doctrine25.yaml
@@ -1,12 +1,12 @@
 services:
-    Rector\Rector\Typehint\ParentTypehintedArgumentRector:
-        $typehintForArgumentByMethodAndClass:
+    Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector:
+        $typehintForParameterByMethodByClass:
             Doctrine\ORM\Mapping\ClassMetadataFactory:
                 setEntityManager:
-                    em: 'Doctrine\ORM\EntityManagerInterface'
+                    0: 'Doctrine\ORM\EntityManagerInterface'
             Doctrine\ORM\Tools\DebugUnitOfWorkListener:
                 dumpIdentityMap:
-                    em: 'Doctrine\ORM\EntityManagerInterface'
+                    0: 'Doctrine\ORM\EntityManagerInterface'
 
     Rector\Rector\Argument\ArgumentRemoverRector:
         $positionsByMethodNameByClassType:

diff --git a/config/set/phpunit/phpunit80.yaml b/config/set/phpunit/phpunit80.yaml
@@ -3,11 +3,11 @@ imports:
 
 services:
     # https://github.com/rectorphp/rector/issues/1024
-    Rector\Rector\Typehint\ParentTypehintedArgumentRector:
-        $typehintForArgumentByMethodAndClass:
+    Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector:
+        $typehintForParameterByMethodByClass:
             PHPUnit\Framework\TestCase:
                 __construct:
-                    dataName: '' # no type
+                    2: '' # no type, $dataName
 
     Rector\PHPUnit\Rector\MethodCall\SpecificAssertContainsRector: ~
     Rector\PHPUnit\Rector\MethodCall\SpecificAssertInternalTypeRector: ~

diff --git a/config/set/sylius/sylius10.yaml b/config/set/sylius/sylius10.yaml
@@ -18,11 +18,11 @@ services:
             'Sylius\Component\Taxonomy\Model\TaxonInterface':
                 'getParents ': 'getAncestors'
 
-    Rector\Rector\Typehint\ParentTypehintedArgumentRector:
-        $typehintForArgumentByMethodAndClass:
+    Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector:
+        $typehintForParameterByMethodByClass:
             Sylius\Bundle\CoreBundle\Context\SessionAndChannelBasedCartContext:
                 __construct:
-                    $cartStorage: 'Sylius\Component\Core\Storage\CartStorageInterface'
+                    0: 'Sylius\Component\Core\Storage\CartStorageInterface'
 
     Rector\Rector\Argument\ArgumentAdderRector:
         $positionWithDefaultValueByMethodNamesByClassTypes:

diff --git a/packages/TypeDeclaration/src/Rector/ClassMethod/AddParamTypeDeclarationRector.php b/packages/TypeDeclaration/src/Rector/ClassMethod/AddParamTypeDeclarationRector.php
@@ -55,7 +55,6 @@ public function process(string $name)
     }
 }
 PHP
-
             , [
                 '$typehintForParameterByMethodByClass' => [
                     'SomeClass' => [
@@ -141,6 +140,18 @@ private function shouldSkip(ClassMethod $classMethod): bool
         return ! (bool) $class->extends;
     }
 
+    private function refactorClassMethodWithTypehintByParameterPosition(Node $node, $typehintByParameterPosition): void
+    {
+        foreach ($typehintByParameterPosition as $parameterPosition => $type) {
+            if (! isset($node->params[$parameterPosition])) {
+                continue;
+            }
+
+            $parameter = $node->params[$parameterPosition];
+            $this->refactorParameter($parameter, $type);
+        }
+    }
+
     private function refactorParameter(Param $param, string $newType): void
     {
         // already set → no change
@@ -161,16 +172,4 @@ private function refactorParameter(Param $param, string $newType): void
 
         $param->type = $returnTypeNode;
     }
-
-    private function refactorClassMethodWithTypehintByParameterPosition(Node $node, $typehintByParameterPosition): void
-    {
-        foreach ($typehintByParameterPosition as $parameterPosition => $type) {
-            if (! isset($node->params[$parameterPosition])) {
-                continue;
-            }
-
-            $parameter = $node->params[$parameterPosition];
-            $this->refactorParameter($parameter, $type);
-        }
-    }
 }
diff --git a/...ts/Rector/ClassMethod/AddParamTypeDeclarationRector/AddParamTypeDeclarationRectorTest.php b/...ts/Rector/ClassMethod/AddParamTypeDeclarationRector/AddParamTypeDeclarationRectorTest.php
@@ -7,6 +7,8 @@
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeDeclarationRector;
+use Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ClassMetadataFactory;
+use Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ParserInterface;
 
 final class AddParamTypeDeclarationRectorTest extends AbstractRectorTestCase
 {
@@ -33,6 +35,16 @@ protected function getRectorsWithConfiguration(): array
                             0 => 'string',
                         ],
                     ],
+                    ParserInterface::class => [
+                        'parse' => [
+                            0 => 'string',
+                        ],
+                    ],
+                    ClassMetadataFactory::class => [
+                        'setEntityManager' => [
+                            0 => 'Doctrine\ORM\EntityManagerInterface',
+                        ],
+                    ],
                 ],
             ],
         ];

diff --git a/.../tests/Rector/ClassMethod/AddParamTypeDeclarationRector/Fixture/MyMetadataFactory.php.inc b/.../tests/Rector/ClassMethod/AddParamTypeDeclarationRector/Fixture/MyMetadataFactory.php.inc
@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Fixture;
+
+use Doctrine\ORM\EntityManager;
+use Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ClassMetadataFactory;
+
+class MyMetadataFactory extends ClassMetadataFactory
+{
+    public function setEntityManager(EntityManager $emanager)
+    {
+        $this->em = $emanager;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Fixture;
+
+use Doctrine\ORM\EntityManager;
+use Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ClassMetadataFactory;
+
+class MyMetadataFactory extends ClassMetadataFactory
+{
+    public function setEntityManager(\Doctrine\ORM\EntityManagerInterface $emanager)
+    {
+        $this->em = $emanager;
+    }
+}
+
+?>
diff --git a/...Method/AddParamTypeDeclarationRector/Fixture/SomeClassImplementingParserInterface.php.inc b/...Method/AddParamTypeDeclarationRector/Fixture/SomeClassImplementingParserInterface.php.inc
@@ -0,0 +1,29 @@
+<?php
+
+namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Fixture;
+
+use Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ParserInterface;
+
+class SomeClassImplementingParserInterface implements ParserInterface
+{
+    public function parse($code, \PhpParser\ErrorHandler $errorHandler = null)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Fixture;
+
+use Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source\ParserInterface;
+
+class SomeClassImplementingParserInterface implements ParserInterface
+{
+    public function parse(string $code, \PhpParser\ErrorHandler $errorHandler = null)
+    {
+    }
+}
+
+?>
diff --git a/...on/tests/Rector/ClassMethod/AddParamTypeDeclarationRector/Source/ClassMetadataFactory.php b/...on/tests/Rector/ClassMethod/AddParamTypeDeclarationRector/Source/ClassMetadataFactory.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source;
+
+class ClassMetadataFactory
+{
+
+}
diff --git a/...ArgumentRector/Source/ParserInterface.php → ...larationRector/Source/ParserInterface.php b/...ArgumentRector/Source/ParserInterface.php → ...larationRector/Source/ParserInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Rector\Typehint\ParentTypehintedArgumentRector\Source;
+namespace Rector\TypeDeclaration\Tests\Rector\ClassMethod\AddParamTypeDeclarationRector\Source;
 
 interface ParserInterface
 {