Refactoring the new added system values. Adding validation for system values. Introducing the new methods in block, and removed the injecting image service.

eduard13 · eduard13 · commit 0c8221b8dbb2 · 2018-06-22T14:04:51.000+03:00
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Backend\Block\Media;
 
+use Magento\Framework\Image\Adapter\ConfigInterface;
+
 /**
  * Adminhtml media library uploader
  * @api
@@ -30,25 +32,26 @@ class Uploader extends \Magento\Backend\Block\Widget
     protected $_fileSizeService;
 
     /**
-     * @var \Magento\Framework\Image\Adapter\ConfigInterface
+     * @var ConfigInterface
      */
-    protected $imageConfig;
+    private $imageConfig;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\File\Size $fileSize
-     * @param \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig
+     * @param ConfigInterface $imageConfig
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\File\Size $fileSize,
-        \Magento\Framework\Image\Adapter\ConfigInterface $imageConfig,
+        ConfigInterface $imageConfig,
         array $data = []
     ) {
+        parent::__construct($context, $data);
+
         $this->_fileSizeService = $fileSize;
         $this->imageConfig = $imageConfig;
-        parent::__construct($context, $data);
     }
 
     /**
@@ -90,13 +93,23 @@ public function getFileSizeService()
     }
 
     /**
-     * Get image config
+     * Get Image Upload Maximum Width Config
+     *
+     * @return int
+     */
+    public function getUploadImageMaxWidth()
+    {
+        return $this->imageConfig->getMaxWidth();
+    }
+
+    /**
+     * Get Image Upload Maximum Height Config
      *
-     * @return \Magento\Framework\Image\Adapter\ConfigInterface
+     * @return int
      */
-    public function getImageConfigService()
+    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
@@ -319,6 +319,19 @@
                     </depends>
                 </field>
             </group>
+            <group id="upload_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Images Upload Configuration</label>
+                <field id="max_width" translate="label comment" type="text" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Maximum Width</label>
+                    <validate>validate-greater-than-zero validate-number required-entry</validate>
+                    <comment>Maximum allowed width for uploaded image.</comment>
+                </field>
+                <field id="max_height" translate="label comment" type="text" sortOrder="200" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Maximum Height</label>
+                    <validate>validate-greater-than-zero validate-number required-entry</validate>
+                    <comment>Maximum allowed height for uploaded image.</comment>
+                </field>
+            </group>
         </section>
         <section id="admin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
             <label>Admin</label>
diff --git a/app/code/Magento/Backend/etc/config.xml b/app/code/Magento/Backend/etc/config.xml
@@ -28,6 +28,10 @@
             <dashboard>
                 <enable_charts>1</enable_charts>
             </dashboard>
+            <upload_configuration>
+                <max_width>1920</max_width>
+                <max_height>1200</max_height>
+            </upload_configuration>
         </system>
         <general>
             <validator_data>
diff --git 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": <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?>,
-            "maxWidth":<?= /* @escapeNotVerified */ $block->getImageConfigService()->getMaxWidth() ?> ,
-            "maxHeight": <?= /* @escapeNotVerified */ $block->getImageConfigService()->getMaxHeight() ?>
+            "maxWidth":<?= /* @escapeNotVerified */ $block->getUploadImageMaxWidth() ?> ,
+            "maxHeight": <?= /* @escapeNotVerified */ $block->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
@@ -101,8 +101,8 @@ require([
             maxFileSize: <?= (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10
         }, {
             action: 'resize',
-            maxWidth: <?= (float) $block->getImageConfigService()->getMaxWidth() ?> ,
-            maxHeight: <?= (float) $block->getImageConfigService()->getMaxHeight() ?>
+            maxWidth: <?= $block->getUploadImageMaxWidth()  ?> ,
+            maxHeight: <?= $block->getUploadImageMaxHeight()  ?>
         }, {
             action: 'save'
         }]
diff --git a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
@@ -30,19 +30,6 @@
                     <label>Environment Update Time</label>
                 </field>
             </group>
-            <group id="media_configuration" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Images Upload</label>
-                <field id="max_width" translate="label comment" type="text" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                    <label>Max Width</label>
-                    <validate>validate-zero-or-greater validate-digits</validate>
-                    <comment>Max allowed width for uploaded image.</comment>
-                </field>
-                <field id="max_height" translate="label comment" type="text" sortOrder="200" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
-                    <label>Max Height</label>
-                    <validate>validate-zero-or-greater validate-digits</validate>
-                    <comment>Max allowed height for uploaded image.</comment>
-                </field>
-            </group>
         </section>
     </system>
 </config>
diff --git a/app/code/Magento/MediaStorage/etc/config.xml b/app/code/Magento/MediaStorage/etc/config.xml
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
@@ -43,7 +43,7 @@ public function __construct(
         array $data = []
     ) {
         $this->_storageHelper = $storageHelper;
-        $this->imageConfig = $imageConfig;
+
         parent::__construct($context, $fileSize, $imageConfig, $data);
     }
 
diff --git 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
@@ -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
      */

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`data-mage-init='{`
`14`	`14`	`"Magento_Backend/js/media-uploader" : {`
`15`	`15`	`"maxFileSize": <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?>,`
`16`		`- "maxWidth":<?= /* @escapeNotVerified */ $block->getImageConfigService()->getMaxWidth() ?> ,`
`17`		`- "maxHeight": <?= /* @escapeNotVerified */ $block->getImageConfigService()->getMaxHeight() ?>`
	`16`	`+ "maxWidth":<?= /* @escapeNotVerified */ $block->getUploadImageMaxWidth() ?> ,`
	`17`	`+ "maxHeight": <?= /* @escapeNotVerified */ $block->getUploadImageMaxHeight() ?>`
`18`	`18`	`}`
`19`	`19`	`}'`
`20`	`20`	`>`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(`
`43`	`43`	`array $data = []`
`44`	`44`	`) {`
`45`	`45`	`$this->_storageHelper = $storageHelper;`
`46`		`- $this->imageConfig = $imageConfig;`
	`46`	`+`
`47`	`47`	`parent::__construct($context, $fileSize, $imageConfig, $data);`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ class Config implements \Magento\Framework\Image\Adapter\ConfigInterface`
`11`	`11`
`12`	`12`	`const XML_PATH_IMAGE_ADAPTERS = 'dev/image/adapters';`
`13`	`13`
`14`		`- const XML_PATH_MAX_WIDTH_IMAGE = 'system/media_configuration/max_width';`
	`14`	`+ const XML_PATH_MAX_WIDTH_IMAGE = 'system/upload_configuration/max_width';`
`15`	`15`
`16`		`- const XML_PATH_MAX_HEIGHT_IMAGE = 'system/media_configuration/max_height';`
	`16`	`+ const XML_PATH_MAX_HEIGHT_IMAGE = 'system/upload_configuration/max_height';`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @var \Magento\Framework\App\Config\ScopeConfigInterface`
`@@ -49,7 +49,7 @@ public function getAdapters()`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * Get Max Image Width resolution in pixels. For image resizing on client side`
	`52`	`+ * Get Maximum Image Width resolution in pixels. For image resizing on client side`
`53`	`53`	`*`
`54`	`54`	`* @return int`
`55`	`55`	`*/`
`@@ -59,7 +59,7 @@ public function getMaxWidth()`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`62`		`- * Get Max Image Height resolution in pixels. For image resizing on client side`
	`62`	`+ * Get Maximum Image Height resolution in pixels. For image resizing on client side`
`63`	`63`	`*`
`64`	`64`	`* @return int`
`65`	`65`	`*/`