Merge branch 'PR4' into product-video-PR4

Author: Igor Miniailo

app/code/Magento/Catalog/view/adminhtml/web/catalog/base-image-uploader.js

@@ -38,7 +38,7 @@ define([
 
             var findElement = function (data) {
                 return $container.find('.image:not(.image-placeholder)').filter(function () {
-                    if(!$(this).data('image')) {
+                    if (!$(this).data('image')) {
                         return false;
                     }
                     return $(this).data('image').file === data.file;

app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

@@ -20,7 +20,7 @@ define([
 
     var params = {};
     var fields = $('category_edit_form').getElementsBySelector('input', 'select');
-    for(var i=0;i<fields.length;i++){
+    for (var i=0; i<fields.length; i++) {
         if (!fields[i].name) {
             continue;
         }

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

@@ -703,7 +703,9 @@ define([
                             mageData.scripts.map(function(script) {
                                 return eval(script);
                             });
-                        } catch (e) {}
+                        } catch (e) {
+
+                        }
                         this.restorePhase = false;
                     }
                     break;

app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js

@@ -301,7 +301,7 @@ define([
          * @private
          */
         _onOpenDialog: function(e, imageData) {
-            if(imageData.media_type && imageData.media_type != 'image') {
+            if (imageData.media_type && imageData.media_type != 'image') {
                 return;
             }
             this._showDialog(imageData);
@@ -315,7 +315,7 @@ define([
         _showDialog: function (imageData) {
             var $imageContainer = this.findElement(imageData);
             var dialogElement = $imageContainer.data('dialog');
-            if(!this.dialogTmpl) {
+            if (!this.dialogTmpl) {
                 alert('System problem!');
                 return;
             }

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -46,7 +46,7 @@ define([
 
         submitForm: function(form) {
             var self = this;
-            if (form.has('input[type="file"]').length  && form.find('input[type="file"]').val() !== '') {
+            if (form.has('input[type="file"]').length && form.find('input[type="file"]').val() !== '') {
                 self.element.off('submit');
                 form.submit();
             } else {

app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php

@@ -25,7 +25,7 @@ class NewVideo extends \Magento\Backend\Block\Widget\Form\Generic
     /**
      * @var \Magento\Framework\UrlInterface
      */
-    protected $_urlBuilder;
+    protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\Json\EncoderInterface
@@ -34,25 +34,23 @@ class NewVideo extends \Magento\Backend\Block\Widget\Form\Generic
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\ProductVideo\Helper\Media $mediaHelper
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
+     * @param \Magento\ProductVideo\Helper\Media $mediaHelper
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
-        \Magento\ProductVideo\Helper\Media $mediaHelper,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
+        \Magento\ProductVideo\Helper\Media $mediaHelper,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         array $data = []
     ) {
         parent::__construct($context, $registry, $formFactory, $data);
         $this->mediaHelper = $mediaHelper;
-        $this->_urlBuilder = $urlBuilder;
+        $this->urlBuilder = $context->getUrlBuilder();
         $this->jsonEncoder = $jsonEncoder;
         $this->setUseContainer(true);
     }
@@ -271,11 +269,10 @@ protected function addMediaRoleAttributes(Fieldset $fieldset)
     protected function getNoteVideoUrl()
     {
         $result = __('YouTube and Vimeo supported.');
-        if (is_null($this->mediaHelper->getYouTubeApiKey())) {
+        if ($this->mediaHelper->getYouTubeApiKey() === null) {
             $result = __(
-                'Vimeo supported.<br>'
-                . 'To add YouTube video, please <a href="%1">enter YouTube API Key</a> first.'
-                ,
+                'Vimeo supported.<br />'
+                . 'To add YouTube video, please <a href="%1">enter YouTube API Key</a> first.',
                 $this->getConfigApiKeyUrl()
             );
         }
@@ -289,7 +286,7 @@ protected function getNoteVideoUrl()
      */
     protected function getConfigApiKeyUrl()
     {
-        return $this->_urlBuilder->getUrl(
+        return $this->urlBuilder->getUrl(
             'adminhtml/system_config/edit',
             [
                 'section' => 'catalog',

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

@@ -124,15 +124,18 @@ protected function localFileName($fileName)
     /**
      * @param string $fileUrl
      * @param string $localFilePath
-     * @return bool|void
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function retrieveRemoteImage($fileUrl, $localFilePath)
     {
         $this->curl->setConfig(['header' => false]);
         $this->curl->write('GET', $fileUrl);
         $image = $this->curl->read();
         if (empty($image)) {
-            throw new \InvalidArgumentException(__('Couldn\'t retrive a remote preview image file. Service is inaccessible.'));
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Could not get video information. Please check your connection and try again.')
+            );
         }
         $this->fileUtility->saveFile($localFilePath, $image);
     }

app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoEntryProcessor.php

@@ -48,6 +48,7 @@ class ExternalVideoEntryProcessor
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Media $resourceEntryMediaGallery
+     * @param \Magento\ProductVideo\Model\ResourceModel\Video $videoResourceModel
      */
     public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Media $resourceEntryMediaGallery,

app/code/Magento/ProductVideo/Model/Plugin/ExternalVideoResourceBackend.php

@@ -7,7 +7,6 @@
 namespace Magento\ProductVideo\Model\Plugin;
 
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\Backend\Media;
-use Magento\ProductVideo\Setup\InstallSchema;
 
 /**
  * Attribute Media Resource decorator
@@ -37,7 +36,7 @@ public function __construct(\Magento\ProductVideo\Model\ResourceModel\Video $vid
     public function afterDuplicate(Media $originalResourceModel, array $valueIdMap)
     {
         $mediaGalleryEntitiesData = $this->videoResourceModel->loadByIds(array_keys($valueIdMap));
-        foreach($mediaGalleryEntitiesData as $row) {
+        foreach ($mediaGalleryEntitiesData as $row) {
             $row['value_id'] = $valueIdMap[$row['value_id']];
             $this->videoResourceModel->insertOnDuplicate($row);
         }