From 3610dd685b28d2e5e365957d7510898f804bd29b Mon Sep 17 00:00:00 2001 From: core23 Date: Thu, 21 Nov 2019 22:43:14 +0100 Subject: [PATCH] Drop support for symfony 3 --- composer.json | 18 +++++++++--------- phpstan.neon.dist | 6 ------ src/DependencyInjection/Configuration.php | 8 ++------ 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index 7611a76b..179e65c9 100644 --- a/composer.json +++ b/composer.json @@ -29,15 +29,15 @@ "psr/log": "^1.0", "sonata-project/block-bundle": "^4.0", "sonata-project/form-extensions": "^1.1", - "symfony/config": "^3.4 || ^4.2", - "symfony/dependency-injection": "^3.4 || ^4.2", - "symfony/expression-language": "^3.4 || ^4.2", - "symfony/form": "^3.4 || ^4.2", - "symfony/framework-bundle": "^3.4 || ^4.2", - "symfony/http-foundation": "^3.4 || ^4.2", - "symfony/http-kernel": "^3.4 || ^4.2", - "symfony/options-resolver": "^3.4 || ^4.2", - "symfony/twig-bundle": "^3.4 || ^4.2", + "symfony/config": "^4.2", + "symfony/dependency-injection": "^4.2", + "symfony/expression-language": "^4.2", + "symfony/form": "^4.2", + "symfony/framework-bundle": "^4.2", + "symfony/http-foundation": "^4.2", + "symfony/http-kernel": "^4.2", + "symfony/options-resolver": "^4.2", + "symfony/twig-bundle": "^4.2", "twig/twig": "^2.4" }, "require-dev": { diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 2f19913f..cc0c88bf 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -11,7 +11,6 @@ parameters: ignoreErrors: # Symfony DI - '#Cannot call method scalarNode\(\) on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface\|null.#' - - "/Call to function method_exists.. with 'Symfony.+' and 'getRootNode' will always evaluate to false./" # PHPUnit - @@ -30,8 +29,3 @@ parameters: message: "#^Call to an undefined method Twig\\\\Environment::expects\\(\\)\\.$#" count: 1 path: tests/Block/Service/MatomoTrackerBlockServiceTest.php - - - - message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder::root\\(\\)\\.$#" - count: 1 - path: src/DependencyInjection/Configuration.php diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 2c598963..05e82b91 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -21,12 +21,8 @@ public function getConfigTreeBuilder() { $treeBuilder = new TreeBuilder('core23_matomo'); - // Keep compatibility with symfony/config < 4.2 - if (!method_exists(TreeBuilder::class, 'getRootNode')) { - $rootNode = $treeBuilder->root('core23_matomo'); - } else { - $rootNode = $treeBuilder->getRootNode(); - } + $rootNode = $treeBuilder->getRootNode(); + \assert($rootNode instanceof ArrayNodeDefinition); $this->addHttpClientSection($rootNode);