From 5ffb19451b193efec610eb4e2e28d68a8811ff5f Mon Sep 17 00:00:00 2001 From: "M. Vondano" Date: Sun, 27 Sep 2020 17:10:22 +0200 Subject: [PATCH] add contao.image.resizer to studio locator --- core-bundle/src/Image/Studio/ImageResult.php | 6 ++++++ core-bundle/src/Image/Studio/Studio.php | 2 ++ core-bundle/src/Resources/config/services.yml | 1 + core-bundle/tests/Image/Studio/StudioTest.php | 2 ++ 4 files changed, 11 insertions(+) diff --git a/core-bundle/src/Image/Studio/ImageResult.php b/core-bundle/src/Image/Studio/ImageResult.php index 23aef0dd36e..4eae56e1a04 100644 --- a/core-bundle/src/Image/Studio/ImageResult.php +++ b/core-bundle/src/Image/Studio/ImageResult.php @@ -18,6 +18,7 @@ use Contao\Image\ImageInterface; use Contao\Image\PictureConfiguration; use Contao\Image\PictureInterface; +use Contao\Image\ResizerInterface; use Psr\Container\ContainerInterface; use Webmozart\PathUtil\Path; @@ -152,6 +153,11 @@ private function pictureFactory(): PictureFactoryInterface return $this->locator->get('contao.image.picture_factory'); } + private function resizer(): ResizerInterface + { + return $this->locator->get('contao.image.resizer'); + } + private function staticUrl(): string { return $this->locator->get('contao.assets.files_context')->getStaticUrl(); diff --git a/core-bundle/src/Image/Studio/Studio.php b/core-bundle/src/Image/Studio/Studio.php index 46e3a05625f..11d49602e52 100644 --- a/core-bundle/src/Image/Studio/Studio.php +++ b/core-bundle/src/Image/Studio/Studio.php @@ -18,6 +18,7 @@ use Contao\CoreBundle\Image\PictureFactoryInterface; use Contao\Image\ImageInterface; use Contao\Image\PictureConfiguration; +use Contao\Image\ResizerInterface; use Psr\Container\ContainerInterface; use Symfony\Contracts\Service\ServiceSubscriberInterface; @@ -79,6 +80,7 @@ public static function getSubscribedServices(): array self::class, 'contao.image.picture_factory' => PictureFactoryInterface::class, 'contao.image.image_factory' => ImageFactoryInterface::class, + 'contao.image.resizer' => ResizerInterface::class, 'contao.assets.files_context' => ContaoContext::class, 'contao.framework' => ContaoFramework::class, ]; diff --git a/core-bundle/src/Resources/config/services.yml b/core-bundle/src/Resources/config/services.yml index 08011151261..6b25c6c0107 100644 --- a/core-bundle/src/Resources/config/services.yml +++ b/core-bundle/src/Resources/config/services.yml @@ -351,6 +351,7 @@ services: public: true tags: - { name: container.service_subscriber, id: contao.assets.files_context } + - { name: container.service_subscriber, id: contao.image.resizer } Contao\CoreBundle\Mailer\AvailableTransports: arguments: diff --git a/core-bundle/tests/Image/Studio/StudioTest.php b/core-bundle/tests/Image/Studio/StudioTest.php index 391a4b4f4ea..74c7ed33907 100644 --- a/core-bundle/tests/Image/Studio/StudioTest.php +++ b/core-bundle/tests/Image/Studio/StudioTest.php @@ -18,6 +18,7 @@ use Contao\CoreBundle\Image\PictureFactoryInterface; use Contao\CoreBundle\Image\Studio\Studio; use Contao\CoreBundle\Tests\TestCase; +use Contao\Image\ResizerInterface; use PHPUnit\Framework\MockObject\MockObject; use Psr\Container\ContainerInterface; use Symfony\Contracts\Service\ServiceSubscriberInterface; @@ -39,6 +40,7 @@ public function testSubscribedServices(): void Studio::class, PictureFactoryInterface::class, ImageFactoryInterface::class, + ResizerInterface::class, ContaoFramework::class, ContaoContext::class, ];