Merge 8a57f30 into db0ed59

FriendsOfSymfony · Dec 14, 2018 · 7398c22 · 7398c22
2 parents db0ed59 + 8a57f30
commit 7398c22
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,6 @@ env:
         - PHPUNIT_FLAGS="-v"
         - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
         - SYMFONY_PHPUNIT_VERSION=6.5
-        - SYMFONY_DEPRECATIONS_HELPER=10
 
 branches:
   only:
@@ -31,10 +30,10 @@ matrix:
 
     - php: 7.1
       env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
     - php: 7.2
       env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
 
     # Test the latest stable release
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -29,7 +29,8 @@
     </listeners>
 
     <php>
-        <server name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
-        <server name="KERNEL_CLASS" value="AppKernel" />
+        <env name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
+        <env name="KERNEL_CLASS" value="AppKernel" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
     </php>
 </phpunit>
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -53,12 +53,13 @@ public function __construct($debug)
      */
     public function getConfigTreeBuilder()
     {
-        if (method_exists(TreeBuilder::class, 'getRootNode')) {
-            $treeBuilder = new TreeBuilder('fos_http_cache');
-            $rootNode = $treeBuilder->getRootNode();
+        $treeBuilder = new TreeBuilder('fos_http_cache');
+
+        // Keep compatibility with symfony/config < 4.2
+        if (!method_exists($treeBuilder, 'getRootNode')) {
+            $rootNode = $treeBuilder->root('httplug');
         } else {
-            $treeBuilder = new TreeBuilder();
-            $rootNode = $treeBuilder->root('fos_http_cache');
+            $rootNode = $treeBuilder->getRootNode();
         }
 
         $rootNode
@@ -517,12 +518,13 @@ private function addProxyClientSection(ArrayNodeDefinition $rootNode)
      */
     private function getHttpDispatcherNode()
     {
-        if (method_exists(TreeBuilder::class, 'getRootNode')) {
-            $treeBuilder = new TreeBuilder('http');
-            $node = $treeBuilder->getRootNode();
+        $treeBuilder = new TreeBuilder('http');
+
+        // Keep compatibility with symfony/config < 4.2
+        if (!method_exists($treeBuilder, 'getRootNode')) {
+            $node = $treeBuilder->root('httplug');
         } else {
-            $treeBuilder = new TreeBuilder();
-            $node = $treeBuilder->root('http');
+            $node = $treeBuilder->getRootNode();
         }
 
         $node