Merge branch '7.5'

ezsystems · Jan 20, 2020 · 4b2e990 · 4b2e990
2 parents e71c010 + d59042e
commit 4b2e990
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Imagine/Filter/Loader/ScaleDownOnlyFilterLoader.php b/eZ/Bundle/EzPublishCoreBundle/Imagine/Filter/Loader/ScaleDownOnlyFilterLoader.php
@@ -37,7 +37,7 @@ public function load(ImageInterface $image, array $options = [])
             $image,
             [
                 'size' => $options,
-                'mode' => ImageInterface::THUMBNAIL_INSET,
+                'mode' => 'inset',
             ]
         );
     }

diff --git a/eZ/Bundle/EzPublishCoreBundle/Imagine/Filter/Loader/ScaleHeightDownOnlyFilterLoader.php b/eZ/Bundle/EzPublishCoreBundle/Imagine/Filter/Loader/ScaleHeightDownOnlyFilterLoader.php
@@ -27,7 +27,7 @@ public function load(ImageInterface $image, array $options = [])
             $image,
             [
                 'size' => [null, $options[0]],
-                'mode' => ImageInterface::THUMBNAIL_INSET,
+                'mode' => 'inset',
             ]
         );
     }

diff --git a/eZ/Bundle/EzPublishCoreBundle/Imagine/Filter/Loader/ScaleWidthDownOnlyFilterLoader.php b/eZ/Bundle/EzPublishCoreBundle/Imagine/Filter/Loader/ScaleWidthDownOnlyFilterLoader.php
@@ -27,7 +27,7 @@ public function load(ImageInterface $image, array $options = [])
             $image,
             [
                 'size' => [$options[0], null],
-                'mode' => ImageInterface::THUMBNAIL_INSET,
+                'mode' => 'inset',
             ]
         );
     }

diff --git a/eZ/Bundle/EzPublishCoreBundle/Tests/Imagine/Filter/Loader/ScaleDownOnlyFilterLoaderTest.php b/eZ/Bundle/EzPublishCoreBundle/Tests/Imagine/Filter/Loader/ScaleDownOnlyFilterLoaderTest.php
@@ -55,7 +55,7 @@ public function testLoad()
         $this->innerLoader
             ->expects($this->once())
             ->method('load')
-            ->with($image, $this->equalTo(['size' => $options, 'mode' => ImageInterface::THUMBNAIL_INSET]))
+            ->with($image, $this->equalTo(['size' => $options, 'mode' => 'inset']))
             ->will($this->returnValue($image));
 
         $this->assertSame($image, $this->loader->load($image, $options));

diff --git a/...e/EzPublishCoreBundle/Tests/Imagine/Filter/Loader/ScaleHeightDownOnlyFilterLoaderTest.php b/...e/EzPublishCoreBundle/Tests/Imagine/Filter/Loader/ScaleHeightDownOnlyFilterLoaderTest.php
@@ -43,7 +43,7 @@ public function testLoad()
         $this->innerLoader
             ->expects($this->once())
             ->method('load')
-            ->with($image, $this->equalTo(['size' => [null, $height], 'mode' => ImageInterface::THUMBNAIL_INSET]))
+            ->with($image, $this->equalTo(['size' => [null, $height], 'mode' => 'inset']))
             ->will($this->returnValue($image));
 
         $this->assertSame($image, $this->loader->load($image, [$height]));

diff --git a/...le/EzPublishCoreBundle/Tests/Imagine/Filter/Loader/ScaleWidthDownOnlyFilterLoaderTest.php b/...le/EzPublishCoreBundle/Tests/Imagine/Filter/Loader/ScaleWidthDownOnlyFilterLoaderTest.php
@@ -43,7 +43,7 @@ public function testLoad()
         $this->innerLoader
             ->expects($this->once())
             ->method('load')
-            ->with($image, $this->equalTo(['size' => [$width, null], 'mode' => ImageInterface::THUMBNAIL_INSET]))
+            ->with($image, $this->equalTo(['size' => [$width, null], 'mode' => 'inset']))
             ->will($this->returnValue($image));
 
         $this->assertSame($image, $this->loader->load($image, [$width]));
-Original file line number
+Diff line change
@@ Expand Up @@
                 $image,
                 [
                     'size' => $options,
-                    'mode' => ImageInterface::THUMBNAIL_INSET,
+                    'mode' => 'inset',
                 ]
             );
         }
@@ Expand Down @@