[Symfony 4.3] Add parent::__construct to EventDispatcher

config/level/symfony/symfony43.yaml

@@ -71,3 +71,7 @@ services:
                     name: 'context'
                     default_value: []
                     # type: array
+
+    Rector\Rector\ClassMethod\AddMethodParentCallRector:
+        Symfony\Component\EventDispatcher\EventDispatcher:
+            - '__construct'

packages/CodingStyle/tests/Rector/FuncCall/ConsistentPregDelimiterRector/ConsistentPregDelimiterRectorTest.php

@@ -11,7 +11,7 @@ public function test(): void
     {
         $this->doTestFiles([
             __DIR__ . '/Fixture/fixture.php.inc',
-            __DIR__ . '/Fixture/static_call.php.inc',
+            __DIR__ . '/Fixture/escape_nette_static_call.php.inc',
             __DIR__ . '/Fixture/skip_concat.php.inc',
         ]);
     }

packages/CodingStyle/tests/Rector/FuncCall/ConsistentPregDelimiterRector/Fixture/static_call.php.inc → packages/CodingStyle/tests/Rector/FuncCall/ConsistentPregDelimiterRector/Fixture/escape_nette_static_call.php.inc

@@ -4,7 +4,7 @@ namespace Rector\CodingStyle\Tests\Rector\FuncCall\ConsistentPregDelimiterRector
 
 use Nette\Utils\Strings;
 
-class StaticCall
+class EscapeNetteStaticCall
 {
     public function run($value)
     {
@@ -20,7 +20,7 @@ namespace Rector\CodingStyle\Tests\Rector\FuncCall\ConsistentPregDelimiterRector
 
 use Nette\Utils\Strings;
 
-class StaticCall
+class EscapeNetteStaticCall
 {
     public function run($value)
     {

packages/FileSystemRector/src/Rector/AbstractFileSystemRector.php

@@ -13,7 +13,7 @@
 use Rector\PhpParser\Parser\Parser;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
 use Rector\PhpParser\Printer\FormatPerservingPrinter;
-use Rector\Rector\AbstractRectorTrait;
+use Rector\Rector\AbstractRector\AbstractRectorTrait;
 use Symplify\PackageBuilder\FileSystem\SmartFileInfo;
 use TypeError;
 

src/Rector/AbstractRector.php

@@ -13,6 +13,7 @@
 use Rector\Contract\Rector\PhpRectorInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Php\PhpVersionProvider;
+use Rector\Rector\AbstractRector\AbstractRectorTrait;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symplify\PackageBuilder\FileSystem\SmartFileInfo;
 

src/Rector/AbstractRectorTrait.php → src/Rector/AbstractRector/AbstractRectorTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 trait AbstractRectorTrait
 {

src/Rector/AppliedRectorCollectorTrait.php → src/Rector/AbstractRector/AppliedRectorCollectorTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\Application\AppliedRectorCollector;

src/Rector/BetterStandardPrinterTrait.php → src/Rector/AbstractRector/BetterStandardPrinterTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\Node\BetterNodeFinder;

src/Rector/CallableNodeTraverserTrait.php → src/Rector/AbstractRector/CallableNodeTraverserTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\NodeTraverser\CallableNodeTraverser;

src/Rector/ConstFetchAnalyzerTrait.php → src/Rector/AbstractRector/ConstFetchAnalyzerTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\Node\Manipulator\ConstFetchManipulator;

src/Rector/NameResolverTrait.php → src/Rector/AbstractRector/NameResolverTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\Node\Resolver\NameResolver;

src/Rector/NodeCommandersTrait.php → src/Rector/AbstractRector/NodeCommandersTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;

src/Rector/NodeFactoryTrait.php → src/Rector/AbstractRector/NodeFactoryTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;

src/Rector/NodeTypeResolverTrait.php → src/Rector/AbstractRector/NodeTypeResolverTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PHPStan\Type\Type;

src/Rector/ValueResolverTrait.php → src/Rector/AbstractRector/ValueResolverTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node\Expr;
 use Rector\PhpParser\Node\Value\ValueResolver;

src/Rector/VisibilityTrait.php → src/Rector/AbstractRector/VisibilityTrait.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;

src/Rector/ClassMethod/AddMethodParentCallRector.php

@@ -0,0 +1,138 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Rector\ClassMethod;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Expression;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\Rector\AbstractRector;
+use Rector\RectorDefinition\CodeSample;
+use Rector\RectorDefinition\RectorDefinition;
+
+final class AddMethodParentCallRector extends AbstractRector
+{
+    /**
+     * @var mixed[]
+     */
+    private $methodsByParentTypes = [];
+
+    /**
+     * @param mixed[] $methodsByParentTypes
+     */
+    public function __construct(array $methodsByParentTypes = [])
+    {
+        $this->methodsByParentTypes = $methodsByParentTypes;
+    }
+
+    public function getDefinition(): RectorDefinition
+    {
+        return new RectorDefinition('Add method parent call, in case new parent method is added', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
+class SunshineCommand extends ParentClassWithNewConstructor
+{
+    public function __construct()
+    {
+        $value = 5;
+    }
+}
+CODE_SAMPLE
+                ,
+                <<<'CODE_SAMPLE'
+class SunshineCommand extends ParentClassWithNewConstructor
+{
+    public function __construct()
+    {
+        $value = 5;
+
+        parent::__construct();
+    }
+}
+CODE_SAMPLE
+            ),
+        ]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [ClassMethod::class];
+    }
+
+    /**
+     * @param ClassMethod $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        $class = $node->getAttribute(AttributeKey::CLASS_NODE);
+        if ($class === null) {
+            return null;
+        }
+
+        /** @var string $className */
+        $className = $node->getAttribute(AttributeKey::CLASS_NAME);
+
+        foreach ($this->methodsByParentTypes as $type => $methods) {
+            if (! $this->isType($class, $type)) {
+                continue;
+            }
+
+            // not itself
+            if ($className === $type) {
+                continue;
+            }
+
+            foreach ($methods as $method) {
+                if ($this->shouldSkipMethod($node, $method)) {
+                    continue;
+                }
+
+                $node->stmts[] = $this->createParentStaticCall($method);
+
+                return $node;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Looks for "parent::<methodName>
+     */
+    private function hasParentCallOfMethod(Node\Stmt\ClassMethod $classMethod, string $method): bool
+    {
+        return (bool) $this->betterNodeFinder->findFirst((array) $classMethod->stmts, function (Node $node) use (
+            $method
+        ): bool {
+            if (! $node instanceof StaticCall) {
+                return false;
+            }
+
+            if (! $this->isName($node->class, 'parent')) {
+                return false;
+            }
+
+            return $this->isName($node, $method);
+        });
+    }
+
+    private function createParentStaticCall(string $method): Expression
+    {
+        $parentStaticCall = new StaticCall(new Node\Name('parent'), new Node\Identifier($method));
+
+        return new Expression($parentStaticCall);
+    }
+
+    private function shouldSkipMethod(ClassMethod $classMethod, string $method): bool
+    {
+        if (! $this->isName($classMethod, $method)) {
+            return true;
+        }
+
+        return $this->hasParentCallOfMethod($classMethod, $method);
+    }
+}

tests/Rector/ClassMethod/AddMethodParentCallRector/AddMethodParentCallRectorTest.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector;
+
+use Rector\Rector\ClassMethod\AddMethodParentCallRector;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Source\ParentClassWithNewConstructor;
+
+final class AddMethodParentCallRectorTest extends AbstractRectorTestCase
+{
+    public function test(): void
+    {
+        $this->doTestFiles([
+            __DIR__ . '/Fixture/fixture.php.inc',
+            __DIR__ . '/Fixture/skip_already_has.php.inc',
+        ]);
+    }
+
+    /**
+     * @return mixed[]
+     */
+    protected function getRectorsWithConfiguration(): array
+    {
+        return [
+            AddMethodParentCallRector::class => [
+                '$methodsByParentTypes' => [
+                    ParentClassWithNewConstructor::class => ['__construct'],
+                ],
+            ],
+        ];
+    }
+}

tests/Rector/ClassMethod/AddMethodParentCallRector/Fixture/fixture.php.inc

@@ -0,0 +1,32 @@
+<?php
+
+namespace Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Fixture;
+
+use Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Source\ParentClassWithNewConstructor;
+
+class SunshineCommand extends ParentClassWithNewConstructor
+{
+    public function __construct()
+    {
+        $value = 5;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Fixture;
+
+use Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Source\ParentClassWithNewConstructor;
+
+class SunshineCommand extends ParentClassWithNewConstructor
+{
+    public function __construct()
+    {
+        $value = 5;
+        parent::__construct();
+    }
+}
+
+?>

tests/Rector/ClassMethod/AddMethodParentCallRector/Fixture/skip_already_has.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Fixture;
+
+use Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Source\ParentClassWithNewConstructor;
+
+class SkipAlreadyHas extends ParentClassWithNewConstructor
+{
+    public function __construct()
+    {
+        $value = 5;
+
+        parent::__construct();
+    }
+}

tests/Rector/ClassMethod/AddMethodParentCallRector/Source/ParentClassWithNewConstructor.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Tests\Rector\ClassMethod\AddMethodParentCallRector\Source;
+
+class ParentClassWithNewConstructor
+{
+    /**
+     * @var int
+     */
+    private $defaultValue;
+
+    public function __construct()
+    {
+        $this->defaultValue = 5;
+    }
+}