Merge branch 'PR4' into product-video-PR4

Author: Igor Miniailo

app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php

@@ -72,12 +72,13 @@ public function __construct(
      */
     public function execute()
     {
+        $baseTmpMediaPath = $this->mediaConfig->getBaseTmpMediaPath();
         try {
             $remoteFileUrl = $this->getRequest()->getParam('remote_image');
-            $originalFileName = $this->parseOriginalFileName($remoteFileUrl);
-            $localFileName = $this->localFileName($originalFileName);
-            $localTmpFileName = $this->generateTmpFileName($localFileName);
-            $localFileMediaPath = $this->appendFileSystemPath($localTmpFileName);
+            $originalFileName = basename($remoteFileUrl);
+            $localFileName = Uploader::getCorrectFileName($originalFileName);
+            $localTmpFileName = Uploader::getDispretionPath($localFileName) . DIRECTORY_SEPARATOR . $localFileName;
+            $localFileMediaPath = $baseTmpMediaPath . ($localTmpFileName);
             $localUniqueFileMediaPath = $this->appendNewFileName($localFileMediaPath);
             $this->retrieveRemoteImage($remoteFileUrl, $localUniqueFileMediaPath);
             $localFileFullPath = $this->appendAbsoluteFileSystemPath($localUniqueFileMediaPath);
@@ -101,7 +102,7 @@ public function execute()
     protected function appendResultSaveRemoteImage($fileName)
     {
         $fileInfo = pathinfo($fileName);
-        $tmpFileName = $this->generateTmpFileName($fileInfo['basename']);
+        $tmpFileName = Uploader::getDispretionPath($fileInfo['basename']) . DIRECTORY_SEPARATOR . $fileInfo['basename'];
         $result['name'] = $fileInfo['basename'];
         $result['type'] = $this->imageAdapter->getMimeType();
         $result['error'] = 0;
@@ -111,16 +112,6 @@ protected function appendResultSaveRemoteImage($fileName)
         return $result;
     }
 
-    /**
-     * @param string $fileName
-     * @return string
-     */
-    protected function localFileName($fileName)
-    {
-        $fileName = Uploader::getCorrectFileName($fileName);
-        return $fileName;
-    }
-
     /**
      * @param string $fileUrl
      * @param string $localFilePath
@@ -152,43 +143,6 @@ protected function appendNewFileName($localFilePath)
         return $fileInfo['dirname'] . DIRECTORY_SEPARATOR . $fileName;
     }
 
-    /**
-     * @param string $fileUrl
-     * @return string
-     */
-    protected function parseOriginalFileName($fileUrl)
-    {
-        return basename($fileUrl);
-    }
-
-    /**
-     * @param string $fileName
-     * @return string
-     */
-    protected function generateTmpFileName($fileName)
-    {
-        return Uploader::getDispretionPath($fileName) . DIRECTORY_SEPARATOR . $fileName;
-    }
-
-    /**
-     * @param string $fileName
-     * @return string
-     */
-    protected function generateFileNameWithPath($fileName)
-    {
-        return Uploader::getDispretionPath($fileName) . DIRECTORY_SEPARATOR . $fileName;
-    }
-
-    /**
-     * @param string $localTmpFile
-     * @return string
-     */
-    protected function appendFileSystemPath($localTmpFile)
-    {
-        $pathToSave = $this->mediaConfig->getBaseTmpMediaPath();
-        return $pathToSave . $localTmpFile;
-    }
-
     /**
      * @param string $localTmpFile
      * @return string

app/code/Magento/ProductVideo/Setup/UpgradeData.php

@@ -53,7 +53,9 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
                 $attributeSetId,
                 'Image Management'
             );
-            if (isset($attributeGroup['attribute_group_name']) && $attributeGroup['attribute_group_name'] == 'Image Management') {
+            if (isset($attributeGroup['attribute_group_name'])
+                && $attributeGroup['attribute_group_name'] == 'Image Management'
+            ) {
                 // update General Group
                 $categorySetup->updateAttributeGroup(
                     $entityTypeId,

app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js

@@ -467,7 +467,7 @@ define([
                 name: 'product[media_gallery][images][' + newImageId + '][save_data_from]'
             }).val(key);
 
-            oldNewFilePosition = parseInt(tmpOldImage.position);
+            oldNewFilePosition = parseInt(tmpOldImage.position, 10);
             imageData.position = oldNewFilePosition;
 
             $(this._imageWidgetSelector).trigger('setPosition', {

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

@@ -142,8 +142,7 @@ define([
                 dataUrl,
                 tmpVideoData,
                 tmpInputData,
-                i,
-                iPlace;
+                i;
 
             if (isJSON) {
                 inputData = $.parseJSON(inputData);
@@ -172,14 +171,14 @@ define([
                     tmpVideoData.id = dataUrl.id;
                     tmpVideoData.provider = dataUrl.type;
                 }
-                iPlace = i + 1;
+
                 if (tmpVideoData.isBase) {
                     videoData.unshift(tmpVideoData);
-                    continue;
+                } else {
+                    videoData.push(tmpVideoData);
                 }
-
-                videoData.push(tmpVideoData);
             }
+
             return videoData;
         },
 

lib/internal/Magento/Framework/Config/View.php

@@ -27,11 +27,6 @@ class View extends \Magento\Framework\Config\AbstractXml
      */
     protected $xpath;
 
-    /**
-     * @var Reader
-     */
-    private $xsdReader;
-
     /**
      * @param array $configFiles
      * @param UrnResolver $urnResolver