Merge pull request #4653 from tractorcow/pulls/3.2/imagick

BUG fix imagick interface and add to travis
This commit is contained in:
Ingo Schommer 2015-10-06 15:25:45 +13:00
commit 7ec24a1303
4 changed files with 5 additions and 1 deletions

View File

@ -29,6 +29,7 @@ matrix:
env: DB=MYSQL BEHAT_TEST=1 env: DB=MYSQL BEHAT_TEST=1
before_script: before_script:
- printf "\n" | pecl install imagick
- composer self-update || true - composer self-update || true
- phpenv rehash - phpenv rehash
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support

View File

@ -108,6 +108,7 @@ class GDBackend extends Object implements Image_Backend {
/** /**
* @param string $filename * @param string $filename
* @param string $manipulation
* @return boolean * @return boolean
*/ */
public function imageAvailable($filename, $manipulation) { public function imageAvailable($filename, $manipulation) {

View File

@ -99,9 +99,10 @@ class ImagickBackend extends Imagick implements Image_Backend {
* @todo Implement memory checking for Imagick? See {@link GD} * @todo Implement memory checking for Imagick? See {@link GD}
* *
* @param string $filename * @param string $filename
* @param string $manipulation
* @return boolean * @return boolean
*/ */
public function imageAvailable($filename) { public function imageAvailable($filename, $manipulation) {
return true; return true;
} }

View File

@ -115,6 +115,7 @@ interface Image_Backend {
* imageAvailable * imageAvailable
* *
* @param string $filename * @param string $filename
* @param string $manipulation
* @return boolean * @return boolean
*/ */
public function imageAvailable($filename, $manipulation); public function imageAvailable($filename, $manipulation);