Skip to content

Commit 049a575

Browse files
committed
Refactor to pass unit tests
1 parent 97b6b50 commit 049a575

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -628,13 +628,22 @@ public function resizeFile($source, $keepRatio = true)
628628
}
629629
$image = $this->_imageFactory->create();
630630
$image->open($source);
631+
631632
$image->keepAspectRatio($keepRatio);
632-
list($imageWidth, $imageHeight) = getimagesize($source);
633+
634+
list($imageWidth, $imageHeight) = @getimagesize($source);
633635

634-
$image->resize(
635-
$this->_resizeParameters['width'] > $imageWidth ? $imageWidth : $this->_resizeParameters['width'],
636-
$this->_resizeParameters['height'] > $imageHeight ? $imageHeight : $this->_resizeParameters['height']
637-
);
636+
if ($imageWidth && $imageHeight) {
637+
$configWidth = $this->_resizeParameters['width'];
638+
$configHeight = $this->_resizeParameters['height'];
639+
$imageWidth = $configWidth > $imageWidth ? $imageWidth : $this->_resizeParameters['width'];
640+
$imageHeight = $configHeight > $imageHeight ? $imageHeight : $this->_resizeParameters['height'];
641+
} else {
642+
$imageWidth = $this->_resizeParameters['width'];
643+
$imageHeight = $this->_resizeParameters['height'];
644+
}
645+
646+
$image->resize($imageWidth, $imageHeight);
638647
$dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
639648
$image->save($dest);
640649
if ($this->_directory->isFile($this->_directory->getRelativePath($dest))) {

0 commit comments

Comments
 (0)