Skip to content

Add support to 6.1 and 6.2 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add support to 6.1 and 6.2 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
548f7aa
Add support to 6.1 and 6.2
silasrm Oct 16, 2019
dc8998a
@fix array_get to Arr::get
silasrm Oct 16, 2019
f0b5c28
@fix array_get to Arr::get
silasrm Oct 16, 2019
1d6c8d7
Add support to 6.3 (realy don't exists) and 6.4
silasrm Nov 4, 2019
6ed4c2d
Guzzle 7 support
silasrm Mar 9, 2020
c889971
Update support to all 6.*
silasrm Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 2 additions & 1 deletion src/Folklore/Image/ImageManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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'];

Expand Down
4 changes: 3 additions & 1 deletion src/Folklore/Image/ImageServe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
use Folklore\Image\Exception\Exception;
use Folklore\Image\Events\ImageSaved;

use Illuminate\Support\Arr;

class ImageServe
{
protected $image;
Expand Down Expand Up @@ -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') {
Expand Down