From 5e09d8b4ad2c7232bfd9dac0342e7e7cab610775 Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Sat, 8 Dec 2018 08:17:04 +0100 Subject: [PATCH 1/2] Support Symfony 4.2 --- DependencyInjection/Configuration.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 6cbc625..4f3515d 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -3,6 +3,7 @@ namespace Overblog\GraphiQLBundle\DependencyInjection; use Overblog\GraphiQLBundle\Config\GraphQLEndpoint\Helpers\OverblogGraphQLBundleEndpointResolver; +use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -10,8 +11,8 @@ final class Configuration implements ConfigurationInterface { public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('overblog_graphiql'); + $treeBuilder = new TreeBuilder('overblog_graphiql'); + $rootNode = self::getRootNodeWithoutDeprecation($treeBuilder, 'overblog_graphiql'); $rootNode ->addDefaultsIfNotSet() @@ -36,4 +37,17 @@ public function getConfigTreeBuilder() return $treeBuilder; } + + /** + * @param TreeBuilder $builder + * @param string|null $name + * @param string $type + * + * @return ArrayNodeDefinition|\Symfony\Component\Config\Definition\Builder\NodeDefinition + */ + private static function getRootNodeWithoutDeprecation(TreeBuilder $builder, $name, $type = 'array') + { + // BC layer for symfony/config 4.1 and older + return \method_exists($builder, 'getRootNode') ? $builder->getRootNode() : $builder->root($name, $type); + } } From b5bbf33183cc069319cc11c2b97268fb2cb6351b Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Sat, 8 Dec 2018 08:18:09 +0100 Subject: [PATCH 2/2] Optimize travis config and add php 7.3 / symfony 4.2 build --- .travis.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 746eb82..6a0da1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: php git: - depth: 1 + depth: 50 branches: only: @@ -30,25 +30,23 @@ matrix: env: SYMFONY_VERSION=3.4.* - php: 7.2 env: SYMFONY_VERSION=4.0.* - - php: 7.2 - env: SYMFONY_VERSION=4.1.* DEPENDENCIES=dev + - php: 7.3 + env: SYMFONY_VERSION=4.1.* + - php: 7.3 + env: SYMFONY_VERSION=4.2.* - php: nightly env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs allow_failures: - php: nightly env: COMPOSER_UPDATE_FLAGS=--ignore-platform-reqs - - php: 7.2 - env: SYMFONY_VERSION=4.1.* DEPENDENCIES=dev - cache: directories: - $HOME/.composer/cache - $HOME/.php_cs.cache - - vendor/ before_install: - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi; - - if [ ${TEST_COVERAGE} != true ]; then phpenv config-rm xdebug.ini || true; fi; + - if [ "${TEST_COVERAGE}" != "true" ]; then phpenv config-rm xdebug.ini || true; fi; - composer selfupdate - if [ $SYMFONY_VERSION ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --dev --no-update; fi; - if [ $GRAPHQLBUNDLE_VERSION ]; then composer require "overblog/graphql-bundle:${GRAPHQLBUNDLE_VERSION}" --dev --no-update; fi; @@ -56,9 +54,9 @@ before_install: install: composer update --prefer-source --no-interaction --optimize-autoloader ${COMPOSER_UPDATE_FLAGS} script: - - ./bin/phpunit --debug $( if [ $TEST_COVERAGE = true ]; then echo "-d xdebug.max_nesting_level=1000 --coverage-clover=build/logs/clover.xml"; fi; ) - - if [ ${TEST_COVERAGE} = true ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -O php-cs-fixer && php ./php-cs-fixer fix --diff --dry-run -v; fi; + - ./bin/phpunit --debug $( if [ "$TEST_COVERAGE" = "true" ]; then echo "-d xdebug.max_nesting_level=1000 --coverage-clover=build/logs/clover.xml"; fi; ) + - if [ "${TEST_COVERAGE}" = "true" ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -O php-cs-fixer && php ./php-cs-fixer fix --diff --dry-run -v; fi; after_script: - - if [ ${TEST_COVERAGE} = true ]; then wget https://scrutinizer-ci.com/ocular.phar && travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi; - - if [ ${TEST_COVERAGE} = true ]; then composer require "satooshi/php-coveralls:^1.0" && travis_retry php ./vendor/bin/coveralls -v; fi; + - if [ "${TEST_COVERAGE}" = "true" ]; then wget https://scrutinizer-ci.com/ocular.phar && travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi; + - if [ "${TEST_COVERAGE}" = "true" ]; then composer require "satooshi/php-coveralls:^1.0" && travis_retry php ./vendor/bin/coveralls -v; fi;