Skip to content

Replace boolean cast to be able to disable frame, aspect ratio, trans… #7262

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

Merged
merged 2 commits into from
Mar 23, 2017
Merged

Replace boolean cast to be able to disable frame, aspect ratio, trans… #7262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed946c0
Replace boolean cast to be able to disable frame, aspect ratio, trans…
joost-florijn-kega Nov 1, 2016
1bbcff4
Replace filter_var to make the intention of the code clearer
joost-florijn-kega Nov 2, 2016
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
8 changes: 4 additions & 4 deletions app/code/Magento/Catalog/Model/Product/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public function getQuality()
*/
public function setKeepAspectRatio($keep)
{
$this->_keepAspectRatio = (bool)$keep;
$this->_keepAspectRatio = $keep && $keep !== 'false';
Copy link

@eldonbite eldonbite Jan 8, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Actually, you could probably just do a json_decode($keep) here..

Copy link
Contributor

Choose a reason for hiding this comment

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

Even if json_decode works it would be much slower and much less clear.

Copy link

Choose a reason for hiding this comment

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

Yeah, point well-taken 👍

return $this;
}

Expand All @@ -288,7 +288,7 @@ public function setKeepAspectRatio($keep)
*/
public function setKeepFrame($keep)
{
$this->_keepFrame = (bool)$keep;
$this->_keepFrame = $keep && $keep !== 'false';
return $this;
}

Expand All @@ -298,7 +298,7 @@ public function setKeepFrame($keep)
*/
public function setKeepTransparency($keep)
{
$this->_keepTransparency = (bool)$keep;
$this->_keepTransparency = $keep && $keep !== 'false';
return $this;
}

Expand All @@ -308,7 +308,7 @@ public function setKeepTransparency($keep)
*/
public function setConstrainOnly($flag)
{
$this->_constrainOnly = (bool)$flag;
$this->_constrainOnly = $flag && $flag !== 'false';
return $this;
}

Expand Down