Merge branch '2.x' into 3.x

fabpot · fabpot · commit 2e0286630e0d · 2023-07-29T13:21:17.000+02:00
* 2.x:
  Fix BC break
  Update Drupal version in tests
  Fix code
  Bump PHP version used by Drupal tests
  add return type for Symfony 7 compatibility
diff --git a/extra/twig-extra-bundle/DependencyInjection/Configuration.php b/extra/twig-extra-bundle/DependencyInjection/Configuration.php
@@ -17,10 +17,7 @@
 
 class Configuration implements ConfigurationInterface
 {
-    /**
-     * @return TreeBuilder
-     */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('twig_extra');
         $rootNode = $treeBuilder->getRootNode();

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,7 @@`
`17`	`17`
`18`	`18`	`class Configuration implements ConfigurationInterface`
`19`	`19`	`{`
`20`		`- /**`
`21`		`- * @return TreeBuilder`
`22`		`- */`
`23`		`- public function getConfigTreeBuilder()`
	`20`	`+ public function getConfigTreeBuilder(): TreeBuilder`
`24`	`21`	`{`
`25`	`22`	`$treeBuilder = new TreeBuilder('twig_extra');`
`26`	`23`	`$rootNode = $treeBuilder->getRootNode();`