Merge remote-tracking branch 'mainline/develop' into MAGETWO-44145

Author: Alex Bomko

app/code/Magento/Catalog/Model/Product/Image.php

@@ -332,10 +332,10 @@ public function setSize($size)
         list($width, $height) = explode('x', strtolower($size), 2);
         foreach (['width', 'height'] as $wh) {
             ${$wh}
-            = (int)${$wh};
+                = (int)${$wh};
             if (empty(${$wh})) {
                 ${$wh}
-                = null;
+                    = null;
             }
         }
 
@@ -353,7 +353,8 @@ protected function _checkMemory($file = null)
     {
         return $this->_getMemoryLimit() > $this->_getMemoryUsage() + $this->_getNeedMemoryForFile(
             $file
-        ) || $this->_getMemoryLimit() == -1;
+        )
+        || $this->_getMemoryLimit() == -1;
     }
 
     /**
@@ -939,14 +940,17 @@ protected function _fileExists($filename)
      */
     public function getResizedImageInfo()
     {
+        $fileInfo = null;
         if ($this->_newFile === true) {
-            $fileInfo = getimagesize(
-                $this->_assetRepo->createAsset(
-                    "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
-                )->getSourceFile()
+            $asset = $this->_assetRepo->createAsset(
+                "Magento_Catalog::images/product/placeholder/{$this->getDestinationSubdir()}.jpg"
             );
+            $img = $asset->getSourceFile();
+            $fileInfo = getimagesize($img);
         } else {
-            $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
+            if ($this->_mediaDirectory->isFile($this->_mediaDirectory->getAbsolutePath($this->_newFile))) {
+                $fileInfo = getimagesize($this->_mediaDirectory->getAbsolutePath($this->_newFile));
+            }
         }
         return $fileInfo;
     }

app/code/Magento/ProductVideo/Helper/Media.php

@@ -8,8 +8,6 @@
 
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Helper\Context;
-use Magento\Framework\View\ConfigInterface;
-use Magento\Framework\View\DesignInterface;
 
 /**
  * Helper to get attributes for video
@@ -21,81 +19,37 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      */
     const MODULE_NAME = 'Magento_ProductVideo';
 
-    /**
-     * Video play attribute
-     */
-    const NODE_CONFIG_PLAY_IF_BASE = 'play_if_base';
-
-    /**
-     * Video stop attribute
-     */
-    const NODE_CONFIG_SHOW_RELATED = 'show_related';
-
-    /**
-     * Video color attribute
-     */
-    const NODE_CONFIG_VIDEO_AUTO_RESTART = 'video_auto_restart';
-
-    /**
-     * Media config node
-     */
-    const MEDIA_TYPE_CONFIG_NODE = 'videos';
-
     /**
      * Configuration path
      */
     const XML_PATH_YOUTUBE_API_KEY = 'catalog/product_video/youtube_api_key';
 
     /**
-     * @var ConfigInterface
+     * Configuration path for video play
      */
-    protected $viewConfig;
+    const XML_PATH_PLAY_IF_BASE = 'catalog/product_video/play_if_base';
 
     /**
-     * Theme
-     *
-     * @var DesignInterface
+     * Configuration path for show related
+     */
+    const XML_PATH_SHOW_RELATED = 'catalog/product_video/show_related';
+    /**
+     * Configuration path for video auto restart
      */
-    protected $currentTheme;
+    const XML_PATH_VIDEO_AUTO_RESTART = 'catalog/product_video/video_auto_restart';
 
     /**
-     * Cached video config
+     * Media config node
      */
-    protected $cachedVideoConfig;
+    const MEDIA_TYPE_CONFIG_NODE = 'videos';
 
     /**
-     * @param ConfigInterface $configInterface
-     * @param DesignInterface $designInterface
      * @param Context $context
      */
     public function __construct(
-        ConfigInterface $configInterface,
-        DesignInterface $designInterface,
         Context $context
     ) {
         parent::__construct($context);
-        $this->viewConfig = $configInterface;
-        $this->currentTheme = $designInterface->getDesignTheme();
-        $this->initConfig();
-    }
-
-    /**
-     * Cached video config
-     *
-     * @return $this
-     */
-    protected function initConfig()
-    {
-        if ($this->cachedVideoConfig === null) {
-            $this->cachedVideoConfig = $this->viewConfig->getViewConfig(
-                [
-                    'area' => Area::AREA_FRONTEND,
-                    'themeModel' => $this->currentTheme
-                ]
-            );
-        }
-
-        return $this;
     }
 
     /**
@@ -105,14 +59,7 @@ protected function initConfig()
      */
     public function getPlayIfBaseAttribute()
     {
-        $videoAttributes = $this->cachedVideoConfig->getMediaAttributes(
-            self::MODULE_NAME,
-            self::MEDIA_TYPE_CONFIG_NODE,
-            self::NODE_CONFIG_PLAY_IF_BASE
-        );
-        if (isset($videoAttributes[self::NODE_CONFIG_PLAY_IF_BASE])) {
-            return $videoAttributes[self::NODE_CONFIG_PLAY_IF_BASE];
-        }
+        return $this->scopeConfig->getValue(self::XML_PATH_PLAY_IF_BASE);
     }
 
     /**
@@ -122,14 +69,7 @@ public function getPlayIfBaseAttribute()
      */
     public function getShowRelatedAttribute()
     {
-        $videoAttributes = $this->cachedVideoConfig->getMediaAttributes(
-            self::MODULE_NAME,
-            self::MEDIA_TYPE_CONFIG_NODE,
-            self::NODE_CONFIG_SHOW_RELATED
-        );
-        if (isset($videoAttributes[self::NODE_CONFIG_SHOW_RELATED])) {
-            return $videoAttributes[self::NODE_CONFIG_SHOW_RELATED];
-        }
+        return $this->scopeConfig->getValue(self::XML_PATH_SHOW_RELATED);
     }
 
     /**
@@ -139,14 +79,7 @@ public function getShowRelatedAttribute()
      */
     public function getVideoAutoRestartAttribute()
     {
-        $videoAttributes = $this->cachedVideoConfig->getMediaAttributes(
-            self::MODULE_NAME,
-            self::MEDIA_TYPE_CONFIG_NODE,
-            self::NODE_CONFIG_VIDEO_AUTO_RESTART
-        );
-        if (isset($videoAttributes[self::NODE_CONFIG_VIDEO_AUTO_RESTART])) {
-            return $videoAttributes[self::NODE_CONFIG_VIDEO_AUTO_RESTART];
-        }
+        return $this->scopeConfig->getValue(self::XML_PATH_VIDEO_AUTO_RESTART);
     }
 
     /**