Skip to content

Removed fileinfo extension dependency from CMS module #29671

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
magento-engcom-team merged 10 commits into from
Sep 19, 2020
Merged

Removed fileinfo extension dependency from CMS module #29671

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8344b11
Removed fileinfo extension dependency from CMS module
konarshankar07 Aug 19, 2020
8da5e70
Fixed Static tests
konarshankar07 Aug 19, 2020
d312ab5
Moved mime optional parameter at the end of parameter list
konarshankar07 Aug 20, 2020
f7503ea
fix static
engcom-Charlie Aug 27, 2020
c09a261
Cover changes with Integration test
konarshankar07 Sep 3, 2020
1209868
Merge branch 'removed-dependency-for-fileinfo-ext' of https://github.…
konarshankar07 Sep 3, 2020
60c0163
Fixed Integration test
konarshankar07 Sep 4, 2020
21f1eb3
Improved integration test
konarshankar07 Sep 7, 2020
0cf0e09
Fixed file validation error
konarshankar07 Sep 10, 2020
09bd902
Changes covered with Unit test
konarshankar07 Sep 14, 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
17 changes: 13 additions & 4 deletions app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*
* @api
* @since 100.0.2
Expand Down Expand Up @@ -152,6 +153,11 @@ class Storage extends \Magento\Framework\DataObject
*/
private $ioFile;

/**
* @var \Magento\Framework\File\Mime|null
*/
private $mime;

/**
* Construct
*
Expand All @@ -173,6 +179,7 @@ class Storage extends \Magento\Framework\DataObject
* @param array $data
* @param \Magento\Framework\Filesystem\DriverInterface $file
* @param \Magento\Framework\Filesystem\Io\File|null $ioFile
* @param \Magento\Framework\File\Mime $mime
* @param \Psr\Log\LoggerInterface|null $logger
*
* @throws \Magento\Framework\Exception\FileSystemException
Expand All @@ -197,6 +204,7 @@ public function __construct(
array $data = [],
\Magento\Framework\Filesystem\DriverInterface $file = null,
\Magento\Framework\Filesystem\Io\File $ioFile = null,
\Magento\Framework\File\Mime $mime = null,
\Psr\Log\LoggerInterface $logger = null
) {
$this->_session = $session;
Expand All @@ -217,6 +225,7 @@ public function __construct(
$this->_dirs = $dirs;
$this->file = $file ?: ObjectManager::getInstance()->get(\Magento\Framework\Filesystem\Driver\File::class);
$this->ioFile = $ioFile ?: ObjectManager::getInstance()->get(\Magento\Framework\Filesystem\Io\File::class);
$this->mime = $mime ?: ObjectManager::getInstance()->get(\Magento\Framework\File\Mime::class);
parent::__construct($data);
}

Expand Down Expand Up @@ -362,7 +371,7 @@ public function getFilesCollection($path, $type = null)
$item->setUrl($this->_cmsWysiwygImages->getCurrentUrl() . $item->getBasename());
$itemStats = $this->file->stat($item->getFilename());
$item->setSize($itemStats['size']);
$item->setMimeType(\mime_content_type($item->getFilename()));
$item->setMimeType($this->mime->getMimeType($item->getFilename()));

if ($this->isImage($item->getBasename())) {
$thumbUrl = $this->getThumbnailUrl($item->getFilename(), true);
Expand Down Expand Up @@ -647,7 +656,7 @@ public function resizeFile($source, $keepRatio = true)
$image->keepAspectRatio($keepRatio);

list($imageWidth, $imageHeight) = $this->getResizedParams($source);

$image->resize($imageWidth, $imageHeight);
$dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
$image->save($dest);
Expand All @@ -670,7 +679,7 @@ private function getResizedParams(string $source): array

//phpcs:ignore Generic.PHP.NoSilencedErrors
list($imageWidth, $imageHeight) = @getimagesize($source);

if ($imageWidth && $imageHeight) {
$imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
$imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
Expand All @@ -679,7 +688,7 @@ private function getResizedParams(string $source): array
}
return [$configWidth, $configHeight];
}

/**
* Resize images on the fly in controller action
*
Expand Down