Merge remote-tracking branch 'origin/MAGETWO-47865' into pr-368

Author: Victor Rad

app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php

@@ -29,19 +29,19 @@ class Gallery extends \Magento\Catalog\Block\Product\View\AbstractView
 
     /**
      * Gallery constructor.
+     * @param \Magento\Catalog\Block\Product\Context $context
+     * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
      * @param \Magento\Catalog\Model\Product\Gallery\ReadHandler $productGalleryReadHandler
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\Json\DecoderInterface $jsonDecoder
-     * @param \Magento\Catalog\Block\Product\Context $context
-     * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
      * @param array $data
      */
     public function __construct(
+        \Magento\Catalog\Block\Product\Context $context,
+        \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
         \Magento\Catalog\Model\Product\Gallery\ReadHandler $productGalleryReadHandler,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Framework\Json\DecoderInterface $jsonDecoder,
-        \Magento\Catalog\Block\Product\Context $context,
-        \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
         array $data = []
     ) {
         $this->productGalleryReadHandler = $productGalleryReadHandler;

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

@@ -137,8 +137,9 @@ define([
                 $widget.videoData = $widget.options.VideoData;
             }
 
-            $('#product-options-wrapper').find('[option-selected]').each(function (item) {
+            $('#product-options-wrapper').find('[option-selected]').each(function () {
                 var key = $(this).attr('attribute-code') + '_' + $(this).attr('option-selected');
+
                 if ($widget.options.OptionsVideoData && $widget.options.OptionsVideoData[key]) {
                     $widget.options.VideoData = $widget.options.OptionsVideoData[key];
                 } else {

dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php

@@ -40,7 +40,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $lines = $tokens[$next]['line'] - $tokens[$stackPtr]['line'];
                 if ($lines > 1) {
                     $error = 'Code must not contain multiple empty lines in a row; found %s empty lines';
-                    $data  = array($lines);
+                    $data  = [$lines];
                     $phpcsFile->addError($error, $stackPtr, 'MultipleEmptyLines', $data);
                 }
             }