Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit f7eb1a325859 · 2022-05-21T15:46:41.000+02:00
* 5.4:
  [FrameworkBundle] fix tests
diff --git a/Tests/Functional/Extension/TestDumpExtension.php b/Tests/Functional/Extension/TestDumpExtension.php
@@ -18,7 +18,7 @@
 
 class TestDumpExtension extends Extension implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('test_dump');
         $treeBuilder->getRootNode()
@@ -30,11 +30,11 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
     }
 
-    public function getConfiguration(array $config, ContainerBuilder $container)
+    public function getConfiguration(array $config, ContainerBuilder $container): ConfigurationInterface
     {
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`class TestDumpExtension extends Extension implements ConfigurationInterface`
`20`	`20`	`{`
`21`		`- public function getConfigTreeBuilder()`
	`21`	`+ public function getConfigTreeBuilder(): TreeBuilder`
`22`	`22`	`{`
`23`	`23`	`$treeBuilder = new TreeBuilder('test_dump');`
`24`	`24`	`$treeBuilder->getRootNode()`
`@@ -30,11 +30,11 @@ public function getConfigTreeBuilder()`
`30`	`30`	`return $treeBuilder;`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function load(array $configs, ContainerBuilder $container)`
	`33`	`+ public function load(array $configs, ContainerBuilder $container): void`
`34`	`34`	`{`
`35`	`35`	`}`
`36`	`36`
`37`		`- public function getConfiguration(array $config, ContainerBuilder $container)`
	`37`	`+ public function getConfiguration(array $config, ContainerBuilder $container): ConfigurationInterface`
`38`	`38`	`{`
`39`	`39`	`return $this;`
`40`	`40`	`}`