Merge pull request #78 from szymach/2.0

Resolved Symfony 4.x depreciation
fsi-open · Aug 6, 2019 · adfa49c · adfa49c
2 parents 39fcb82 + 5e4fcde
commit adfa49c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -20,8 +20,13 @@ class Configuration implements ConfigurationInterface
 
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('fsi_resource_repository');
+        if (true === method_exists(TreeBuilder::class, 'getRootNode')) {
+            $treeBuilder = new TreeBuilder('fsi_resource_repository');
+            $rootNode = $treeBuilder->getRootNode();
+        } else {
+            $treeBuilder = new TreeBuilder();
+            $rootNode = $treeBuilder->root('fsi_resource_repository');
+        }
 
         $rootNode->children()
             ->scalarNode('db_driver')

diff --git a/composer.json b/composer.json
@@ -31,7 +31,8 @@
         "phpunit/phpunit": "^7.1",
         "phpspec/phpspec": "^5.0",
         "phpspec/prophecy": "^1.7",
-        "sebastian/exporter": "^3.1.0"
+        "sebastian/exporter": "^3.1.0",
+        "symfony/phpunit-bridge": "^4.3"
     },
     "suggest": {
         "fsi/doctrine-extensions-bundle": "For using fsi_file resource type",

diff --git a/...undle/ResourceRepositoryBundle/DependencyInjection/FSIResourceRepositoryExtensionSpec.php b/...undle/ResourceRepositoryBundle/DependencyInjection/FSIResourceRepositoryExtensionSpec.php
@@ -54,6 +54,9 @@ function it_should_add_resource_map_parameter_to_container(ContainerBuilder $bui
         $builder->setAlias(ResourceValueRepository::class, Argument::type(Alias::class))->shouldBeCalled();
         $builder->setAlias('fsi_resource_repository.repository', Argument::type(Alias::class))->shouldBeCalled();
         $builder->setAlias(Repository::class, Argument::type(Alias::class))->shouldBeCalled();
+        if (true === method_exists(ContainerBuilder::class, 'removeBindings')) {
+            $builder->removeBindings(Argument::type('string'))->shouldBeCalled();
+        }
 
         $this->load([['db_driver' => 'orm', 'resource_class' => Resource::class]], $builder);
     }

diff --git a/tests/Repository/MapBuilderTest.php b/tests/Repository/MapBuilderTest.php
@@ -16,7 +16,7 @@
 use FSi\Bundle\ResourceRepositoryBundle\Repository\Resource\Type\TextType;
 use PHPUnit\Framework\TestCase;
 
-class MapBuilderTest extends TestCase
+final class MapBuilderTest extends TestCase
 {
     public function testNonExistantMap()
     {