Merge branch 'MAGETWO-90280' of github.com:magento-trigger/magento2ce into MAGETWO-90280

Author: omiroshnichenko

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.3.0
+=============
+To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
+
 2.1.0
 =============
 To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")

app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

@@ -17,7 +17,10 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94176"/>
             <group value="backup"/>
-            <group value="skip"/>
+            <skip>
+                <issueId value="MQE-1187"/>
+                <issueId value="DEVOPS-3512"/>
+            </skip>
         </annotations>
 
         <!--Login to admin area-->

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -117,7 +117,7 @@
         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first" />
         <element name="UploadImage" type="file" selector=".fileupload" />
         <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
-        <element name="InsertFile" type="text" selector="#insert_files"/>
+        <element name="InsertFile" type="text" selector="#insert_files" timeout="30"/>
         <element name="CreateFolder" type="button" selector="#new_folder" />
         <element name="DeleteSelectedBtn" type="text" selector="#delete_files"/>
         <element name="CancelBtn" type="button" selector="#cancel" />

app/code/Magento/Catalog/Test/Mftf/Test/AdminUnassignProductAttributeFromAttributeSetTest.xml

@@ -17,33 +17,25 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-194"/>
             <group value="Catalog"/>
-            <skip>
-                <issueId value="MAGETWO-92780"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="productDropDownAttribute" stepKey="attribute"/>
-
             <createData entity="productAttributeOption1" stepKey="option1">
                 <requiredEntity createDataKey="attribute"/>
             </createData>
             <createData entity="productAttributeOption2" stepKey="option2">
                 <requiredEntity createDataKey="attribute"/>
             </createData>
-
             <createData entity="AddToDefaultSet" stepKey="addToDefaultSet">
                 <requiredEntity createDataKey="attribute"/>
             </createData>
-
             <createData entity="ApiProductWithDescription" stepKey="product"/>
-
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <deleteData createDataKey="attribute" stepKey="deleteAttribute"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-
         <!-- Assert attribute presence in storefront product additional information -->
         <amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage1"/>
         <waitForPageLoad stepKey="wait1"/>
@@ -64,6 +56,8 @@
         <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassigned"/>
         <!-- Save attribute set -->
         <actionGroup ref="SaveAttributeSet" stepKey="SaveAttributeSet"/>
+        <!-- Clear cache -->
+        <actionGroup ref="ClearPageCacheActionGroup" stepKey="clearPageCacheActionGroup"/>
         <!-- Go to create new product page -->
         <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
         <waitForPageLoad stepKey="wait2"/>
@@ -72,8 +66,7 @@
         <!-- Assert removed attribute not presence in storefront product additional information -->
         <amOnPage url="/$$product.custom_attributes[url_key]$$.html" stepKey="onProductPage2"/>
         <waitForPageLoad stepKey="wait3"/>
-        <actionGroup ref="checkAttributeNotInMoreInformationTab" stepKey="checkAttributeNotInMoreInformationTab">
-            <argument name="attributeLabel" value="$$attribute.attribute[frontend_labels][0][label]$$"/>
-        </actionGroup>
+        <dontSeeElement selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="dontSeeProductAttribute"/>
+        <dontSee userInput="$$attribute.attribute[frontend_labels][0][label]$$" selector="{{StorefrontProductMoreInformationSection.moreInformationTextArea}}" stepKey="dontSeeAttributeLabel"/>
     </test>
 </tests>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml

@@ -17,10 +17,6 @@
             <severity value="CRITICAL"/>
             <group value="product"/>
             <testCaseId value="MAGETWO-92384"/>
-            <group value="skip"/>
-            <skip>
-                <issueId value="MAGETWO-93261"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml

@@ -17,11 +17,6 @@
             <description value="Admin should be able to see the full title of the selected custom option value in the order"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-3043"/>
-            <group value="skip"/>
-            <!-- Skip due to MQE-1128 -->
-            <skip>
-                <issueId value="MQE-1128"/>
-            </skip>
         </annotations>
         <before>
             <!--Create Simple Product with Custom Options-->
@@ -106,6 +101,6 @@
         </assertEquals>
         <moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
         <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueDropdownLongTitle1.title}}" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
     </test>
 </tests>

app/code/Magento/Cms/Block/Widget/Block.php

@@ -3,14 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Block\Widget;
 
+use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Cms\Model\Block as CmsBlock;
+use Magento\Widget\Block\BlockInterface;
+
 /**
  * Cms Static Block Widget
  *
- * @author     Magento Core Team <[email protected]>
+ * @author Magento Core Team <[email protected]>
  */
-class Block extends \Magento\Framework\View\Element\Template implements \Magento\Widget\Block\BlockInterface
+class Block extends \Magento\Framework\View\Element\Template implements BlockInterface, IdentityInterface
 {
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
@@ -31,6 +39,11 @@ class Block extends \Magento\Framework\View\Element\Template implements \Magento
      */
     protected $_blockFactory;
 
+    /**
+     * @var CmsBlock
+     */
+    private $block;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
@@ -49,8 +62,9 @@ public function __construct(
     }
 
     /**
-     * Prepare block text and determine whether block output enabled or not
-     * Prevent blocks recursion if needed
+     * Prepare block text and determine whether block output enabled or not.
+     *
+     * Prevent blocks recursion if needed.
      *
      * @return $this
      */
@@ -65,19 +79,63 @@ protected function _beforeToHtml()
         }
         self::$_widgetUsageMap[$blockHash] = true;
 
-        if ($blockId) {
-            $storeId = $this->_storeManager->getStore()->getId();
-            /** @var \Magento\Cms\Model\Block $block */
-            $block = $this->_blockFactory->create();
-            $block->setStoreId($storeId)->load($blockId);
-            if ($block->isActive()) {
+        $block = $this->getBlock();
+
+        if ($block && $block->isActive()) {
+            try {
+                $storeId = $this->_storeManager->getStore()->getId();
                 $this->setText(
                     $this->_filterProvider->getBlockFilter()->setStoreId($storeId)->filter($block->getContent())
                 );
+            } catch (NoSuchEntityException $e) {
             }
         }
-
         unset(self::$_widgetUsageMap[$blockHash]);
         return $this;
     }
+
+    /**
+     * Get identities of the Cms Block
+     *
+     * @return array
+     */
+    public function getIdentities()
+    {
+        $block = $this->getBlock();
+
+        if ($block) {
+            return $block->getIdentities();
+        }
+
+        return [];
+    }
+
+    /**
+     * Get block
+     *
+     * @return CmsBlock|null
+     */
+    private function getBlock(): ?CmsBlock
+    {
+        if ($this->block) {
+            return $this->block;
+        }
+
+        $blockId = $this->getData('block_id');
+
+        if ($blockId) {
+            try {
+                $storeId = $this->_storeManager->getStore()->getId();
+                /** @var \Magento\Cms\Model\Block $block */
+                $block = $this->_blockFactory->create();
+                $block->setStoreId($storeId)->load($blockId);
+                $this->block = $block;
+
+                return $block;
+            } catch (NoSuchEntityException $e) {
+            }
+        }
+
+        return null;
+    }
 }

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml

@@ -17,8 +17,6 @@
             <description value="Admin should be able to create a CMS page with widget type: Recently Compared Products"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-83792"/>
-            <!--Skip test due to MC-1284-->
-            <group value="skip"/>
         </annotations>
         <!--Main test-->
         <before>

app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Developer\Console\Command;
 
@@ -25,7 +26,7 @@ class GeneratePatchCommand extends Command
     /**
      * Command arguments and options
      */
-    const COMMAND_NAME = 'dev:generate:patch';
+    const COMMAND_NAME = 'setup:db-declaration:generate-patch';
     const MODULE_NAME = 'module';
     const INPUT_KEY_IS_REVERTABLE = 'revertable';
     const INPUT_KEY_PATCH_TYPE = 'type';
@@ -47,7 +48,9 @@ public function __construct(ComponentRegistrar $componentRegistrar)
     }
 
     /**
-     * {@inheritdoc}
+     * Configure command
+     *
+     * @inheritdoc
      * @throws InvalidArgumentException
      */
     protected function configure()
@@ -89,16 +92,16 @@ protected function configure()
      *
      * @return string
      */
-    private function getPatchTemplate()
+    private function getPatchTemplate() : string
     {
         return file_get_contents(__DIR__ . '/patch_template.php.dist');
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @throws \InvalidArgumentException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output) : int
     {
         $moduleName = $input->getArgument(self::MODULE_NAME);
         $patchName = $input->getArgument(self::INPUT_KEY_PATCH_NAME);

app/code/Magento/Developer/Console/Command/TablesWhitelistGenerateCommand.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Developer\Console\Command;
 
 use Magento\Framework\Component\ComponentRegistrar;
@@ -18,6 +20,7 @@
 
 /**
  * Command that allows to generate whitelist, that will be used, when declaration data is installed.
+ *
  * If whitelist already exists, new values will be added to existing whitelist.
  */
 class TablesWhitelistGenerateCommand extends Command
@@ -72,7 +75,7 @@ public function __construct(
      */
     protected function configure()
     {
-        $this->setName('declaration:generate:whitelist')
+        $this->setName('setup:db-declaration:generate-whitelist')
             ->setDescription(
                 'Generate whitelist of tables and columns that are allowed to be edited by declaration installer'
             )
@@ -125,7 +128,7 @@ private function persistModule($moduleName)
     /**
      * @inheritdoc
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output) : int
     {
         $moduleName = $input->getOption(self::MODULE_NAME_KEY);
 
@@ -146,13 +149,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * As for whitelist we do not need any specific attributes like nullable or indexType,
-     * we need to choose only names.
+     * Filter attribute names
+     *
+     * As for whitelist we do not need any specific attributes like nullable or indexType, we need to choose only names.
      *
      * @param array $content
      * @return array
      */
-    private function filterAttributeNames(array $content)
+    private function filterAttributeNames(array $content) : array
     {
         $names = [];
         $types = ['column', 'index', 'constraint'];

app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicesFiltersSection.xml

@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminInvoicesFiltersSection">
         <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml

@@ -78,8 +78,10 @@
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
         <amOnPage url="{{AdminInvoicesPage.url}}" stepKey="goToInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask6" />
+        <actionGroup ref="resetProductGridToDefaultView" stepKey="resetGridInitial"/>
         <click selector="{{AdminInvoicesGridSection.filter}}" stepKey="clickFilters"/>
         <fillField selector="{{AdminInvoicesFiltersSection.orderNum}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum2"/>
+        <click selector="{{AdminInvoicesFiltersSection.applyFilters}}" stepKey="clickApplyFilters"/>
         <click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="clickInvoice2"/>
         <see selector="{{AdminInvoiceDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus2"/>
     </test>