Merge pull request #1553 from liip/remove-deprecated-filters

these filters have been deprecated in v2, drop them for v3
liip · Jan 3, 2024 · f5dd215 · f5dd215
2 parents ede175c + 671dab9
commit f5dd215
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ for a given releases. Unreleased, upcoming changes will be updated here periodic
 
 ## 3.x (unreleased)
 
+- Removed deprecated code and BC for old Symfony versions.
 - The response when the `filter` parameter in a resolve request is not an array is now 400 bad request, and no longer 404 not found.
 - Simplified the `ProxyResolver` to no longer do the undocumented regex replace logic on domain names (reverting [#687](/~https://github.com/liip/LiipImagineBundle/pull/687)).
 

diff --git a/src/DependencyInjection/Compiler/NonFunctionalFilterExceptionPass.php b/src/DependencyInjection/Compiler/NonFunctionalFilterExceptionPass.php
diff --git a/src/LiipImagineBundle.php b/src/LiipImagineBundle.php
@@ -16,7 +16,6 @@
 use Liip\ImagineBundle\DependencyInjection\Compiler\FiltersCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\LoadersCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\MetadataReaderCompilerPass;
-use Liip\ImagineBundle\DependencyInjection\Compiler\NonFunctionalFilterExceptionPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\PostProcessorsCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\ResolversCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Factory\Loader\ChainLoaderFactory;
@@ -37,7 +36,6 @@ public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
-        $container->addCompilerPass(new NonFunctionalFilterExceptionPass());
         $container->addCompilerPass(new AssetsVersionCompilerPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->addCompilerPass(new DriverCompilerPass());
         $container->addCompilerPass(new LoadersCompilerPass());

diff --git a/src/Resources/config/imagine.xml b/src/Resources/config/imagine.xml
@@ -225,20 +225,6 @@
             <argument>%kernel.project_dir%</argument>
         </service>
 
-        <!-- deprecated -->
-        <!-- not officially deprecated because they are still injected and appear "used" -->
-        <service id="liip_imagine.filter.loader.paste" class="Liip\ImagineBundle\Imagine\Filter\Loader\PasteFilterLoader">
-            <tag name="liip_imagine.filter.loader" loader="paste" />
-            <argument type="service" id="liip_imagine" />
-            <argument>%kernel.root_dir%</argument>
-        </service>
-        <service id="liip_imagine.filter.loader.watermark" class="Liip\ImagineBundle\Imagine\Filter\Loader\WatermarkFilterLoader">
-            <tag name="liip_imagine.filter.loader" loader="watermark" />
-            <argument type="service" id="liip_imagine" />
-            <argument>%kernel.root_dir%</argument>
-        </service>
-        <!-- end deprecated -->
-
         <service id="liip_imagine.filter.loader.watermark_image" class="Liip\ImagineBundle\Imagine\Filter\Loader\WatermarkFilterLoader">
             <tag name="liip_imagine.filter.loader" loader="watermark_image" />
             <argument type="service" id="liip_imagine" />

diff --git a/tests/LiipImagineBundleTest.php b/tests/LiipImagineBundleTest.php
@@ -16,7 +16,6 @@
 use Liip\ImagineBundle\DependencyInjection\Compiler\FiltersCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\LoadersCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\MetadataReaderCompilerPass;
-use Liip\ImagineBundle\DependencyInjection\Compiler\NonFunctionalFilterExceptionPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\PostProcessorsCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Compiler\ResolversCompilerPass;
 use Liip\ImagineBundle\DependencyInjection\Factory\Loader\ChainLoaderFactory;
@@ -65,7 +64,7 @@ public function testAddPasses(): void
         $bundle = new LiipImagineBundle();
         $bundle->build($containerMock);
 
-        $this->assertCount(8, $passes);
+        $this->assertCount(7, $passes);
 
         sort($passes);
 
@@ -75,7 +74,6 @@ public function testAddPasses(): void
             FiltersCompilerPass::class,
             LoadersCompilerPass::class,
             MetadataReaderCompilerPass::class,
-            NonFunctionalFilterExceptionPass::class,
             PostProcessorsCompilerPass::class,
             ResolversCompilerPass::class,
         ], $passes);