Skip to content

Commit bc7b1aa

Browse files
authored
Provide compatibility with Symfony 5.x (#13)
1 parent 74dc6f2 commit bc7b1aa

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Integration/Filter/ControllerAnnotations.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Doctrine\Common\Annotations\Reader;
1212
use Symfony\Component\DependencyInjection\ContainerInterface;
1313
use Symfony\Component\HttpFoundation\Response;
14-
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
14+
use Symfony\Component\HttpKernel\Event\ControllerEvent;
1515
use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter as FilterInterface;
1616

1717
class ControllerAnnotations implements FilterInterface
@@ -25,7 +25,7 @@ public function __construct(Reader $reader, ContainerInterface $container)
2525
$this->container = $container;
2626
}
2727

28-
public function filter(FilterControllerEvent $event, Response $response)
28+
public function filter(ControllerEvent $event, Response $response)
2929
{
3030
if (!\is_array($controller = $event->getController())) {
3131
return;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ The `LegacyApplicationDispatchingEventListener` can take a set of _Filters_ whic
170170
must implement the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter interface.
171171

172172
Once the legacy application has been executed, all registered filters are passed
173-
the `FilterControllerEvent` which triggered the event listener as well as the
173+
the `ControllerEvent` which triggered the event listener as well as the
174174
`Response` object that was created for the legacy application.
175175

176176
The primary use case for this is to be able to examine the response and choose

Twig/Extension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function getFunctions()
4949
];
5050
}
5151

52-
public function getGlobals()
52+
public function getGlobals(): array
5353
{
5454
return [
5555
'legacyApplication' => $this,

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
"doctrine/annotations": "~1.0",
2222
"psr/container": "^1.0",
2323
"psr/log": "^1.0",
24-
"symfony/config": "^4.3",
25-
"symfony/dependency-injection": "^4.2",
26-
"symfony/framework-bundle": "3.4.*|^4.0",
27-
"symfony/http-foundation": "3.4.*|^4.0",
28-
"symfony/http-kernel": "^4.3",
24+
"symfony/config": "^4.3|^5.0",
25+
"symfony/dependency-injection": "^4.3|^5.0",
26+
"symfony/framework-bundle": "3.4.*|^4.0|^5.0",
27+
"symfony/http-foundation": "^4.0|^5.0",
28+
"symfony/http-kernel": "^4.3|^5.0",
2929
"symfony/service-contracts": "^1.0|^2.0",
30-
"twig/twig": "^1.34|^2.0",
30+
"twig/twig": "^1.34|^2.0|^3.0",
3131
"webfactory/dom": "~1.0, >= 1.0.15"
3232
}
3333

0 commit comments

Comments
 (0)