Merge pull request #35 from romainf/swap-4.0-symfony-5.0

Update to symfony 5.0
florianv · Mar 4, 2020 · ab3a075 · ab3a075
2 parents 67dfa1d + 19cc926
commit ab3a075
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -26,11 +26,11 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder('florianv_swap');
-
-        if (method_exists($treeBuilder, 'getRootNode')) {
+        if (method_exists(TreeBuilder::class, 'getRootNode')) {
+            $treeBuilder = new TreeBuilder('florianv_swap');
             $rootNode = $treeBuilder->getRootNode();
         } else {
+            $treeBuilder = new TreeBuilder();
             $rootNode = $treeBuilder->root('florianv_swap');
         }
 
@@ -199,15 +199,17 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 
+
     private function createSimpleProviderNode($name)
     {
-        $treeBuilder = new TreeBuilder($name);
-
-        if (method_exists($treeBuilder, 'getRootNode')) {
+        if (method_exists(TreeBuilder::class, 'getRootNode')) {
+            $treeBuilder = new TreeBuilder($name);
             $node = $treeBuilder->getRootNode();
         } else {
+            $treeBuilder = new TreeBuilder();
             $node = $treeBuilder->root($name);
         }
+
         $node
             ->children()
                 ->integerNode('priority')->defaultValue(0)->end()

diff --git a/Tests/DependencyInjection/FlorianvSwapExtensionTest.php b/Tests/DependencyInjection/FlorianvSwapExtensionTest.php
@@ -15,7 +15,7 @@
 use Swap\Builder;
 use Swap\Swap;
 use Symfony\Component\Cache\Adapter;
-use Symfony\Component\Cache\Traits\ApcuTrait;
+use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -123,7 +123,7 @@ public function testArrayCache()
 
     public function testApcuCache()
     {
-        if (!ApcuTrait::isSupported()) {
+        if (!ApcuAdapter::isSupported()) {
             $this->markTestSkipped('APCU is not enabled');
         }
 
@@ -160,6 +160,7 @@ private function buildContainer(array $providers = ['fixer' => ['access_key' =>
      *
      * @param $class
      * @param $config
+     * @throws \Exception
      */
     private function assertCache($class, $config)
     {

diff --git a/composer.json b/composer.json
@@ -17,13 +17,13 @@
     },
     "require": {
         "php": "^5.6|^7.0",
-        "symfony/framework-bundle": "~3.0 || ~4.0",
+        "symfony/framework-bundle": "~3.0|~4.0|~5.0",
         "florianv/swap": "^4.0"
     },
     "require-dev": {
         "php-http/guzzle6-adapter": "^1.0",
         "php-http/message": "^1.7",
-        "symfony/cache": "~3.0|~4.0",
+        "symfony/cache": "~3.0|~4.0|~5.0",
         "phpunit/phpunit": "~5.0",
         "nyholm/psr7": "^1.1"
     },