nette 3

.travis.yml

@@ -6,9 +6,8 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 7.1
-    - 7.2
     - 7.3
+    - 7.4
 
 install:
     - composer install --no-interaction --prefer-dist
@@ -19,17 +18,17 @@ script:
 jobs:
     include:
         -   stage: Code Static Analyze (phpstan)
-            php: 7.3
+            php: 7.4
             script:
-                - php vendor/bin/phpstan analyse ./src ./tests --level 7
+                - php vendor/bin/phpstan analyse ./src ./tests --level max
 
         -   stage: Code Standard Checker
-            php: 7.3
+            php: 7.4
             script:
                 - php vendor/bin/phpcs --standard=PSR12 ./src ./tests
 
         -   stage: Code Coverage
-            php: 7.3
+            php: 7.4
             script:
                 - php vendor/bin/tester tests -p phpdbg --coverage ./coverage.xml --coverage-src ./src
             after_script:

composer.json

@@ -16,15 +16,14 @@
     }
   ],
   "require": {
-    "php": "~7.1",
-    "nette/di": "~2.4 || ~3.0",
-    "nette/application": "^2.4 || ~3.0"
+    "php": ">=7.3",
+    "nette/di": "~3.0",
+    "nette/application": "~3.0"
   },
   "require-dev": {
-    "kdyby/console": "^2.7",
-    "nette/bootstrap": "~2.4 || ~3.0",
+    "nette/bootstrap": "~3.0",
     "nette/tester": "~2.0",
-    "phpstan/phpstan": "^0.11",
+    "phpstan/phpstan": "^0.12",
     "squizlabs/php_codesniffer": "^3.0",
     "tracy/tracy": "^2.4"
   },

src/DI/IPrependRouteProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreezyBee\PrependRoute\DI;

src/DI/PrependRouteExtension.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreezyBee\PrependRoute\DI;
@@ -32,16 +33,16 @@ public function afterCompile(ClassType $classType): void
 
         $method = $classType->getMethod('createServiceRouting__router');
 
-        $newBody = '$mainService = new Nette\Application\Routers\RouteList;' . "\n";
+        $newBody = '$mainService = new Nette\Application\Routers\RouteList();' . "\n";
 
         foreach ($routeDefs as $routeDef) {
             foreach ($routeDef as $route) {
                 $newBody .= "\$mainService[] = \$this->getService('$route');\n";
             }
         }
 
-        $oldBody = preg_replace('/return \$service;$/', 'return $mainService;', $method->getBody() ?? '');
+        $oldBody = str_replace('return ', '$mainService[] = ', $method->getBody() ?? '');
 
-        $method->setBody("$newBody\$mainService[] = $oldBody");
+        $method->setBody("$newBody $oldBody return \$mainService;");
     }
 }

tests/Integration/PrependTest.phpt

@@ -5,7 +5,6 @@ namespace FreezyBee\PrependRoute\Tests\Integration;
 
 require __DIR__ . '/../bootstrap.php';
 
-use Kdyby\Console\CliRouter;
 use Nette\Application\IRouter;
 use Nette\Configurator;
 use Nette\Http\Request;
@@ -28,20 +27,16 @@ class PrependTest extends TestCase
         $configurator->addConfig(__DIR__ . '/../config.neon');
         $container = $configurator->createContainer();
 
-        /** @var CliRouter $cliRoute */
-        $cliRoute = $container->getService('console.router');
-        $cliRoute->allowedMethods = [];
-
         /** @var IRouter $router */
         $router = $container->getService('router');
 
-        $request = $router->match(new Request(new UrlScript('prepend-path')));
-        Assert::same('PrependTest', $request->getPresenterName());
-        Assert::same(['action' => 'someAction'], $request->getParameters());
+        $request = $router->match(new Request(new UrlScript('/prepend-path', '/prepend-path')));
+        Assert::same('PrependTest', $request['presenter']);
+        Assert::same('someAction', $request['action']);
 
-        $request = $router->match(new Request(new UrlScript('test')));
-        Assert::same('Test', $request->getPresenterName());
-        Assert::same(['action' => 'default'], $request->getParameters());
+        $request = $router->match(new Request(new UrlScript('/test', '/test')));
+        Assert::same('Test', $request['presenter']);
+        Assert::same('default', $request['action']);
     }
 }
 

tests/Utils/RouterFactory.php

@@ -1,11 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreezyBee\PrependRoute\Tests\Utils;
 
 use Nette\Application\IRouter;
 use Nette\Application\Routers\Route;
 use Nette\Application\Routers\RouteList;
+use Nette\Routing\Router;
 use Nette\StaticClass;
 
 /**
@@ -18,7 +20,7 @@ class RouterFactory
     /**
      * @return IRouter
      */
-    public static function createRouter(): IRouter
+    public static function createRouter(): Router
     {
         $router = new RouteList();
         $router[] = new Route('[<presenter>][/<action=default>]', 'Test:');

tests/Utils/TestExtension.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace FreezyBee\PrependRoute\Tests\Utils;

tests/bootstrap.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Tester\Environment;

tests/config.neon

@@ -1,5 +1,4 @@
 extensions:
-    console: Kdyby\Console\DI\ConsoleExtension
     prependRoute: FreezyBee\PrependRoute\DI\PrependRouteExtension
     test: FreezyBee\PrependRoute\Tests\Utils\TestExtension