MAGETWO-57826: [PR] Bug fixes delivery

Author: shiftedreality

.htaccess

@@ -32,6 +32,7 @@
 
     DirectoryIndex index.php
 
+<IfModule mod_php5.c>
 ############################################
 ## adjust memory limit
 
@@ -53,7 +54,30 @@
 ## disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
+</IfModule>
+<IfModule mod_php7.c>
+############################################
+## adjust memory limit
+
+    php_value memory_limit 768M
+    php_value max_execution_time 18000
+
+############################################
+## disable automatic session start
+## before autoload was initialized
+
+    php_flag session.auto_start off
+
+############################################
+## enable resulting html compression
+
+    #php_flag zlib.output_compression on
 
+###########################################
+## disable user agent verification to not break multiple image upload
+
+    php_flag suhosin.session.cryptua off
+</IfModule>
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload

.user.ini

@@ -0,0 +1,4 @@
+memory_limit = 768M
+max_execution_time = 18000
+session.auto_start = off
+suhosin.session.cryptua = off

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -34,7 +34,7 @@
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
-        <div class="admin__control-table-pagination" visible="!!$data.recordData().length">
+        <div class="admin__control-table-pagination" visible="!!element.getRecordCount()">
             <div class="admin__data-grid-pager">
                 <button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
                 <input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
@@ -51,10 +51,10 @@
 
                         <th repeat="foreach: labels, item: '$label'"
                             class="data-grid-th"
-                            translate="$label().label"
                             visible="$label().visible"
                             disable="$label().disabled"
                             css="setClasses($label())">
+                            <span translate="$label().label"/>
                         </th>
                     </tr>
                 </thead>

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php

@@ -120,7 +120,7 @@ public function modifyData(array $data)
                         'is_default' => ($productLink->getIsDefault()) ? '1' : '0',
                         'selection_price_value' => $productLink->getPrice(),
                         'selection_price_type' => $productLink->getPriceType(),
-                        'selection_qty' => (bool)$integerQty ? (int)$productLink->getQty() : $productLink->getQty(),
+                        'selection_qty' => $integerQty ? (int)$productLink->getQty() : $productLink->getQty(),
                         'selection_can_change_qty' => $productLink->getCanChangeQuantity(),
                         'selection_qty_is_integer' => (bool)$integerQty,
                         'position' => $productLink->getPosition(),

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-option-qty.js

@@ -11,16 +11,28 @@ define([
     return Abstract.extend({
         defaults: {
             valueUpdate: 'input',
-            isInteger: true
+            isInteger: true,
+            validation: {
+                'validate-number': true
+            }
         },
 
         /**
-         * update event
+         * @inheritdoc
          */
         onUpdate: function () {
-            this.validation['validate-number'] = true;
             this.validation['validate-digits'] = this.isInteger;
-            this.validate();
+            this._super();
+        },
+
+        /**
+         * @inheritdoc
+         */
+        hasChanged: function () {
+            var notEqual = this.value() !== this.initialValue.toString();
+
+            return !this.visible() ? false : notEqual;
         }
+
     });
 });

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php

@@ -40,11 +40,6 @@ class Content extends \Magento\Backend\Block\Widget
      */
     private $imageHelper;
 
-    /**
-     * @var \Magento\Framework\View\Asset\Repository
-     */
-    private $assetRepo;
-
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
@@ -147,13 +142,8 @@ public function getImagesJson()
                     $fileHandler = $mediaDir->stat($this->_mediaConfig->getMediaPath($image['file']));
                     $image['size'] = $fileHandler['size'];
                 } catch (FileSystemException $e) {
-                    $staticDir = $this->_filesystem->getDirectoryRead(DirectoryList::STATIC_VIEW);
-                    $image['url'] = $this->getImageHelper()->getDefaultPlaceholderUrl('thumbnail');
-                    $fileHandler = $staticDir->stat(
-                        $this->getAssetRepo()
-                            ->createAsset($this->getImageHelper()->getPlaceholder('thumbnail'))->getPath()
-                    );
-                    $image['size'] = $fileHandler['size'];
+                    $image['url'] = $this->getImageHelper()->getDefaultPlaceholderUrl('small_image');
+                    $image['size'] = 0;
                     $this->_logger->warning($e);
                 }
             }
@@ -262,18 +252,4 @@ private function getImageHelper()
         }
         return $this->imageHelper;
     }
-
-    /**
-     * @return \Magento\Framework\View\Asset\Repository
-     * @deprecated
-     */
-    private function getAssetRepo()
-    {
-        if ($this->assetRepo === null) {
-            $this->assetRepo = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\View\Asset\Repository::class);
-        }
-
-        return $this->assetRepo;
-    }
 }

app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php

@@ -46,11 +46,6 @@ class ContentTest extends \PHPUnit_Framework_TestCase
      */
     protected $imageHelper;
 
-    /**
-     * @var \Magento\Framework\View\Asset\Repository|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $assetRepo;
-
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
@@ -171,12 +166,7 @@ public function testGetImagesJsonWithException()
     {
         $this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getDefaultPlaceholderUrl', 'getPlaceholder'])
-            ->getMock();
-
-        $this->assetRepo = $this->getMockBuilder(\Magento\Framework\View\Asset\Repository::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['createAsset', 'getPath'])
+            ->setMethods(['getDefaultPlaceholderUrl'])
             ->getMock();
 
         $this->objectManager->setBackwardCompatibleProperty(
@@ -185,32 +175,24 @@ public function testGetImagesJsonWithException()
             $this->imageHelper
         );
 
-        $this->objectManager->setBackwardCompatibleProperty(
-            $this->content,
-            'assetRepo',
-            $this->assetRepo
-        );
-
         $placeholderUrl = 'url_to_the_placeholder/placeholder.jpg';
 
-        $sizePlaceholder = ['size' => 399659];
-
         $imagesResult = [
             [
                 'value_id' => '2',
                 'file' => 'file_2.jpg',
                 'media_type' => 'image',
                 'position' => '0',
                 'url' => 'url_to_the_placeholder/placeholder.jpg',
-                'size' => 399659
+                'size' => 0
             ],
             [
                 'value_id' => '1',
                 'file' => 'file_1.jpg',
                 'media_type' => 'image',
                 'position' => '1',
                 'url' => 'url_to_the_placeholder/placeholder.jpg',
-                'size' => 399659
+                'size' => 0
             ]
         ];
 
@@ -238,18 +220,13 @@ public function testGetImagesJsonWithException()
         $this->mediaConfigMock->expects($this->any())->method('getMediaPath');
         $this->readMock->expects($this->any())->method('stat')->willReturnOnConsecutiveCalls(
             $this->throwException(
-                new \Magento\Framework\Exception\FileSystemException(new \Magento\Framework\Phrase('test'))
+                new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
             ),
-            $sizePlaceholder,
             $this->throwException(
-                new \Magento\Framework\Exception\FileSystemException(new \Magento\Framework\Phrase('test'))
-            ),
-            $sizePlaceholder
+                new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
+            )
         );
         $this->imageHelper->expects($this->any())->method('getDefaultPlaceholderUrl')->willReturn($placeholderUrl);
-        $this->imageHelper->expects($this->any())->method('getPlaceholder');
-        $this->assetRepo->expects($this->any())->method('createAsset')->willReturnSelf();
-        $this->assetRepo->expects($this->any())->method('getPath');
         $this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
 
         $this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -362,7 +362,7 @@ protected function getOptionsGridConfig($sortOrder)
                         'collapsibleHeader' => true,
                         'sortOrder' => $sortOrder,
                         'dataProvider' => static::CUSTOM_OPTIONS_LISTING,
-                        'links' => ['insertData' => '${ $.provider }:${ $.dataProvider }'],
+                        'imports' => ['insertData' => '${ $.provider }:${ $.dataProvider }'],
                     ],
                 ],
             ],
@@ -478,8 +478,7 @@ protected function getImportOptionsModalConfig()
                                 'ns' => static::CUSTOM_OPTIONS_LISTING,
                                 'render_url' => $this->urlBuilder->getUrl('mui/index/render'),
                                 'realTimeLink' => true,
-                                'behaviourType' => 'edit',
-                                'externalFilterMode' => true,
+                                'externalFilterMode' => false,
                                 'currentProductId' => $this->locator->getProduct()->getId(),
                                 'dataLinks' => [
                                     'imports' => false,