Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
],
"require": {
"php": ">=8.1.0",
"symfony/asset": "^5.4 || ^6.2",
"symfony/config": "^5.4 || ^6.2",
"symfony/dependency-injection": "^5.4 || ^6.2",
"symfony/http-kernel": "^5.4 || ^6.2",
"symfony/asset": "^5.4 || ^6.2 || ^7.0",
"symfony/config": "^5.4 || ^6.2 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
"symfony/service-contracts": "^1.1.9 || ^2.1.3 || ^3.0"
},
"require-dev": {
"symfony/framework-bundle": "^5.4 || ^6.2",
"symfony/phpunit-bridge": "^5.4 || ^6.2",
"symfony/twig-bundle": "^5.4 || ^6.2",
"symfony/web-link": "^5.4 || ^6.2"
"symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
"symfony/phpunit-bridge": "^5.4 || ^6.2 || ^7.0",
"symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0",
"symfony/web-link": "^5.4 || ^6.2 || ^7.0"
},
"minimum-stability": "dev",
"autoload": {
Expand Down
8 changes: 8 additions & 0 deletions psalm-baseline.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
<file src="src/DependencyInjection/Configuration.php">
<UndefinedMethod>
<code>children</code>
</UndefinedMethod>
</file>
</files>
5 changes: 4 additions & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
phpVersion="8.0"
phpVersion="8.1"
findUnusedBaselineEntry="true"
findUnusedCode="false"
errorBaseline="psalm-baseline.xml"
>
<projectFiles>
<directory name="src" />
Expand Down
2 changes: 1 addition & 1 deletion tests/EventListener/ExceptionListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function testItResetsAllEntrypointLookups()
$event = new $exceptionEventClass(
$this->createMock(HttpKernelInterface::class),
$request,
HttpKernelInterface::MASTER_REQUEST,
HttpKernelInterface::MAIN_REQUEST,
$exception
);
$listener = new ExceptionListener($entrypointLookupCollection, $buildNames);
Expand Down
4 changes: 2 additions & 2 deletions tests/EventListener/PreLoadAssetsEventListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testItPreloadsAssets()

$request = new Request();
$response = new Response();
$event = $this->createResponseEvent($request, HttpKernelInterface::MASTER_REQUEST, $response);
$event = $this->createResponseEvent($request, HttpKernelInterface::MAIN_REQUEST, $response);
$listener = new PreLoadAssetsEventListener($tagRenderer);
$listener->onKernelResponse($event);
$this->assertTrue($request->attributes->has('_links'));
Expand Down Expand Up @@ -68,7 +68,7 @@ public function testItReusesExistingLinkProvider()
$request->attributes->set('_links', $linkProvider);

$response = new Response();
$event = $this->createResponseEvent($request, HttpKernelInterface::MASTER_REQUEST, $response);
$event = $this->createResponseEvent($request, HttpKernelInterface::MAIN_REQUEST, $response);
$listener = new PreLoadAssetsEventListener($tagRenderer);
$listener->onKernelResponse($event);
/** @var GenericLinkProvider|FigGenericLinkProvider $linkProvider */
Expand Down
2 changes: 1 addition & 1 deletion tools/psalm/composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"require": {
"vimeo/psalm": "^4.23.0"
"vimeo/psalm": "^5.13.1"
}
}