From 548f7aa3d43162ddaf638c8fd38f652da6a28081 Mon Sep 17 00:00:00 2001 From: Silas Ribas Martins Date: Wed, 16 Oct 2019 00:21:16 -0300 Subject: [PATCH 1/6] Add support to 6.1 and 6.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5ca1a91..2d18737 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ ], "require": { "php": ">=5.5.9", - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|6.1.*|6.2.*", "guzzlehttp/guzzle": "5.3|~6.0", "imagine/imagine": "0.6.*" }, From dc8998ad247603d295d20dcad154bc16170a5fad Mon Sep 17 00:00:00 2001 From: Silas Ribas Martins Date: Wed, 16 Oct 2019 00:58:53 -0300 Subject: [PATCH 2/6] @fix array_get to Arr::get --- src/Folklore/Image/ImageManager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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']; From f0b5c28de61ae8052fc81b94b34ddaf5045b6df0 Mon Sep 17 00:00:00 2001 From: Silas Ribas Martins Date: Wed, 16 Oct 2019 09:50:09 -0300 Subject: [PATCH 3/6] @fix array_get to Arr::get --- src/Folklore/Image/ImageServe.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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') { From 1d6c8d7f65231204705eb131fabc8f618272b0aa Mon Sep 17 00:00:00 2001 From: Silas Ribas Martins Date: Sun, 3 Nov 2019 22:49:34 -0300 Subject: [PATCH 4/6] Add support to 6.3 (realy don't exists) and 6.4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2d18737..1ef3b18 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ ], "require": { "php": ">=5.5.9", - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|6.1.*|6.2.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|6.1.*|6.2.*|6.3.*|6.4.*", "guzzlehttp/guzzle": "5.3|~6.0", "imagine/imagine": "0.6.*" }, From 6ed4c2d22e3b59181c93daee11b942ebcd2a910c Mon Sep 17 00:00:00 2001 From: Silas Ribas Martins Date: Mon, 9 Mar 2020 06:25:30 -0300 Subject: [PATCH 5/6] Guzzle 7 support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1ef3b18..436d42f 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "require": { "php": ">=5.5.9", "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|6.1.*|6.2.*|6.3.*|6.4.*", - "guzzlehttp/guzzle": "5.3|~6.0", + "guzzlehttp/guzzle": "5.3|~6.0|~7.0", "imagine/imagine": "0.6.*" }, "require-dev": { From c8899710f2394e0a38a69dbef9f5dea5339f8ebb Mon Sep 17 00:00:00 2001 From: Silas Ribas Martins Date: Mon, 20 Jul 2020 22:58:03 -0300 Subject: [PATCH 6/6] Update support to all 6.* --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 436d42f..866c7d8 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ ], "require": { "php": ">=5.5.9", - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|6.1.*|6.2.*|6.3.*|6.4.*", + "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.*" },