Merge pull request #807 from mlocati/imagick-win-wrong-load-logic

Fix wrong load logic in Imagick
php-imagine · Oct 21, 2021 · d1ef8b0 · d1ef8b0
2 parents 9c09484 + 6fac590
commit d1ef8b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Imagick/Imagine.php b/src/Imagick/Imagine.php
@@ -66,10 +66,10 @@ public function open($path)
             if ($loader->isLocalFile()) {
                 if (DIRECTORY_SEPARATOR === '\\' && PHP_INT_SIZE === 8 && defined('PHP_VERSION_ID') && PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70200) {
                     // Passing the file name to the Imagick constructor may break PHP 7.1 64 bit on Windows - see https://github.com/mkoppanen/imagick/issues/252
-                    $imagick = new \Imagick($loader->getPath());
-                } else {
                     $imagick = new \Imagick();
                     $imagick->readImageBlob($loader->getData(), $path);
+                } else {
+                    $imagick = new \Imagick($path);
                 }
             } else {
                 $imagick = new \Imagick();

diff --git a/tests/tests/Image/AbstractLayersTest.php b/tests/tests/Image/AbstractLayersTest.php
@@ -182,9 +182,6 @@ public function testLayerArrayAccessOutOfBoundsExceptions($offset)
         $layers[$offset] = $secondImage;
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testAnimateEmpty()
     {
         try {
@@ -209,7 +206,6 @@ public function testAnimateEmpty()
 
     /**
      * @dataProvider provideAnimationParameters
-     * @doesNotPerformAssertions
      *
      * @param mixed $delay
      * @param mixed $loops