diff --git a/.travis.yml b/.travis.yml index 05a390383..681efa09c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ matrix: env: DB=MYSQL BEHAT_TEST=1 before_script: + - printf "\n" | pecl install imagick - composer self-update || true - phpenv rehash - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support diff --git a/filesystem/GD.php b/filesystem/GD.php index 623923cec..d34704f56 100644 --- a/filesystem/GD.php +++ b/filesystem/GD.php @@ -108,6 +108,7 @@ class GDBackend extends Object implements Image_Backend { /** * @param string $filename + * @param string $manipulation * @return boolean */ public function imageAvailable($filename, $manipulation) { diff --git a/filesystem/ImagickBackend.php b/filesystem/ImagickBackend.php index 3112d8b10..8f302cb24 100644 --- a/filesystem/ImagickBackend.php +++ b/filesystem/ImagickBackend.php @@ -99,9 +99,10 @@ class ImagickBackend extends Imagick implements Image_Backend { * @todo Implement memory checking for Imagick? See {@link GD} * * @param string $filename + * @param string $manipulation * @return boolean */ - public function imageAvailable($filename) { + public function imageAvailable($filename, $manipulation) { return true; } diff --git a/model/Image_Backend.php b/model/Image_Backend.php index 919a916f2..131252c77 100644 --- a/model/Image_Backend.php +++ b/model/Image_Backend.php @@ -115,6 +115,7 @@ interface Image_Backend { * imageAvailable * * @param string $filename + * @param string $manipulation * @return boolean */ public function imageAvailable($filename, $manipulation);