Merge branch 'master' into gh-actions

nucleos · Dec 7, 2019 · ae8db37 · ae8db37
2 parents 10f8778 + caad93d
commit ae8db37
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,9 +40,6 @@ matrix:
     - stage: test
       php: 7.2
       env: COMPOSER_FLAGS="--prefer-lowest"
-    - stage: test
-      php: 7.3
-      env: SYMFONY_VERSION=3.4.*
     - stage: test
       php: 7.3
       env: SYMFONY_VERSION=4.2.*

diff --git a/composer.json b/composer.json
@@ -21,12 +21,12 @@
         "php": "^7.2",
         "knplabs/knp-menu": "^2.1",
         "sonata-project/block-bundle": "^3.18",
-        "symfony/config": "^3.4 || ^4.2",
-        "symfony/dependency-injection": "^3.4 || ^4.2",
-        "symfony/expression-language": "^3.4 || ^4.2",
-        "symfony/framework-bundle": "^3.4 || ^4.2",
-        "symfony/http-kernel": "^3.4 || ^4.2",
-        "symfony/translation": "^3.4 || ^4.2"
+        "symfony/config": "^4.2",
+        "symfony/dependency-injection": "^4.2",
+        "symfony/expression-language": "^4.2",
+        "symfony/framework-bundle": "^4.2",
+        "symfony/http-kernel": "^4.2",
+        "symfony/translation": "^4.2"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.2",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -12,7 +12,6 @@ parameters:
         # Symfony DI
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::fixXmlConfig\(\).#'
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::addDefaultsIfNotSet\(\).#'
-        - "/Call to function method_exists.. with 'Symfony.+' and 'getRootNode' will always evaluate to false./"
 
         # PHPUnit
         -

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -23,8 +23,7 @@ public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('core23_menu');
 
-        // Keep compatibility with symfony/config < 4.2
-        $rootNode = method_exists(TreeBuilder::class, 'getRootNode') ? $treeBuilder->getRootNode() : $treeBuilder->root('core23_menu');
+        $rootNode = $treeBuilder->getRootNode();
 
         \assert($rootNode instanceof ArrayNodeDefinition);
 
@@ -108,8 +107,8 @@ private function getPathNode(string $name = ''): NodeInterface
     {
         $treeBuilder = new TreeBuilder($name);
 
-        // Keep compatibility with symfony/config < 4.2
-        $definition = method_exists(TreeBuilder::class, 'getRootNode') ? $treeBuilder->getRootNode() : $treeBuilder->root($name);
+        $definition = $treeBuilder->getRootNode();
+
         \assert($definition instanceof ArrayNodeDefinition);
 
         $this->buildPathNode($definition);