Upgrade to Nette 3.1

config/set/nette-31.php

@@ -5,6 +5,8 @@
 use Rector\Composer\Rector\ChangePackageVersionRector;
 use Rector\Composer\Rector\RemovePackageRector;
 use Rector\Composer\ValueObject\PackageAndVersion;
+use Rector\Nette\Rector\Assign\ArrayAccessAddRouteToAddRouteMethodCallRector;
+use Rector\Nette\Rector\MethodCall\ContextGetByTypeToConstructorInjectionRector;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Renaming\Rector\Name\RenameClassRector;
 use Rector\Renaming\Rector\StaticCall\RenameStaticMethodRector;
@@ -19,7 +21,7 @@
     $services->set(RenameClassRector::class)->call('configure', [[
         RenameClassRector::OLD_TO_NEW_CLASSES => [
             // https://github.com/nette/application/compare/v3.0.7...v3.1.0
-            'Nette\Application\IRouter' => 'Nette\Routing\Router',  // TODO not sure about this, it is not simple rename, Nette\Routing\Router already exists in nette/routing
+            'Nette\Application\IRouter' => 'Nette\Routing\Router',
             'Nette\Application\IResponse' => 'Nette\Application\Response',
             'Nette\Application\UI\IRenderable' => 'Nette\Application\UI\Renderable',
             'Nette\Application\UI\ISignalReceiver' => 'Nette\Application\UI\SignalReceiver',
@@ -90,9 +92,9 @@
             ]),
         ]]);
 
-    // TODO change $router[] = new Router() to $router->addRoute() because of deprecated flags
+    $services->set(ArrayAccessAddRouteToAddRouteMethodCallRector::class);
 
-    // TODO Presenter->getContext() and Presenter->context is deprecated
+    $services->set(ContextGetByTypeToConstructorInjectionRector::class);
 
     $services->set(ChangePackageVersionRector::class)
         ->call('configure', [[

rules/nette/src/Rector/Assign/ArrayAccessAddRouteToAddRouteMethodCallRector.php

@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Nette\Rector\Assign;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\Variable;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see \Rector\Nette\Tests\Rector\Assign\ArrayAccessAddRouteToAddRouteMethodCallRector\ArrayAccessAddRouteToAddRouteMethodCallRectorTest
+ */
+final class ArrayAccessAddRouteToAddRouteMethodCallRector extends AbstractRector
+{
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Change magic array access add Route, to explicit $routeList->addRoute(...) method',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+use Nette\Application\Routers\Route;
+use Nette\Application\Routers\RouteList;
+
+class RouterFactory
+{
+    public static function createRouter()
+    {
+        $routeList = new RouteList();
+        $routeList[] = new Route('<module>/<presenter>/<action>[/<id>]', 'Homepage:default');
+        return $routeList;
+    }
+}
+CODE_SAMPLE
+,
+                    <<<'CODE_SAMPLE'
+use Nette\Application\Routers\RouteList;
+
+class RouterFactory
+{
+    public static function createRouter()
+    {
+        $routeList = new RouteList();
+        $routeList->addRoute('<module>/<presenter>/<action>[/<id>]', 'Homepage:default');
+        return $routeList;
+    }
+}
+CODE_SAMPLE
+                ),
+
+            ]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [Assign::class];
+    }
+
+    /**
+     * @param Assign $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (! $this->isAssignOfRouteToRouteListDimFetch($node)) {
+            return null;
+        }
+
+        /** @var ArrayDimFetch $arrayDimFetch */
+        $arrayDimFetch = $node->var;
+
+        /** @var Node\Expr\New_ $newRoute */
+        $newRoute = $node->expr;
+
+        return new MethodCall($arrayDimFetch->var, 'addRoute', $newRoute->args);
+    }
+
+    private function isAssignOfRouteToRouteListDimFetch(Assign $assign): bool
+    {
+        if (! $assign->var instanceof ArrayDimFetch) {
+            return false;
+        }
+
+        if (! $this->isObjectType($assign->expr, 'Nette\Application\Routers\Route')) {
+            return false;
+        }
+
+        $arrayDimFetch = $assign->var;
+        if (! $arrayDimFetch->var instanceof Variable) {
+            return false;
+        }
+
+        return $this->isObjectType($arrayDimFetch->var, 'Nette\Application\Routers\RouteList');
+    }
+}

rules/nette/tests/Rector/Assign/ArrayAccessAddRouteToAddRouteMethodCallRector/ArrayAccessAddRouteToAddRouteMethodCallRectorTest.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Nette\Tests\Rector\Assign\ArrayAccessAddRouteToAddRouteMethodCallRector;
+
+use Iterator;
+use Rector\Nette\Rector\Assign\ArrayAccessAddRouteToAddRouteMethodCallRector;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class ArrayAccessAddRouteToAddRouteMethodCallRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    protected function getRectorClass(): string
+    {
+        return ArrayAccessAddRouteToAddRouteMethodCallRector::class;
+    }
+}

rules/nette/tests/Rector/Assign/ArrayAccessAddRouteToAddRouteMethodCallRector/Fixture/fixture.php.inc

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Nette\Tests\Rector\Assign\ArrayAccessAddRouteToAddRouteMethodCallRector\Fixture;
+
+use Nette\Application\Routers\Route;
+use Nette\Application\Routers\RouteList;
+
+class RouterFactory
+{
+    public static function createRouter()
+    {
+        $routeList = new RouteList();
+        $routeList[] = new Route('<module>/<presenter>/<action>[/<id>]', 'Homepage:default');
+        return $routeList;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Nette\Tests\Rector\Assign\ArrayAccessAddRouteToAddRouteMethodCallRector\Fixture;
+
+use Nette\Application\Routers\Route;
+use Nette\Application\Routers\RouteList;
+
+class RouterFactory
+{
+    public static function createRouter()
+    {
+        $routeList = new RouteList();
+        $routeList->addRoute('<module>/<presenter>/<action>[/<id>]', 'Homepage:default');
+        return $routeList;
+    }
+}
+
+?>