Merge pull request #508 from Toflar/fix-symfony-deprecations

Fixed deprecation warnings

Author: dbu

.travis.yml

@@ -18,7 +18,6 @@ env:
  - PHPUNIT_FLAGS="-v"
  - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
  - SYMFONY_PHPUNIT_VERSION=6.5
- - SYMFONY_DEPRECATIONS_HELPER=10
 
 branches:
  only:
@@ -31,10 +30,10 @@ matrix:
 
  - php: 7.1
  env:
- - COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+ - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
  - php: 7.2
  env:
- - COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+ - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
 
  # Test the latest stable release
 

phpunit.xml.dist

@@ -29,7 +29,8 @@
  </listeners>
 
  <php>
- <server name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
- <server name="KERNEL_CLASS" value="AppKernel" />
+ <env name="KERNEL_DIR" value="./tests/Functional/Fixtures/app" />
+ <env name="KERNEL_CLASS" value="AppKernel" />
+ <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
  </php>
 </phpunit>

src/DependencyInjection/Configuration.php

@@ -53,12 +53,13 @@ public function __construct($debug)
  */
  public function getConfigTreeBuilder()
  {
- if (method_exists(TreeBuilder::class, 'getRootNode')) {
- $treeBuilder = new TreeBuilder('fos_http_cache');
- $rootNode = $treeBuilder->getRootNode();
- } else {
- $treeBuilder = new TreeBuilder();
+ $treeBuilder = new TreeBuilder('fos_http_cache');
+
+ // Keep compatibility with symfony/config < 4.2
+ if (!method_exists($treeBuilder, 'getRootNode')) {
  $rootNode = $treeBuilder->root('fos_http_cache');
+ } else {
+ $rootNode = $treeBuilder->getRootNode();
  }
 
  $rootNode
@@ -517,12 +518,13 @@ private function addProxyClientSection(ArrayNodeDefinition $rootNode)
  */
  private function getHttpDispatcherNode()
  {
- if (method_exists(TreeBuilder::class, 'getRootNode')) {
- $treeBuilder = new TreeBuilder('http');
- $node = $treeBuilder->getRootNode();
- } else {
- $treeBuilder = new TreeBuilder();
+ $treeBuilder = new TreeBuilder('http');
+
+ // Keep compatibility with symfony/config < 4.2
+ if (!method_exists($treeBuilder, 'getRootNode')) {
  $node = $treeBuilder->root('http');
+ } else {
+ $node = $treeBuilder->getRootNode();
  }
 
  $node