Skip to content

Commit b56d320

Browse files
committed
feature #221 Allow Symfony 7 (jmsche)
This PR was merged into the 2.x branch. Discussion ---------- Allow Symfony 7 Commits ------- 02e10ce Allow Symfony 7
2 parents 150fe02 + 02e10ce commit b56d320

File tree

6 files changed

+24
-13
lines changed

6 files changed

+24
-13
lines changed

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
],
1212
"require": {
1313
"php": ">=8.1.0",
14-
"symfony/asset": "^5.4 || ^6.2",
15-
"symfony/config": "^5.4 || ^6.2",
16-
"symfony/dependency-injection": "^5.4 || ^6.2",
17-
"symfony/http-kernel": "^5.4 || ^6.2",
14+
"symfony/asset": "^5.4 || ^6.2 || ^7.0",
15+
"symfony/config": "^5.4 || ^6.2 || ^7.0",
16+
"symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
17+
"symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
1818
"symfony/service-contracts": "^1.1.9 || ^2.1.3 || ^3.0"
1919
},
2020
"require-dev": {
21-
"symfony/framework-bundle": "^5.4 || ^6.2",
22-
"symfony/phpunit-bridge": "^5.4 || ^6.2",
23-
"symfony/twig-bundle": "^5.4 || ^6.2",
24-
"symfony/web-link": "^5.4 || ^6.2"
21+
"symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
22+
"symfony/phpunit-bridge": "^5.4 || ^6.2 || ^7.0",
23+
"symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0",
24+
"symfony/web-link": "^5.4 || ^6.2 || ^7.0"
2525
},
2626
"minimum-stability": "dev",
2727
"autoload": {

psalm-baseline.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
3+
<file src="src/DependencyInjection/Configuration.php">
4+
<UndefinedMethod>
5+
<code>children</code>
6+
</UndefinedMethod>
7+
</file>
8+
</files>

psalm.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
66
xmlns="https://getpsalm.org/schema/config"
77
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
8-
phpVersion="8.0"
8+
phpVersion="8.1"
9+
findUnusedBaselineEntry="true"
10+
findUnusedCode="false"
11+
errorBaseline="psalm-baseline.xml"
912
>
1013
<projectFiles>
1114
<directory name="src" />

tests/EventListener/ExceptionListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testItResetsAllEntrypointLookups()
4646
$event = new $exceptionEventClass(
4747
$this->createMock(HttpKernelInterface::class),
4848
$request,
49-
HttpKernelInterface::MASTER_REQUEST,
49+
HttpKernelInterface::MAIN_REQUEST,
5050
$exception
5151
);
5252
$listener = new ExceptionListener($entrypointLookupCollection, $buildNames);

tests/EventListener/PreLoadAssetsEventListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testItPreloadsAssets()
3333

3434
$request = new Request();
3535
$response = new Response();
36-
$event = $this->createResponseEvent($request, HttpKernelInterface::MASTER_REQUEST, $response);
36+
$event = $this->createResponseEvent($request, HttpKernelInterface::MAIN_REQUEST, $response);
3737
$listener = new PreLoadAssetsEventListener($tagRenderer);
3838
$listener->onKernelResponse($event);
3939
$this->assertTrue($request->attributes->has('_links'));
@@ -68,7 +68,7 @@ public function testItReusesExistingLinkProvider()
6868
$request->attributes->set('_links', $linkProvider);
6969

7070
$response = new Response();
71-
$event = $this->createResponseEvent($request, HttpKernelInterface::MASTER_REQUEST, $response);
71+
$event = $this->createResponseEvent($request, HttpKernelInterface::MAIN_REQUEST, $response);
7272
$listener = new PreLoadAssetsEventListener($tagRenderer);
7373
$listener->onKernelResponse($event);
7474
/** @var GenericLinkProvider|FigGenericLinkProvider $linkProvider */

tools/psalm/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"require": {
3-
"vimeo/psalm": "^4.23.0"
3+
"vimeo/psalm": "^5.13.1"
44
}
55
}

0 commit comments

Comments
 (0)