Skip to content
Permalink
Browse files

Merge branch 'master' into gh-actions

  • Loading branch information
core23 committed Dec 7, 2019
2 parents 815b0d3 + f901d9f commit a9cd4a9e345ca50c73c3a6c07b1e877c489fdb61
Showing with 10 additions and 18 deletions.
  1. +0 −3 .travis.yml
  2. +8 −8 composer.json
  3. +0 −1 phpstan.neon.dist
  4. +2 −6 src/DependencyInjection/Configuration.php
@@ -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.*
@@ -20,14 +20,14 @@
"php": "^7.2",
"psr/cache": "^1.0",
"psr/simple-cache": "^1.0",
"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-foundation": "^3.4 || ^4.2",
"symfony/http-kernel": "^3.4 || ^4.2",
"symfony/options-resolver": "^3.4 || ^4.2",
"symfony/routing": "^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-foundation": "^4.2",
"symfony/http-kernel": "^4.2",
"symfony/options-resolver": "^4.2",
"symfony/routing": "^4.2"
},
"conflict": {
"cache/adapter-bundle": "<1.2"
@@ -16,7 +16,6 @@ parameters:
# Symfony DI
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).#'
- '#Cannot call method end\(\) on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface\|null.#'
- "/Call to function method_exists.. with 'Symfony.+' and 'getRootNode' will always evaluate to false./"

# PHPUnit
-
@@ -21,12 +21,8 @@ public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('core23_sitemap');

// Keep compatibility with symfony/config < 4.2
if (!method_exists(TreeBuilder::class, 'getRootNode')) {
$rootNode = $treeBuilder->root('core23_sitemap');
} else {
$rootNode = $treeBuilder->getRootNode();
}
$rootNode = $treeBuilder->getRootNode();

\assert($rootNode instanceof ArrayNodeDefinition);

$this->addStaticUrlsSection($rootNode);

0 comments on commit a9cd4a9

Please sign in to comment.
You can’t perform that action at this time.