Merge remote-tracking branch 'upstream/master' into index-templates-s…

…upport

.travis.yml

@@ -19,13 +19,17 @@ matrix:
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
     - php: 7.2
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+    - php: 7.3
+      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
 
     # Latest supported dependencies with each PHP version
     - php: 5.6
     - php: 7.0
     - php: 7.1
     - php: 7.2
       env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-clover=coverage.clover"
+    - php: 7.3
+      env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-clover=coverage.clover"
 
     # Install all SF components in the same major version, see https://github.com/dunglas/symfony-lock
     - php: 7.2

src/DependencyInjection/Configuration.php

@@ -38,8 +38,14 @@ public function __construct($debug)
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('fos_elastica', 'array');
+        $treeBuilder = new TreeBuilder('fos_elastica');
+
+        if (method_exists($treeBuilder, 'getRootNode')) {
+            $rootNode = $treeBuilder->getRootNode();
+        } else {
+            // BC layer for symfony/config 4.1 and older
+            $rootNode = $treeBuilder->root('fos_elastica');
+        }
 
         $this->addClientsSection($rootNode);
         $this->addIndexesSection($rootNode);