Merge pull request #27 from cached/master

Update configuration.php to support Symfony 5
EmanueleMinotto · Nov 7, 2020 · b5936ff · b5936ff
2 parents c5f97d8 + 9659098
commit b5936ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/DataCollector/TwigCacheCollector.php b/DataCollector/TwigCacheCollector.php
@@ -34,7 +34,7 @@ class TwigCacheCollector implements DataCollectorInterface
      */
     private $hits = 0;
 
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         // nothing to do here
     }

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -19,8 +19,14 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('twig_cache');
+        $treeBuilder = new TreeBuilder('twig_cache', 'array');
+
+        if (method_exists($treeBuilder, 'getRootNode')) {
+            $rootNode = $treeBuilder->getRootNode();
+        } else {
+            // BC layer for symfony/config 4.1 and older
+            $rootNode = $treeBuilder->root('twig_cache', 'array');
+        }
 
         $rootNode
             ->children()