Merge 4.x into 5.x

sonata-project · May 9, 2024 · dd9200b · dd9200b
2 parents c7ec51f + 3711393
commit dd9200b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -21,5 +21,7 @@
                 <referencedMethod name="Symfony\Component\Console\Helper\HelperInterface::ask"/>
             </errorLevel>
         </UndefinedInterfaceMethod>
+        <!-- Until we drop PHP < 8.3 support -->
+        <MissingClassConstType errorLevel="suppress"/>
     </issueHandlers>
 </psalm>
diff --git a/src/Thumbnail/FileThumbnail.php b/src/Thumbnail/FileThumbnail.php
@@ -28,10 +28,6 @@ public function __construct(private Packages $packages)
 
     public function generatePublicUrl(MediaProviderInterface $provider, MediaInterface $media, string $format): string
     {
-        if (MediaProviderInterface::FORMAT_ADMIN !== $format) {
-            throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $format));
-        }
-
         return $this->packages->getUrl('bundles/sonatamedia/file.png');
     }
 

diff --git a/tests/Thumbnail/FileThumbnailTest.php b/tests/Thumbnail/FileThumbnailTest.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sonata\MediaBundle\Tests\Security;
+namespace Sonata\MediaBundle\Tests\Thumbnail;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -47,10 +47,9 @@ public function testGeneratePublicUrl(): void
 
         static::assertSame('bundles/sonatamedia/file.png', $publicUrl);
 
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Unsupported format "random".');
+        $publicUrl = $this->thumbnail->generatePublicUrl($provider, $media, 'random');
 
-        $this->thumbnail->generatePublicUrl($provider, $media, 'random');
+        static::assertSame('bundles/sonatamedia/file.png', $publicUrl);
     }
 
     public function testGeneratePrivateUrl(): void

diff --git a/tests/Thumbnail/FormatThumbnailTest.php b/tests/Thumbnail/FormatThumbnailTest.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sonata\MediaBundle\Tests\Security;
+namespace Sonata\MediaBundle\Tests\Thumbnail;
 
 use Gaufrette\Adapter\InMemory;
 use Gaufrette\File;

diff --git a/tests/Thumbnail/LiipImagineThumbnailTest.php b/tests/Thumbnail/LiipImagineThumbnailTest.php
@@ -11,7 +11,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sonata\MediaBundle\Tests\Security;
+namespace Sonata\MediaBundle\Tests\Thumbnail;
 
 use Gaufrette\Adapter\InMemory;
 use Gaufrette\File;