Merge branch '2.3-develop' of github.com:magento/magento2ce into MAGETWO-87132-2.3

omiroshnichenko · omiroshnichenko · commit 292de76ce984 · 2018-01-26T15:21:23.000+02:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\Config as CatalogConfig;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
@@ -424,7 +425,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      *
      * @var string[]
      */
-    protected $_imagesArrayKeys = ['image', 'small_image', 'thumbnail', 'swatch_image', '_media_image'];
+    protected $_imagesArrayKeys = [];
 
     /**
      * Permanent entity columns.
@@ -698,6 +699,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $catalogConfig;
 
+    /**
+     * @var ImageTypeProcessor
+     */
+    private $imageTypeProcessor;
+
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
@@ -737,6 +743,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param array $data
      * @param array $dateAttrCodes
      * @param CatalogConfig $catalogConfig
+     * @param ImageTypeProcessor $imageTypeProcessor
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -780,7 +787,8 @@ public function __construct(
         \Magento\Catalog\Model\Product\Url $productUrl,
         array $data = [],
         array $dateAttrCodes = [],
-        CatalogConfig $catalogConfig = null
+        CatalogConfig $catalogConfig = null,
+        ImageTypeProcessor $imageTypeProcessor = null
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -813,6 +821,8 @@ public function __construct(
         $this->dateAttrCodes = array_merge($this->dateAttrCodes, $dateAttrCodes);
         $this->catalogConfig = $catalogConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(CatalogConfig::class);
+        $this->imageTypeProcessor = $imageTypeProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(ImageTypeProcessor::class);
 
         parent::__construct(
             $jsonHelper,
@@ -832,7 +842,8 @@ public function __construct(
 
         $this->_initAttributeSets()
             ->_initTypeModels()
-            ->_initSkus();
+            ->_initSkus()
+            ->initImagesArrayKeys();
         $this->validator->init($this);
     }
 
@@ -1075,6 +1086,17 @@ protected function _initSkus()
         return $this;
     }
 
+    /**
+     * Initialize image array keys.
+     *
+     * @return $this
+     */
+    private function initImagesArrayKeys()
+    {
+        $this->_imagesArrayKeys = $this->imageTypeProcessor->getImageTypes();
+        return $this;
+    }
+
     /**
      * Initialize product type models.
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/ImageTypeProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/ImageTypeProcessor.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogImportExport\Model\Import\Product;
+
+use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel;
+
+class ImageTypeProcessor
+{
+    /**
+     * @var \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory
+     */
+    private $resourceFactory;
+
+    /**
+     * @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
+     */
+    public function __construct(
+        \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
+    ) {
+        $this->resourceFactory = $resourceFactory;
+    }
+
+    /**
+     * @return array
+     */
+    public function getImageTypes()
+    {
+        $imageKeys = [];
+        /** @var ResourceModel $resource */
+        $resource = $this->resourceFactory->create();
+        $connection = $resource->getConnection();
+        $select = $connection->select();
+        $select->from(
+            $resource->getTable('eav_attribute'),
+            ['code' => 'attribute_code']
+        );
+        $select->where(
+            'frontend_input = :frontend_input'
+        );
+        $bind = [':frontend_input' => 'media_image'];
+
+        $imageKeys   = $connection->fetchCol($select, $bind);
+        $imageKeys[] = '_media_image';
+
+        return $imageKeys;
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ImageTypeProcessorTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/ImageTypeProcessorTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product;
+
+use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
+
+class ImageTypeProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetImageTypes()
+    {
+        $resourceFactory = $this->createPartialMock(
+            \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory::class,
+            ['create']
+        );
+
+        $resource = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModel::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getTable', 'getConnection'])
+            ->getMock();
+        $resource->expects($this->once())
+            ->method('getTable')
+            ->with('eav_attribute')
+            ->willReturnArgument(0);
+        $connection = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
+        $resource->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $resourceFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($resource);
+
+        $selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $selectMock->expects($this->once())
+            ->method('from')
+            ->with('eav_attribute', ['code' => 'attribute_code'], null)
+            ->willReturnSelf();
+        $selectMock->expects($this->once())
+            ->method('where')
+            ->with('frontend_input = :frontend_input')
+            ->willReturnSelf();
+        $connection->expects($this->any())
+            ->method('fetchCol')
+            ->willReturn(['image', 'small_image', 'thumbnail', 'swatch_image']);
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($selectMock);
+
+        $typeProcessor = new ImageTypeProcessor($resourceFactory);
+        $this->assertEquals(
+            ['image', 'small_image', 'thumbnail', 'swatch_image', '_media_image'],
+            $typeProcessor->getImageTypes()
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
 
+use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import;
 
@@ -158,6 +159,9 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
     /** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject*/
     protected $productUrl;
 
+    /** @var  ImageTypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    protected $imageTypeProcessor;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -325,11 +329,16 @@ protected function setUp()
 
         $this->data = [];
 
+        $this->imageTypeProcessor = $this->getMockBuilder(ImageTypeProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->_objectConstructor()
             ->_parentObjectConstructor()
             ->_initAttributeSets()
             ->_initTypeModels()
-            ->_initSkus();
+            ->_initSkus()
+            ->_initImagesArrayKeys();
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -372,7 +381,8 @@ protected function setUp()
                 'taxClassProcessor' => $this->taxClassProcessor,
                 'scopeConfig' => $this->scopeConfig,
                 'productUrl' => $this->productUrl,
-                'data' => $this->data
+                'data' => $this->data,
+                'imageTypeProcessor' => $this->imageTypeProcessor
             ]
         );
         $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product::class);
@@ -495,6 +505,14 @@ protected function _initSkus()
         return $this;
     }
 
+    protected function _initImagesArrayKeys()
+    {
+        $this->imageTypeProcessor->expects($this->once())->method('getImageTypes')->willReturn(
+            ['image', 'small_image', 'thumbnail', 'swatch_image', '_media_image']
+        );
+        return $this;
+    }
+
     public function testSaveProductAttributes()
     {
         $testTable = 'test_table';
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -195,6 +195,8 @@ define([
                 regionInput.hide();
                 label.attr('for', regionList.attr('id'));
             } else {
+                this._removeSelectOptions(regionList);
+
                 if (this.options.isRegionRequired) {
                     regionInput.addClass('required-entry').removeAttr('disabled');
                     requiredLabel.addClass('required');
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml
@@ -16,6 +16,7 @@
             <severity value="NORMAL"/>
             <testCaseId value="MAGETWO-63981"/>
             <group value="analytics"/>
+            <group value="skip"/>
         </annotations>
         <after>
             <amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewBlockPage.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Page/CmsNewBlockPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="CmsNewBlock" url="admin/cms/block/new" area="admin" module="Magento_Cms">
+    <page name="CmsNewBlock" area="admin" url="/cms/block/new" module="Magento_Cms">
         <section name="CmsNewBlockBlockActionsSection"/>
         <section name="CmsNewBlockBlockBasicFieldsSection"/>
     </page>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockBasicFieldsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewBlockBlockBasicFieldsSection.xml
@@ -11,6 +11,6 @@
     <section name="CmsNewBlockBlockBasicFieldsSection">
         <element name="title" type="input" selector="input[name=title]"/>
         <element name="identifier" type="input" selector="input[name=identifier]"/>
-        <element name="wysiwyg_hr_element" type="input" selector="#cms_block_form_content_hr"/>
+        <element name="content_textarea" type="input" selector="#cms_block_form_content"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/AdminAddImageToWYSIWYGNewsletterCest.xml
@@ -12,6 +12,7 @@
             <features value="Add Image to WYSIWYG of Newsletter"/>
             <stories value="Apply new WYSIWYG in Newsletter-MAGETWO-47309"/>
             <group value="newsletter"/>
+            <group value="skip"/>
             <title value="You should be able to add image to WYSIWYG Editor of Newsletter"/>
             <description value="You should be able to add image to WYSIWYG Editor Newsletter"/>
             <severity value="CRITICAL"/>
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
@@ -31,13 +31,24 @@ class PublicCodeTest extends \PHPUnit\Framework\TestCase
      */
     public function testAllBlocksReferencedInLayoutArePublic($layoutFile)
     {
+        // A block can be whitelisted and thus not be required to be public
+        $whiteListFiles = str_replace('\\', '/', realpath(__DIR__))
+            . '/_files/whitelist/public_code*.txt';
+        $whiteListBlocks = [];
+        foreach (glob($whiteListFiles) as $fileName) {
+            $whiteListBlocks = array_merge(
+                $whiteListBlocks,
+                file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+            );
+        }
+
         $nonPublishedBlocks = [];
         $xml = simplexml_load_file($layoutFile);
         $elements = $xml->xpath('//block | //referenceBlock') ?: [];
         /** @var $node \SimpleXMLElement */
         foreach ($elements as $node) {
             $class = (string) $node['class'];
-            if ($class && \class_exists($class)) {
+            if ($class && \class_exists($class) && !in_array($class, $whiteListBlocks)) {
                 $reflection = (new \ReflectionClass($class));
                 if (strpos($reflection->getDocComment(), '@api') === false) {
                     $nonPublishedBlocks[] = $class;
