Merge 3.x into master

sonata-project · Dec 8, 2019 · 574dfa5 · 574dfa5
2 parents 3ab096f + f37b5a6
commit 574dfa5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.56.1](https://github.com/sonata-project/SonataAdminBundle/compare/3.56.0...3.56.1) - 2019-12-07
+### Fixed
+- Ability of using string names and FQCNs to define filter types
+
 ## [3.56.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.55.0...3.56.0) - 2019-12-05
 ### Fixed
 -  compatibility with `doctrine/doctrine-bundle` 2

diff --git a/src/DependencyInjection/Compiler/AddFilterTypeCompilerPass.php b/src/DependencyInjection/Compiler/AddFilterTypeCompilerPass.php
@@ -35,6 +35,11 @@ public function process(ContainerBuilder $container): void
             $serviceDefinition->setPublic(true); // Temporary fix until we can support service locators
 
             $types[$serviceDefinition->getClass()] = $id;
+
+            // NEXT_MAJOR: Remove this loop, only FQCN will be supported
+            foreach ($attributes as $eachTag) {
+                $types[$eachTag['alias']] = $id;
+            }
         }
 
         $definition->replaceArgument(1, $types);

diff --git a/tests/DependencyInjection/Compiler/AddFilterTypeCompilerPassTest.php b/tests/DependencyInjection/Compiler/AddFilterTypeCompilerPassTest.php
@@ -71,7 +71,9 @@ public function testProcess(): void
         $this->filterFactory->expects($this->once())
             ->method('replaceArgument')
             ->with(1, $this->equalTo([
+                'foo_filter_alias' => 'acme.demo.foo_filter',
                 'Acme\Filter\FooFilter' => 'acme.demo.foo_filter',
+                'bar_filter_alias' => 'acme.demo.bar_filter',
                 'Acme\Filter\BarFilter' => 'acme.demo.bar_filter',
             ]));