diff --git a/composer.json b/composer.json index 5ca1a91..866c7d8 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ ], "require": { "php": ">=5.5.9", - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", - "guzzlehttp/guzzle": "5.3|~6.0", + "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|6.*", + "guzzlehttp/guzzle": "5.3|~6.0|~7.0", "imagine/imagine": "0.6.*" }, "require-dev": { diff --git a/src/Folklore/Image/ImageManager.php b/src/Folklore/Image/ImageManager.php index 0a24638..4adb86e 100644 --- a/src/Folklore/Image/ImageManager.php +++ b/src/Folklore/Image/ImageManager.php @@ -6,6 +6,7 @@ use Folklore\Image\Exception\FormatException; use Illuminate\Support\Manager; +use Illuminate\Support\Arr; use Imagine\Image\ImageInterface; use Imagine\Image\Box; @@ -226,7 +227,7 @@ public function make($path, $options = array()) public function serve($path, $config = array()) { //Use user supplied quality or the config value - $quality = array_get($config, 'quality', $this->app['config']['image.quality']); + $quality = Arr::get($config, 'quality', $this->app['config']['image.quality']); //if nothing works fallback to the hardcoded value $quality = $quality ?: $this->defaultOptions['quality']; diff --git a/src/Folklore/Image/ImageServe.php b/src/Folklore/Image/ImageServe.php index a49be2f..659f125 100644 --- a/src/Folklore/Image/ImageServe.php +++ b/src/Folklore/Image/ImageServe.php @@ -4,6 +4,8 @@ use Folklore\Image\Exception\Exception; use Folklore\Image\Events\ImageSaved; +use Illuminate\Support\Arr; + class ImageServe { protected $image; @@ -75,7 +77,7 @@ public function response($path) //Get the image content $saveOptions = array(); - $quality = array_get($options, 'quality', $this->config['quality']); + $quality = Arr::get($options, 'quality', $this->config['quality']); if ($format === 'jpeg') { $saveOptions['jpeg_quality'] = $quality; } elseif ($format === 'png') {