Merge 4.x into 5.x

sonata-project · Jul 22, 2023 · b5e897e · b5e897e
2 parents 61fb7d5 + 3d90a22
commit b5e897e
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 26 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -48,10 +48,6 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.2'
-                      dependencies: highest
-                      allowed-to-fail: false
-                      variant: sonata-project/form-extensions:"2.0.0-alpha-1"
                     - php-version: '8.2'
                       dependencies: highest
                       allowed-to-fail: false

diff --git a/src/Block/FeatureMediaBlockService.php b/src/Block/FeatureMediaBlockService.php
@@ -133,7 +133,6 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
         }
 
         $template = $blockContext->getTemplate();
-        \assert(\is_string($template));
 
         return $this->renderResponse($template, [
             'media' => $blockContext->getSetting('mediaId'),

diff --git a/src/Block/GalleryBlockService.php b/src/Block/GalleryBlockService.php
@@ -141,7 +141,6 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
     {
         $gallery = $blockContext->getBlock()->getSetting('galleryId');
         $template = $blockContext->getTemplate();
-        \assert(\is_string($template));
 
         return $this->renderResponse($template, [
             'gallery' => $gallery,

diff --git a/src/Block/GalleryListBlockService.php b/src/Block/GalleryListBlockService.php
@@ -117,7 +117,6 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
         $sortDirection = $blockContext->getSetting('sort');
         \assert(\in_array($sortDirection, ['asc', 'desc'], true));
         $template = $blockContext->getTemplate();
-        \assert(\is_string($template));
 
         return $this->renderResponse($template, [
             'context' => $blockContext,

diff --git a/src/Block/MediaBlockService.php b/src/Block/MediaBlockService.php
@@ -117,7 +117,6 @@ public function execute(BlockContextInterface $blockContext, ?Response $response
         }
 
         $template = $blockContext->getTemplate();
-        \assert(\is_string($template));
 
         return $this->renderResponse($template, [
             'media' => $blockContext->getSetting('mediaId'),

diff --git a/src/Resizer/SimpleResizer.php b/src/Resizer/SimpleResizer.php
@@ -65,11 +65,11 @@ public function getBox(MediaInterface $media, array $settings): Box
         }
 
         if (null === $height) {
-            $height = (int) round($width * $size->getHeight() / $size->getWidth());
+            $height = max((int) round($width * $size->getHeight() / $size->getWidth()), 1);
         }
 
         if (null === $width) {
-            $width = (int) round($height * $size->getWidth() / $size->getHeight());
+            $width = max((int) round($height * $size->getWidth() / $size->getHeight()), 1);
         }
 
         return $this->computeBox($media, $width, $height);

diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -77,9 +77,6 @@ protected function configureRoutes(RoutingConfigurator $routes): void
         $routes->import(__DIR__.'/config/routes.yaml');
     }
 
-    /**
-     * @psalm-suppress DeprecatedClass
-     */
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         $loader->load(__DIR__.'/config/config.yaml');

diff --git a/tests/Block/FeatureMediaBlockServiceTest.php b/tests/Block/FeatureMediaBlockServiceTest.php
@@ -41,9 +41,6 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * @psalm-suppress DeprecatedClass
-     */
     public function testDefaultSettings(): void
     {
         $blockContext = $this->getBlockContext($this->blockService);

diff --git a/tests/Block/GalleryBlockServiceTest.php b/tests/Block/GalleryBlockServiceTest.php
@@ -70,9 +70,6 @@ public function testExecute(): void
         $this->blockService->execute($blockContext);
     }
 
-    /**
-     * @psalm-suppress DeprecatedClass
-     */
     public function testDefaultSettings(): void
     {
         $blockContext = $this->getBlockContext($this->blockService);

diff --git a/tests/Block/MediaBlockServiceTest.php b/tests/Block/MediaBlockServiceTest.php
@@ -77,9 +77,6 @@ public function testExecute(): void
         $this->blockService->execute($blockContext);
     }
 
-    /**
-     * @psalm-suppress DeprecatedClass
-     */
     public function testDefaultSettings(): void
     {
         $blockContext = $this->getBlockContext($this->blockService);

diff --git a/tests/Provider/FileProviderTest.php b/tests/Provider/FileProviderTest.php
@@ -450,21 +450,21 @@ public function testMetadata(): void
     }
 
     /**
-     * @psalm-suppress TooFewArguments, InvalidArgument
+     * @psalm-suppress TooManyArguments, InvalidArgument
      */
     private function createErrorElement(ExecutionContextInterface $executionContext): ErrorElement
     {
         // TODO: Remove if when dropping support for `sonata-project/form-extensions` 2.0.
         if (class_exists(CanonicalizeRuntime::class)) {
+            // @phpstan-ignore-next-line
             return new ErrorElement(
                 '',
-                $this->createStub(ConstraintValidatorFactoryInterface::class),
-                $executionContext,
+                $this->createStub(ConstraintValidatorFactoryInterface::class), // @phpstan-ignore-line
+                $executionContext, // @phpstan-ignore-line
                 'group'
             );
         }
 
-        // @phpstan-ignore-next-line
         return new ErrorElement('', $executionContext, 'group');
     }
 

diff --git a/tests/Resizer/SimpleResizerTest.php b/tests/Resizer/SimpleResizerTest.php
@@ -201,6 +201,26 @@ public static function getBoxSettings(): iterable
             'resizer_options' => [],
         ], new Box(567, 200), new Box(100, 35)];
 
+        yield [ManipulatorInterface::THUMBNAIL_INSET, [
+            'width' => 1,
+            'height' => 1060,
+            'quality' => 80,
+            'format' => 'jpg',
+            'constraint' => true,
+            'resizer' => null,
+            'resizer_options' => [],
+        ], new Box(567, 200), new Box(1, 1)];
+
+        yield [ManipulatorInterface::THUMBNAIL_INSET, [
+            'width' => 1060,
+            'height' => 1,
+            'quality' => 80,
+            'format' => 'jpg',
+            'constraint' => true,
+            'resizer' => null,
+            'resizer_options' => [],
+        ], new Box(567, 200), new Box(3, 1)];
+
         yield [ManipulatorInterface::THUMBNAIL_OUTBOUND, [
             'width' => 90,
             'height' => 90,
@@ -300,5 +320,25 @@ public static function getBoxSettings(): iterable
             'resizer' => null,
             'resizer_options' => [],
         ], new Box(567, 50), new Box(90, 8)];
+
+        yield [ManipulatorInterface::THUMBNAIL_OUTBOUND | ManipulatorInterface::THUMBNAIL_FLAG_UPSCALE, [
+            'width' => 1,
+            'height' => 1060,
+            'quality' => 80,
+            'format' => 'jpg',
+            'constraint' => true,
+            'resizer' => null,
+            'resizer_options' => [],
+        ], new Box(50, 50), new Box(1, 1060)];
+
+        yield [ManipulatorInterface::THUMBNAIL_OUTBOUND | ManipulatorInterface::THUMBNAIL_FLAG_UPSCALE, [
+            'width' => 1060,
+            'height' => 1,
+            'quality' => 80,
+            'format' => 'jpg',
+            'constraint' => true,
+            'resizer' => null,
+            'resizer_options' => [],
+        ], new Box(567, 50), new Box(1060, 1)];
     }
 }