Merge pull request #229 from rdohms/task/widen-dms-filter

Allow v4 of DMS filter
rdohms · Jul 28, 2021 · 4cba66c · 4cba66c
2 parents 1d7949d + 3fd975c
commit 4cba66c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
 
     "require": {
         "php":  "^7.4 || ^8.0",
-        "dms/dms-filter": "^2.0 | ^3.0",
+        "dms/dms-filter": "^2.0 | ^3.0 | ^4.0",
         "symfony/config": "^5.0",
         "symfony/yaml": "^5.0",
         "symfony/framework-bundle": "^5.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/DMS/Bundle/FilterBundle/Loader/ContainerAwareLoader.php b/src/DMS/Bundle/FilterBundle/Loader/ContainerAwareLoader.php
@@ -27,7 +27,7 @@ public function setContainer(?ContainerInterface $container = null): void
      *
      * @throws UnexpectedValueException
      */
-    public function getFilterForRule(Rule $rule)
+    public function getFilterForRule(Rule $rule): BaseFilter
     {
         $filterIdentifier = $rule->getFilter();
 

diff --git a/src/DMS/Bundle/FilterBundle/Tests/Loader/ContainerAwareLoaderTest.php b/src/DMS/Bundle/FilterBundle/Tests/Loader/ContainerAwareLoaderTest.php
@@ -8,7 +8,6 @@
 use DMS\Filter\Rules\StripTags;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use stdClass;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class ContainerAwareLoaderTest extends TestCase
@@ -20,11 +19,11 @@ class ContainerAwareLoaderTest extends TestCase
     public function testGetFilterForRule(): void
     {
         $this->container->expects($this->once())->method('has')->will($this->returnValue(true));
-        $this->container->expects($this->once())->method('get')->will($this->returnValue(new stdClass()));
+        $this->container->expects($this->once())->method('get')->will($this->returnValue(new StripTagsFilter()));
 
         $filter = $this->loader->getFilterForRule(new StripTags());
 
-        $this->assertInstanceOf(stdClass::class, $filter);
+        $this->assertInstanceOf(StripTagsFilter::class, $filter);
     }
 
     public function testGetFilterForRuleCascade(): void