Skip to content

Commit 40632ee

Browse files
felixuref3l1x
authored andcommitted
Composer: upgrade deps to latest versions
1 parent e39bd50 commit 40632ee

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
],
1818
"require": {
1919
"php": ">=8.2",
20-
"league/oauth2-client": "^2.6.0",
21-
"nette/http": "^3.0.5"
20+
"league/oauth2-client": "^2.7.0",
21+
"nette/http": "^3.3.0"
2222
},
2323
"require-dev": {
2424
"contributte/phpstan": "^0.2.0",
2525
"contributte/qa": "^0.4.0",
2626
"contributte/tester": "^0.3.0",
27-
"league/oauth2-facebook": "^2.0.5",
28-
"league/oauth2-google": "^3.0.3",
27+
"league/oauth2-facebook": "^2.2.0",
28+
"league/oauth2-google": "^4.0.1",
2929
"mockery/mockery": "^1.6.12",
30-
"nette/application": "^3.1.0",
31-
"nette/di": "^3.0.0",
30+
"nette/application": "^3.2.0",
31+
"nette/di": "^3.2.0",
3232
"omines/oauth2-gitlab": "^3.6.0"
3333
},
3434
"autoload": {

tests/Fixtures/Presenter/TestPresenter.php

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
use Nette\Application\Response;
66
use Nette\Application\UI\Component;
77
use Nette\Application\UI\Presenter;
8+
use Nette\Http\IRequest;
9+
use Nette\Http\IResponse;
810
use Nette\Http\Request as HttpRequest;
911
use Nette\Http\Response as HttpResponse;
1012
use Nette\Http\UrlScript;
13+
use ReflectionMethod;
1114

1215
final class TestPresenter extends Presenter
1316
{
1417

15-
public HttpRequest $httpRequest;
16-
17-
public HttpResponse $httpResponse;
18-
1918
public Response $response;
2019

2120
private Component $component;
@@ -27,10 +26,7 @@ public function __construct(Component $component, ?HttpRequest $request = null,
2726
$httpRequest = $request ?? new HttpRequest(new UrlScript('http://localhost/page'));
2827
$httpResponse = $response ?? new HttpResponse();
2928

30-
$this->injectPrimary(
31-
$httpRequest,
32-
$httpResponse
33-
);
29+
$this->injectPrimaryCompat($httpRequest, $httpResponse);
3430
$this->component = $component;
3531
$this->getComponent('subject');
3632
}
@@ -47,4 +43,22 @@ protected function createComponentSubject(): Component
4743
return $this->component;
4844
}
4945

46+
/**
47+
* Compatibility wrapper for injectPrimary across Nette versions
48+
*/
49+
private function injectPrimaryCompat(IRequest $httpRequest, IResponse $httpResponse): void
50+
{
51+
$method = new ReflectionMethod(Presenter::class, 'injectPrimary');
52+
$params = $method->getParameters();
53+
$firstParamName = $params[0]->getName();
54+
55+
if ($firstParamName === 'httpRequest') {
56+
// Nette 3.2.x older signature
57+
$this->injectPrimary($httpRequest, $httpResponse);
58+
} else {
59+
// Nette 3.2.x newer signature with $context first
60+
$this->injectPrimary(null, $httpRequest, $httpResponse);
61+
}
62+
}
63+
5064
}

0 commit comments

Comments
 (0)