Merge branch '4.5'

ibexa · Aug 21, 2023 · 7121bf0 · 7121bf0
2 parents e47eff4 + 35cbf06
commit 7121bf0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/src/lib/FieldType/Image/ImageStorage.php b/src/lib/FieldType/Image/ImageStorage.php
@@ -11,7 +11,6 @@
 use Ibexa\Contracts\Core\Persistence\Content\Field;
 use Ibexa\Contracts\Core\Persistence\Content\VersionInfo;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
-use Ibexa\Core\Base\Utils\DeprecationWarnerInterface as DeprecationWarner;
 use Ibexa\Core\IO\FilePathNormalizerInterface;
 use Ibexa\Core\IO\IOServiceInterface;
 use Ibexa\Core\IO\MetadataHandler;
@@ -30,9 +29,6 @@ class ImageStorage extends GatewayBasedStorage
     /** @var \Ibexa\Core\IO\MetadataHandler */
     protected $imageSizeMetadataHandler;
 
-    /** @var \Ibexa\Core\Base\Utils\DeprecationWarnerInterface */
-    private $deprecationWarner;
-
     /** @var \Ibexa\Core\FieldType\Image\AliasCleanerInterface */
     protected $aliasCleaner;
 
@@ -47,15 +43,13 @@ public function __construct(
         IOServiceInterface $ioService,
         PathGenerator $pathGenerator,
         MetadataHandler $imageSizeMetadataHandler,
-        DeprecationWarner $deprecationWarner,
         AliasCleanerInterface $aliasCleaner,
         FilePathNormalizerInterface $filePathNormalizer
     ) {
         parent::__construct($gateway);
         $this->ioService = $ioService;
         $this->pathGenerator = $pathGenerator;
         $this->imageSizeMetadataHandler = $imageSizeMetadataHandler;
-        $this->deprecationWarner = $deprecationWarner;
         $this->aliasCleaner = $aliasCleaner;
         $this->filePathNormalizer = $filePathNormalizer;
     }

diff --git a/src/lib/Resources/settings/fieldtype_external_storages.yml b/src/lib/Resources/settings/fieldtype_external_storages.yml
@@ -16,7 +16,6 @@ services:
             $ioService: '@Ibexa\Core\FieldType\Image\IO\Legacy'
             $pathGenerator: '@Ibexa\Core\FieldType\Image\PathGenerator\LegacyPathGenerator'
             $imageSizeMetadataHandler: '@Ibexa\Core\IO\MetadataHandler\ImageSize'
-            $deprecationWarner: '@Ibexa\Core\Base\Utils\DeprecationWarner'
             $aliasCleaner: '@Ibexa\Core\FieldType\Image\AliasCleanerInterface'
             $filePathNormalizer: '@Ibexa\Core\IO\FilePathNormalizerInterface'
         tags:

diff --git a/tests/integration/Core/Image/ImageStorage/ImageStorageTest.php b/tests/integration/Core/Image/ImageStorage/ImageStorageTest.php
@@ -12,7 +12,6 @@
 use Ibexa\Contracts\Core\Persistence\Content\FieldValue;
 use Ibexa\Contracts\Core\Persistence\Content\VersionInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
-use Ibexa\Core\Base\Utils\DeprecationWarnerInterface;
 use Ibexa\Core\FieldType\Image\AliasCleanerInterface;
 use Ibexa\Core\FieldType\Image\ImageStorage;
 use Ibexa\Core\FieldType\Image\ImageStorage\Gateway\DoctrineStorage;
@@ -39,9 +38,6 @@ final class ImageStorageTest extends BaseCoreFieldTypeIntegrationTest
     /** @var \Ibexa\Core\FieldType\Image\PathGenerator|\PHPUnit\Framework\MockObject\MockObject */
     private $pathGenerator;
 
-    /** @var \Ibexa\Core\Base\Utils\DeprecationWarnerInterface|\PHPUnit\Framework\MockObject\MockObject */
-    private $deprecationWarner;
-
     /** @var \Ibexa\Core\FieldType\Image\AliasCleanerInterface|\PHPUnit\Framework\MockObject\MockObject */
     private $aliasCleaner;
 
@@ -62,7 +58,6 @@ protected function setUp(): void
         $this->gateway = new DoctrineStorage($this->redecorator, $this->getDatabaseConnection());
         $this->imageSizeMetadataHandler = $this->createMock(MetadataHandler::class);
         $this->pathGenerator = $this->createMock(PathGenerator::class);
-        $this->deprecationWarner = $this->createMock(DeprecationWarnerInterface::class);
         $this->aliasCleaner = $this->createMock(AliasCleanerInterface::class);
         $this->filePathNormalizer = $this->createMock(FilePathNormalizerInterface::class);
         $this->ioService = $this->createMock(IOServiceInterface::class);
@@ -71,7 +66,6 @@ protected function setUp(): void
             $this->ioService,
             $this->pathGenerator,
             $this->imageSizeMetadataHandler,
-            $this->deprecationWarner,
             $this->aliasCleaner,
             $this->filePathNormalizer,
         );