From a01e47834dad8fbe630b3432f218f306fd414a0a Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Tue, 20 May 2014 21:31:16 +0200 Subject: [PATCH] removed deprecated method --- src/Intervention/Image/Imagick/Encoder.php | 2 +- tests/EncoderTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Intervention/Image/Imagick/Encoder.php b/src/Intervention/Image/Imagick/Encoder.php index 78cf1fed..4a0bb710 100644 --- a/src/Intervention/Image/Imagick/Encoder.php +++ b/src/Intervention/Image/Imagick/Encoder.php @@ -17,7 +17,7 @@ class Encoder extends \Intervention\Image\AbstractEncoder $imagick = $this->image->getCore(); $imagick->setImageBackgroundColor('white'); $imagick->setBackgroundColor('white'); - $imagick = $imagick->flattenImages(); + $imagick = $imagick->mergeImageLayers(\Imagick::LAYERMETHOD_FLATTEN); $imagick->setFormat($format); $imagick->setImageFormat($format); $imagick->setCompression($compression); diff --git a/tests/EncoderTest.php b/tests/EncoderTest.php index b70c6bd0..a9220391 100644 --- a/tests/EncoderTest.php +++ b/tests/EncoderTest.php @@ -142,7 +142,7 @@ class EncoderTest extends PHPUnit_Framework_TestCase $imagick->shouldReceive('setimagecompressionquality'); $imagick->shouldReceive('setimagebackgroundcolor'); $imagick->shouldReceive('setbackgroundcolor'); - $imagick->shouldReceive('flattenimages')->andReturn($imagick); + $imagick->shouldReceive('mergeimagelayers')->andReturn($imagick); $imagick->shouldReceive('__toString')->once()->andReturn(sprintf('mock-%s', $type)); return $imagick; }