Skip to content

Commit 0cb493d

Browse files
authored
Merge pull request #581 from XWB/fix-deprecations
Fix several deprecation notices
2 parents 91f5e62 + d9465c5 commit 0cb493d

12 files changed

+20
-19
lines changed

src/Configuration/InvalidatePath.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ public function getPaths()
6666
/**
6767
* {@inheritdoc}
6868
*/
69-
public function getAliasName()
69+
public function getAliasName(): string
7070
{
7171
return 'invalidate_path';
7272
}
7373

7474
/**
7575
* {@inheritdoc}
7676
*/
77-
public function allowArray()
77+
public function allowArray(): bool
7878
{
7979
return true;
8080
}

src/Configuration/InvalidateRoute.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ public function getParams()
115115
/**
116116
* {@inheritdoc}
117117
*/
118-
public function getAliasName()
118+
public function getAliasName(): string
119119
{
120120
return 'invalidate_route';
121121
}
122122

123123
/**
124124
* {@inheritdoc}
125125
*/
126-
public function allowArray()
126+
public function allowArray(): bool
127127
{
128128
return true;
129129
}

src/Configuration/Tag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ public function getTags()
9292
/**
9393
* {@inheritdoc}
9494
*/
95-
public function getAliasName()
95+
public function getAliasName(): string
9696
{
9797
return 'tag';
9898
}
9999

100100
/**
101101
* {@inheritdoc}
102102
*/
103-
public function allowArray()
103+
public function allowArray(): bool
104104
{
105105
return true;
106106
}

src/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function __construct($debug)
5151
/**
5252
* {@inheritdoc}
5353
*/
54-
public function getConfigTreeBuilder()
54+
public function getConfigTreeBuilder(): TreeBuilder
5555
{
5656
$treeBuilder = new TreeBuilder('fos_http_cache');
5757

src/DependencyInjection/FOSHttpCacheExtension.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use FOS\HttpCache\TagHeaderFormatter\MaxHeaderValueLengthFormatter;
1818
use FOS\HttpCacheBundle\DependencyInjection\Compiler\HashGeneratorPass;
1919
use FOS\HttpCacheBundle\Http\ResponseMatcher\ExpressionResponseMatcher;
20+
use Symfony\Component\Config\Definition\ConfigurationInterface;
2021
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
2122
use Symfony\Component\Config\FileLocator;
2223
use Symfony\Component\Console\Application;
@@ -37,7 +38,7 @@ class FOSHttpCacheExtension extends Extension
3738
/**
3839
* {@inheritdoc}
3940
*/
40-
public function getConfiguration(array $config, ContainerBuilder $container)
41+
public function getConfiguration(array $config, ContainerBuilder $container): ConfigurationInterface
4142
{
4243
return new Configuration($container->getParameter('kernel.debug'));
4344
}

src/EventListener/CacheControlListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function __construct($debugHeader = false)
7979
/**
8080
* {@inheritdoc}
8181
*/
82-
public static function getSubscribedEvents()
82+
public static function getSubscribedEvents(): array
8383
{
8484
return [
8585
KernelEvents::RESPONSE => ['onKernelResponse', 10],

src/EventListener/FlashMessageListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function __construct($session, array $options = [])
6565
/**
6666
* {@inheritdoc}
6767
*/
68-
public static function getSubscribedEvents()
68+
public static function getSubscribedEvents(): array
6969
{
7070
return [
7171
KernelEvents::RESPONSE => 'onKernelResponse',

src/EventListener/InvalidationListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function onConsoleTerminate(ConsoleEvent $event)
141141
/**
142142
* {@inheritdoc}
143143
*/
144-
public static function getSubscribedEvents()
144+
public static function getSubscribedEvents(): array
145145
{
146146
return [
147147
KernelEvents::TERMINATE => 'onKernelTerminate',

src/EventListener/Php8AttributesListener.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ public function onKernelRequest(AttributeRequestEvent $event)
7676
}
7777
}
7878

79-
public static function getSubscribedEvents()
79+
/**
80+
* {@inheritdoc}
81+
*/
82+
public static function getSubscribedEvents(): array
8083
{
8184
return [
8285
KernelEvents::REQUEST => 'onKernelRequest',

src/EventListener/TagListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function onKernelResponse(TagResponseEvent $event)
123123
/**
124124
* {@inheritdoc}
125125
*/
126-
public static function getSubscribedEvents()
126+
public static function getSubscribedEvents(): array
127127
{
128128
return [
129129
KernelEvents::RESPONSE => 'onKernelResponse',

src/EventListener/UserContextListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public function onKernelResponse(UserContextResponseEvent $event)
256256
/**
257257
* {@inheritdoc}
258258
*/
259-
public static function getSubscribedEvents()
259+
public static function getSubscribedEvents(): array
260260
{
261261
return [
262262
KernelEvents::RESPONSE => 'onKernelResponse',

src/Twig/CacheTagExtension.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(ResponseTagger $responseTagger)
3333
/**
3434
* {@inheritdoc}
3535
*/
36-
public function getFunctions()
36+
public function getFunctions(): array
3737
{
3838
return [
3939
new TwigFunction('fos_httpcache_tag', [$this, 'addTag']),
@@ -55,10 +55,7 @@ public function addTag($tag)
5555
$this->responseTagger->addTags((array) $tag);
5656
}
5757

58-
/**
59-
* {@inheritdoc}
60-
*/
61-
public function getName()
58+
public function getName(): string
6259
{
6360
return 'fos_httpcache_tag_extension';
6461
}

0 commit comments

Comments
 (0)