From 28b7be9e7382a6ac95ce638da7a7c1f7e217ae7e Mon Sep 17 00:00:00 2001 From: eduard13 Date: Wed, 20 Jun 2018 23:22:56 +0300 Subject: [PATCH 1/3] [Forward] 2.3 develop PR port 15942 --- .../Magento/Backend/Block/Media/Uploader.php | 19 +++++++++++++++ .../adminhtml/templates/media/uploader.phtml | 4 ++-- .../Wysiwyg/Images/Content/Uploader.php | 6 ++++- .../templates/browser/content/uploader.phtml | 4 ++-- .../MediaStorage/etc/adminhtml/system.xml | 13 ++++++++++ app/code/Magento/MediaStorage/etc/config.xml | 17 +++++++++++++ .../Wysiwyg/Files/Content/Uploader.php | 6 ++++- .../Magento/Framework/File/Uploader.php | 10 -------- .../Framework/Image/Adapter/Config.php | 24 +++++++++++++++++++ .../Image/Adapter/ConfigInterface.php | 10 ++++++++ .../Image/Test/Unit/AdapterFactoryTest.php | 2 +- 11 files changed, 98 insertions(+), 17 deletions(-) create mode 100644 app/code/Magento/MediaStorage/etc/config.xml diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php index 5bad74d8a8be5..1716c4b585a7d 100644 --- a/app/code/Magento/Backend/Block/Media/Uploader.php +++ b/app/code/Magento/Backend/Block/Media/Uploader.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Backend\Block\Media; use Magento\Framework\App\ObjectManager; @@ -30,6 +32,11 @@ class Uploader extends \Magento\Backend\Block\Widget */ protected $_fileSizeService; + /** + * @var \Magento\Framework\Image\Adapter\ConfigInterface + */ + protected $imageConfig; + /** * @var Json */ @@ -44,11 +51,13 @@ class Uploader extends \Magento\Backend\Block\Widget public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Framework\File\Size $fileSize, + \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig, array $data = [], Json $jsonEncoder = null ) { $this->_fileSizeService = $fileSize; $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class); + $this->imageConfig = $imageConfig; parent::__construct($context, $data); } @@ -90,6 +99,16 @@ public function getFileSizeService() return $this->_fileSizeService; } + /** + * Get image config + * + * @return \Magento\Framework\Image\Adapter\ConfigInterface + */ + public function getImageConfigService() + { + return $this->imageConfig; + } + /** * Prepares layout and set element renderer * diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml index 1e14dd837634a..e2509b6c2f13c 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml @@ -13,8 +13,8 @@ data-mage-init='{ "Magento_Backend/js/media-uploader" : { "maxFileSize": getFileSizeService()->getMaxFileSize() ?>, - "maxWidth": , - "maxHeight": + "maxWidth":getImageConfigService()->getMaxWidth() ?> , + "maxHeight": getImageConfigService()->getMaxHeight() ?> } }' > diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php index cf0fc34b217e4..25015edc8fe23 100644 --- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php +++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content; /** @@ -21,17 +23,19 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Framework\File\Size $fileSize + * @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig * @param \Magento\Cms\Model\Wysiwyg\Images\Storage $imagesStorage * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Framework\File\Size $fileSize, + \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig, \Magento\Cms\Model\Wysiwyg\Images\Storage $imagesStorage, array $data = [] ) { $this->_imagesStorage = $imagesStorage; - parent::__construct($context, $fileSize, $data); + parent::__construct($context, $fileSize, $imageConfig, $data); } /** diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml index 097235bc9fb71..99e199cc7665f 100644 --- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml +++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml @@ -147,8 +147,8 @@ require([ maxFileSize: getFileSizeService()->getMaxFileSize() ?> * 10 }, { action: 'resize', - maxWidth: , - maxHeight: + maxWidth: getImageConfigService()->getMaxWidth() ?> , + maxHeight: getImageConfigService()->getMaxHeight() ?> }, { action: 'save' }] diff --git a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml index 09b6b23744053..6bd8765a4ee93 100644 --- a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml +++ b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml @@ -30,6 +30,19 @@ + + + + + validate-zero-or-greater validate-digits + Max allowed width for uploaded image. + + + + validate-zero-or-greater validate-digits + Max allowed height for uploaded image. + + diff --git a/app/code/Magento/MediaStorage/etc/config.xml b/app/code/Magento/MediaStorage/etc/config.xml new file mode 100644 index 0000000000000..e4ee35e83f786 --- /dev/null +++ b/app/code/Magento/MediaStorage/etc/config.xml @@ -0,0 +1,17 @@ + + + + + + + 1920 + 1200 + + + + diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php index 8e7f4c9cc680c..b5e9a2ead5f3a 100644 --- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php +++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php @@ -3,6 +3,8 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ +declare(strict_types=1); + namespace Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content; /** @@ -29,17 +31,19 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Framework\File\Size $fileSize + * @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig * @param \Magento\Theme\Helper\Storage $storageHelper * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Framework\File\Size $fileSize, + \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig, \Magento\Theme\Helper\Storage $storageHelper, array $data = [] ) { $this->_storageHelper = $storageHelper; - parent::__construct($context, $fileSize, $data); + parent::__construct($context, $fileSize, $imageConfig, $data); } /** diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php index 67d7d4bb558ae..ff08c6969af38 100644 --- a/lib/internal/Magento/Framework/File/Uploader.php +++ b/lib/internal/Magento/Framework/File/Uploader.php @@ -132,16 +132,6 @@ class Uploader */ const TMP_NAME_EMPTY = 666; - /** - * Max Image Width resolution in pixels. For image resizing on client side - */ - const MAX_IMAGE_WIDTH = 1920; - - /** - * Max Image Height resolution in pixels. For image resizing on client side - */ - const MAX_IMAGE_HEIGHT = 1200; - /** * Resulting of uploaded file * diff --git a/lib/internal/Magento/Framework/Image/Adapter/Config.php b/lib/internal/Magento/Framework/Image/Adapter/Config.php index ecba84b28bb47..6e91e9c7419a6 100644 --- a/lib/internal/Magento/Framework/Image/Adapter/Config.php +++ b/lib/internal/Magento/Framework/Image/Adapter/Config.php @@ -11,6 +11,10 @@ class Config implements \Magento\Framework\Image\Adapter\ConfigInterface const XML_PATH_IMAGE_ADAPTERS = 'dev/image/adapters'; + const XML_PATH_MAX_WIDTH_IMAGE = 'system/media_configuration/max_width'; + + const XML_PATH_MAX_HEIGHT_IMAGE = 'system/media_configuration/max_height'; + /** * @var \Magento\Framework\App\Config\ScopeConfigInterface */ @@ -43,4 +47,24 @@ public function getAdapters() { return $this->config->getValue(self::XML_PATH_IMAGE_ADAPTERS); } + + /** + * Get Max Image Width resolution in pixels. For image resizing on client side + * + * @return int + */ + public function getMaxWidth() + { + return $this->config->getValue(self::XML_PATH_MAX_WIDTH_IMAGE); + } + + /** + * Get Max Image Height resolution in pixels. For image resizing on client side + * + * @return int + */ + public function getMaxHeight() + { + return $this->config->getValue(self::XML_PATH_MAX_HEIGHT_IMAGE); + } } diff --git a/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php b/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php index dab642b14ac6c..996c0d1263130 100644 --- a/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php +++ b/lib/internal/Magento/Framework/Image/Adapter/ConfigInterface.php @@ -20,4 +20,14 @@ public function getAdapterAlias(); * @return array */ public function getAdapters(); + + /** + * @return int + */ + public function getMaxWidth(); + + /** + * @return int + */ + public function getMaxHeight(); } diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php index 96ec83952939c..d20aba6c38c46 100644 --- a/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php +++ b/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php @@ -18,7 +18,7 @@ protected function setUp() { $this->configMock = $this->createPartialMock( \Magento\Framework\Image\Adapter\ConfigInterface::class, - ['getAdapterAlias', 'getAdapters'] + ['getAdapterAlias', 'getAdapters', 'getMaxWidth', 'getMaxHeight'] ); $this->configMock->expects( From 63a885078cacba88098390158efb45d245bcb31e Mon Sep 17 00:00:00 2001 From: eduard13 Date: Fri, 22 Jun 2018 14:04:51 +0300 Subject: [PATCH 2/3] Refactored the system configs. Passed imageConfig dependency as optional dependency. --- .../Magento/Backend/Block/Media/Uploader.php | 36 +++++++++++++------ .../Magento/Backend/etc/adminhtml/system.xml | 13 +++++++ app/code/Magento/Backend/etc/config.xml | 4 +++ .../adminhtml/templates/media/uploader.phtml | 4 +-- .../templates/browser/content/uploader.phtml | 4 +-- .../MediaStorage/etc/adminhtml/system.xml | 13 ------- app/code/Magento/MediaStorage/etc/config.xml | 17 --------- .../Wysiwyg/Files/Content/Uploader.php | 1 + .../Magento/Framework/File/Uploader.php | 15 ++++++++ .../Framework/Image/Adapter/Config.php | 8 ++--- 10 files changed, 66 insertions(+), 49 deletions(-) delete mode 100644 app/code/Magento/MediaStorage/etc/config.xml diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php index 1716c4b585a7d..5537552c6bdb0 100644 --- a/app/code/Magento/Backend/Block/Media/Uploader.php +++ b/app/code/Magento/Backend/Block/Media/Uploader.php @@ -10,6 +10,8 @@ use Magento\Framework\App\ObjectManager; use Magento\Framework\Serialize\Serializer\Json; +use Magento\Framework\Image\Adapter\ConfigInterface; + /** * Adminhtml media library uploader * @api @@ -33,9 +35,9 @@ class Uploader extends \Magento\Backend\Block\Widget protected $_fileSizeService; /** - * @var \Magento\Framework\Image\Adapter\ConfigInterface - */ - protected $imageConfig; + * @var ConfigInterface + */ + private $imageConfig; /** * @var Json @@ -46,19 +48,21 @@ class Uploader extends \Magento\Backend\Block\Widget * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Framework\File\Size $fileSize * @param array $data + * @param ConfigInterface $imageConfig * @param Json $jsonEncoder */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Framework\File\Size $fileSize, - \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig, array $data = [], + ConfigInterface $imageConfig = null, Json $jsonEncoder = null ) { + parent::__construct($context, $data); + $this->_fileSizeService = $fileSize; $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class); $this->imageConfig = $imageConfig; - parent::__construct($context, $data); } /** @@ -100,13 +104,23 @@ public function getFileSizeService() } /** - * Get image config - * - * @return \Magento\Framework\Image\Adapter\ConfigInterface - */ - public function getImageConfigService() + * Get Image Upload Maximum Width Config + * + * @return int + */ + public function getUploadImageMaxWidth() + { + return $this->imageConfig->getMaxWidth(); + } + + /** + * Get Image Upload Maximum Height Config + * + * @return int + */ + public function getUploadImageMaxHeight() { - return $this->imageConfig; + return $this->imageConfig->getMaxHeight(); } /** diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml index 86a2f3b772d2a..3a72b01e7dd45 100644 --- a/app/code/Magento/Backend/etc/adminhtml/system.xml +++ b/app/code/Magento/Backend/etc/adminhtml/system.xml @@ -335,6 +335,19 @@ + + + + + validate-greater-than-zero validate-number required-entry + Maximum allowed width for uploaded image. + + + + validate-greater-than-zero validate-number required-entry + Maximum allowed height for uploaded image. + +
diff --git a/app/code/Magento/Backend/etc/config.xml b/app/code/Magento/Backend/etc/config.xml index b7aaf8bf20dba..45d283ad3ff22 100644 --- a/app/code/Magento/Backend/etc/config.xml +++ b/app/code/Magento/Backend/etc/config.xml @@ -28,6 +28,10 @@ 1 + + 1920 + 1200 + diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml index e2509b6c2f13c..f2da94e52d05f 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml @@ -13,8 +13,8 @@ data-mage-init='{ "Magento_Backend/js/media-uploader" : { "maxFileSize": getFileSizeService()->getMaxFileSize() ?>, - "maxWidth":getImageConfigService()->getMaxWidth() ?> , - "maxHeight": getImageConfigService()->getMaxHeight() ?> + "maxWidth":getUploadImageMaxWidth() ?> , + "maxHeight": getUploadImageMaxHeight() ?> } }' > diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml index 99e199cc7665f..80848186965f4 100644 --- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml +++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml @@ -147,8 +147,8 @@ require([ maxFileSize: getFileSizeService()->getMaxFileSize() ?> * 10 }, { action: 'resize', - maxWidth: getImageConfigService()->getMaxWidth() ?> , - maxHeight: getImageConfigService()->getMaxHeight() ?> + maxWidth: getUploadImageMaxWidth() ?> , + maxHeight: getUploadImageMaxHeight() ?> }, { action: 'save' }] diff --git a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml index 6bd8765a4ee93..09b6b23744053 100644 --- a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml +++ b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml @@ -30,19 +30,6 @@ - - - - - validate-zero-or-greater validate-digits - Max allowed width for uploaded image. - - - - validate-zero-or-greater validate-digits - Max allowed height for uploaded image. - -
diff --git a/app/code/Magento/MediaStorage/etc/config.xml b/app/code/Magento/MediaStorage/etc/config.xml deleted file mode 100644 index e4ee35e83f786..0000000000000 --- a/app/code/Magento/MediaStorage/etc/config.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - 1920 - 1200 - - - - diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php index b5e9a2ead5f3a..99366d1bf6508 100644 --- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php +++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php @@ -43,6 +43,7 @@ public function __construct( array $data = [] ) { $this->_storageHelper = $storageHelper; + parent::__construct($context, $fileSize, $imageConfig, $data); } diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php index ff08c6969af38..3afe43260fbc0 100644 --- a/lib/internal/Magento/Framework/File/Uploader.php +++ b/lib/internal/Magento/Framework/File/Uploader.php @@ -6,6 +6,7 @@ namespace Magento\Framework\File; use Magento\Framework\Filesystem\DriverInterface; +use Magento\Framework\Image\Adapter\ConfigInterface; /** * File upload class @@ -132,6 +133,20 @@ class Uploader */ const TMP_NAME_EMPTY = 666; + /** + * Maximum Image Width resolution in pixels. For image resizing on client side + * @deprecated + * @see ConfigInterface::getMaxWidth() + */ + const MAX_IMAGE_WIDTH = 1920; + + /** + * Maximum Image Height resolution in pixels. For image resizing on client side + * @deprecated + * @see ConfigInterface::getMaxHeight() + */ + const MAX_IMAGE_HEIGHT = 1200; + /** * Resulting of uploaded file * diff --git a/lib/internal/Magento/Framework/Image/Adapter/Config.php b/lib/internal/Magento/Framework/Image/Adapter/Config.php index 6e91e9c7419a6..212c946f8fecd 100644 --- a/lib/internal/Magento/Framework/Image/Adapter/Config.php +++ b/lib/internal/Magento/Framework/Image/Adapter/Config.php @@ -11,9 +11,9 @@ class Config implements \Magento\Framework\Image\Adapter\ConfigInterface const XML_PATH_IMAGE_ADAPTERS = 'dev/image/adapters'; - const XML_PATH_MAX_WIDTH_IMAGE = 'system/media_configuration/max_width'; + const XML_PATH_MAX_WIDTH_IMAGE = 'system/upload_configuration/max_width'; - const XML_PATH_MAX_HEIGHT_IMAGE = 'system/media_configuration/max_height'; + const XML_PATH_MAX_HEIGHT_IMAGE = 'system/upload_configuration/max_height'; /** * @var \Magento\Framework\App\Config\ScopeConfigInterface @@ -49,7 +49,7 @@ public function getAdapters() } /** - * Get Max Image Width resolution in pixels. For image resizing on client side + * Get Maximum Image Width resolution in pixels. For image resizing on client side * * @return int */ @@ -59,7 +59,7 @@ public function getMaxWidth() } /** - * Get Max Image Height resolution in pixels. For image resizing on client side + * Get Maximum Image Height resolution in pixels. For image resizing on client side * * @return int */ From ced33555681d2768c1f83e46048a23a7d50594a6 Mon Sep 17 00:00:00 2001 From: eduard13 Date: Sat, 30 Jun 2018 17:49:03 +0300 Subject: [PATCH 3/3] Fixed wrong dependencies --- app/code/Magento/Backend/Block/Media/Uploader.php | 3 +-- .../Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php | 4 +--- .../view/adminhtml/templates/browser/content/uploader.phtml | 4 ++-- .../Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php index 5537552c6bdb0..58ab558fa91d0 100644 --- a/app/code/Magento/Backend/Block/Media/Uploader.php +++ b/app/code/Magento/Backend/Block/Media/Uploader.php @@ -9,7 +9,6 @@ use Magento\Framework\App\ObjectManager; use Magento\Framework\Serialize\Serializer\Json; - use Magento\Framework\Image\Adapter\ConfigInterface; /** @@ -61,8 +60,8 @@ public function __construct( parent::__construct($context, $data); $this->_fileSizeService = $fileSize; + $this->imageConfig = $imageConfig?: ObjectManager::getInstance()->get(ConfigInterface::class); $this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class); - $this->imageConfig = $imageConfig; } /** diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php index 25015edc8fe23..883629e463cb5 100644 --- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php +++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php @@ -23,19 +23,17 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Framework\File\Size $fileSize - * @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig * @param \Magento\Cms\Model\Wysiwyg\Images\Storage $imagesStorage * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Framework\File\Size $fileSize, - \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig, \Magento\Cms\Model\Wysiwyg\Images\Storage $imagesStorage, array $data = [] ) { $this->_imagesStorage = $imagesStorage; - parent::__construct($context, $fileSize, $imageConfig, $data); + parent::__construct($context, $fileSize, $data); } /** diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml index 80848186965f4..b1642e27f9f87 100644 --- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml +++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml @@ -147,8 +147,8 @@ require([ maxFileSize: getFileSizeService()->getMaxFileSize() ?> * 10 }, { action: 'resize', - maxWidth: getUploadImageMaxWidth() ?> , - maxHeight: getUploadImageMaxHeight() ?> + maxWidth: getUploadImageMaxWidth() ?> , + maxHeight: getUploadImageMaxHeight() ?> }, { action: 'save' }] diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php index 99366d1bf6508..48a444219949e 100644 --- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php +++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php @@ -31,20 +31,18 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Framework\File\Size $fileSize - * @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig * @param \Magento\Theme\Helper\Storage $storageHelper * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Framework\File\Size $fileSize, - \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig, \Magento\Theme\Helper\Storage $storageHelper, array $data = [] ) { $this->_storageHelper = $storageHelper; - parent::__construct($context, $fileSize, $imageConfig, $data); + parent::__construct($context, $fileSize, $data); } /**