Skip to content

image presets can now be arrays #2150

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
mumnik wants to merge 3 commits into
base: 1.9/develop
Choose a base branch
from
Open

image presets can now be arrays #2150

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bc4c9b
image presets can now be arrays
mumnik Oct 9, 2020
6a12f85
added multilevel image config example
mumnik Oct 10, 2020
1362056
fixed array code styling
mumnik Oct 20, 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 classes/image/driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ public function config($index = null, $value = null)
public function preset($name)
{
$vars = func_get_args();
if (isset($this->config['presets'][$name]))
if (\Arr::get($this->config['presets'], $name))
{
$old_config = $this->config;
$this->config = array_merge($this->config, $this->config['presets'][$name]);
$this->config = array_merge($this->config, \Arr::get($this->config['presets'], $name));
foreach ($this->config['actions'] AS $action)
{
$func = $action[0];
Expand Down
39 changes: 28 additions & 11 deletions config/image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*
*/

return array(

@WanWizard WanWizard Oct 14, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coding standards, no short array notation please.

return [
/**
* -------------------------------------------------------------------------
* Driver
Expand Down Expand Up @@ -167,16 +167,33 @@
*
* Example:
*
* 'example' => array(
* 'example' => [
* 'quality' => 100,
* 'bgcolor' => null,
* 'actions' => array(
* array('crop_resize', 200, 200),
* array('border', 20, "#f00"),
* array('rounded', 10),
* array('output', 'png')
* )
* )
* 'actions' => [
* ['crop_resize', 200, 200],
* ['border', 20, "#f00"],
* ['rounded', 10],
* ['output', 'png']
* ]
* ],
* 'example_multilevel' => [
* 'thumbnail' => [
* 'quality' => 100,
* 'bgcolor' => null,
* 'actions' => [
* ['crop_resize', 175, 175]
* ]
* ],
* 'preview' => [
* 'quality' => 100,
* 'bgcolor' => null,
* 'actions' => [
* ['crop_resize', 200, 400]
* ]
* ]
* ]
*
*
* [!] WARNING:
*
Expand All @@ -185,5 +202,5 @@
*
*/

'presets' => array(),
);
'presets' => [],
];