Add SW 6.6 compatibility

composer.json

@@ -15,7 +15,7 @@
         }
     },
     "require": {
-        "spatie/image-optimizer": "1.3.2"
+        "spatie/image-optimizer": "1.7.2"
     },
     "require-dev": {
         "phpro/grumphp-shim": "^1.3",

src/Command/MediaOptimizeCommand.php

@@ -5,26 +5,30 @@
 namespace RuneLaenen\MediaOptimizer\Command;
 
 use Shopware\Core\Content\Media\MediaEntity;
-use Shopware\Core\Content\Media\Pathname\UrlGeneratorInterface;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\Dbal\Common\RepositoryIterator;
-use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
+use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Spatie\ImageOptimizer\OptimizerChain;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand(
+    name: 'rl:media:optimize',
+    description: 'Optimize media files',
+)]
 class MediaOptimizeCommand extends Command
 {
     protected static $defaultName = 'rl:media:optimize';
 
     /**
-     * @var EntityRepositoryInterface
+     * @var EntityRepository
      */
     private $mediaRepository;
 
@@ -48,26 +52,19 @@ class MediaOptimizeCommand extends Command
      */
     private $sizePost = 0;
 
-    /**
-     * @var UrlGeneratorInterface
-     */
-    private $urlGenerator;
-
     /**
      * @var string
      */
     private $projectDir;
 
     public function __construct(
-        EntityRepositoryInterface $mediaRepository,
+        EntityRepository $mediaRepository,
         OptimizerChain $optimizerChain,
-        UrlGeneratorInterface $urlGenerator,
         string $projectDir
     ) {
         parent::__construct();
         $this->mediaRepository = $mediaRepository;
         $this->optimizerChain = $optimizerChain;
-        $this->urlGenerator = $urlGenerator;
         $this->projectDir = $projectDir;
     }
 
@@ -83,7 +80,7 @@ public function configure(): void
             );
     }
 
-    public function run(InputInterface $input, OutputInterface $output)
+    public function run(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('info')) {
             $optimizers = $this->optimizerChain->getOptimizers();
@@ -157,7 +154,7 @@ private function createCriteria(): Criteria
 
     private function optimize(MediaEntity $media): void
     {
-        $mediaLocation = $this->projectDir . '/public/' . $this->urlGenerator->getRelativeMediaUrl($media);
+        $mediaLocation = $this->projectDir . '/public/' . $media->getPath();
         if (!file_exists($mediaLocation)) {
             return;
         }

src/Resources/config/services.xml

@@ -9,7 +9,6 @@
             <tag name="console.command" />
             <argument type="service" id="media.repository"/>
             <argument type="service" id="Spatie\ImageOptimizer\OptimizerChain"/>
-            <argument type="service" id="Shopware\Core\Content\Media\Pathname\UrlGeneratorInterface"/>
             <argument>%kernel.project_dir%</argument>
         </service>