Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

these filters have been deprecated in v2, drop them for v3 #1553

Merged
merged 1 commit into from
Jan 3, 2024
Merged

these filters have been deprecated in v2, drop them for v3 #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)).

Expand Down
60 changes: 0 additions & 60 deletions src/DependencyInjection/Compiler/NonFunctionalFilterExceptionPass.php
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/LiipImagineBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
Expand Down
14 changes: 0 additions & 14 deletions src/Resources/config/imagine.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 1 addition & 3 deletions tests/LiipImagineBundleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -65,7 +64,7 @@ public function testAddPasses(): void
$bundle = new LiipImagineBundle();
$bundle->build($containerMock);

$this->assertCount(8, $passes);
$this->assertCount(7, $passes);

sort($passes);

Expand All @@ -75,7 +74,6 @@ public function testAddPasses(): void
FiltersCompilerPass::class,
LoadersCompilerPass::class,
MetadataReaderCompilerPass::class,
NonFunctionalFilterExceptionPass::class,
PostProcessorsCompilerPass::class,
ResolversCompilerPass::class,
], $passes);
Expand Down
Loading