Fix build against latest nette/application

nepada · Feb 9, 2024 · 74d90e4 · 74d90e4
1 parent 005c5f3
commit 74d90e4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/phpstan.tests.neon.dist b/phpstan.tests.neon.dist
@@ -38,3 +38,7 @@ parameters:
             message: "#^Cannot cast mixed to string\\.$#"
             count: 1
             path: tests/FileUploadControl/Fixtures/DummyTranslator.php
+        - # nette/application 3.1 compatibility
+            message: "#^Parameter .* of method Nette\\\\Application\\\\UI\\\\Presenter\\:\\:injectPrimary\\(\\) expects .*, .* given\\.$#"
+            count: 1
+            path: tests/FileUploadControl/Fixtures/TestPresenter.php
diff --git a/tests/FileUploadControl/Fixtures/TestPresenter.php b/tests/FileUploadControl/Fixtures/TestPresenter.php
@@ -8,6 +8,7 @@
 use Nette\Application\Routers\SimpleRouter;
 use Nette\Application\UI\Form;
 use Nette\Application\UI\Template;
+use ReflectionMethod;
 
 final class TestPresenter extends Nette\Application\UI\Presenter
 {
@@ -26,11 +27,19 @@ public static function create(?Nette\Http\IRequest $httpRequest = null, ?callabl
 
         $presenter->formConfigurator = $formConfigurator;
 
-        $httpRequest ??= $presenter->createHttpRequest();
-        $httpResponse = $presenter->createHttpResponse();
-        $templateFactory = $presenter->createTemplateFactory();
-        $router = new SimpleRouter();
-        $presenter->injectPrimary(null, null, $router, $httpRequest, $httpResponse, null, null, $templateFactory);
+        $primaryDependencies = [];
+        $rc = new ReflectionMethod($presenter, 'injectPrimary');
+        foreach ($rc->getParameters() as $parameter) {
+            if ($parameter->isDefaultValueAvailable()) {
+                continue;
+            }
+            $primaryDependencies[$parameter->getName()] = null;
+        }
+        $primaryDependencies['httpRequest'] = $httpRequest ?? $presenter->createHttpRequest();
+        $primaryDependencies['httpResponse'] = $presenter->createHttpResponse();
+        $primaryDependencies['router'] = new SimpleRouter();
+        $primaryDependencies['templateFactory'] = $presenter->createTemplateFactory();
+        $presenter->injectPrimary(...$primaryDependencies);
 
         $presenter->setParent(null, 'Test');
         $presenter->changeAction('default');