Merge branch '2.4-develop' of github:hannahnida/magento2 into 558_content-type-style-attribute-removal

hannahnida · hannahnida · commit 14691ce6f3ef · 2020-10-20T18:48:58.000+02:00
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php
@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->closureMock = function () use ($productMock) {
             return $productMock;
         };
-        $this->rollbackClosureMock = function () use ($productMock) {
+        $this->rollbackClosureMock = function () {
             throw new \Exception(self::ERROR_MSG);
         };
 
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php
@@ -87,7 +87,7 @@ public function resolve(
         $this->tiers->addProductFilter($productId);
 
         return $this->valueFactory->create(
-            function () use ($productId, $context) {
+            function () use ($productId) {
                 $tierPrices = $this->tiers->getProductTierPrices($productId);
 
                 return $tierPrices ?? [];
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -359,6 +359,8 @@ protected function getPreparedSearchCriteria($attribute, $value)
         if (is_array($value)) {
             if (isset($value['from']) && isset($value['to'])) {
                 if (!empty($value['from']) || !empty($value['to'])) {
+                    $from = '';
+                    $to = '';
                     if (isset($value['currency'])) {
                         /** @var $currencyModel Currency */
                         $currencyModel = $this->_currencyFactory->create()->load($value['currency']);
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
@@ -24,11 +24,12 @@
         <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
         <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
         <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForPageLoad stepKey="waitForLoadingMask"/>
         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <waitForPageLoad stepKey="waitForShippingLoadingMask"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
@@ -289,9 +289,8 @@ protected function prepareDefaultCustomerTitle(\Magento\Backend\Model\View\Resul
     protected function _addSessionErrorMessages($messages)
     {
         $messages = (array)$messages;
-        $session = $this->_getSession();
 
-        $callback = function ($error) use ($session) {
+        $callback = function ($error) {
             if (!$error instanceof Error) {
                 $error = new Error($error);
             }
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertStorefrontCustomerHasNoOtherAddressesActionGroup">
+        <annotations>
+            <description>Verifies customer has no additional address in address book</description>
+        </annotations>
+        <amOnPage url="{{StorefrontCustomerAddressesPage.url}}" stepKey="goToAddressPage"/>
+        <waitForText userInput="You have no other address entries in your address book." selector=".block-addresses-list" stepKey="assertOtherAddresses"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
@@ -12,7 +12,6 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 class BillingTest extends TestCase
 {
@@ -23,10 +22,7 @@ class BillingTest extends TestCase
 
     protected function setUp(): void
     {
-        $logger = $this->getMockBuilder(LoggerInterface::class)
-            ->getMock();
-        /** @var LoggerInterface $logger */
-        $this->testable = new Billing($logger);
+        $this->testable = new Billing();
     }
 
     public function testBeforeSave()
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
@@ -12,7 +12,6 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 class ShippingTest extends TestCase
 {
@@ -23,10 +22,7 @@ class ShippingTest extends TestCase
 
     protected function setUp(): void
     {
-        $logger = $this->getMockBuilder(LoggerInterface::class)
-            ->getMock();
-        /** @var LoggerInterface $logger */
-        $this->testable = new Shipping($logger);
+        $this->testable = new Shipping();
     }
 
     public function testBeforeSave()
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php b/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php
@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->closureMock = function () use ($customerMock) {
             return $customerMock;
         };
-        $this->rollbackClosureMock = function () use ($customerMock) {
+        $this->rollbackClosureMock = function () {
             throw new \Exception(self::ERROR_MSG);
         };
 
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -550,6 +550,9 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
 
         $quote = $this->getQuote();
         if (!$quote->isVirtual() && $this->getShippingAddress()->getSameAsBilling()) {
+            $quote->getBillingAddress()->setCustomerAddressId(
+                $quote->getShippingAddress()->getCustomerAddressId()
+            );
             $this->setShippingAsBilling(1);
         }
 
@@ -2120,6 +2123,9 @@ private function isAddressesAreEqual(Order $order)
             $billingData['address_type'],
             $billingData['entity_id']
         );
+        if (isset($shippingData['customer_address_id']) && !isset($billingData['customer_address_id'])) {
+            unset($shippingData['customer_address_id']);
+        }
 
         return $shippingData == $billingData;
     }
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminStartReorderFromOrderPageActionGroup">
+        <annotations>
+            <description>Reorder existing order. Requires admin order page to be opened.</description>
+        </annotations>
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
+        <waitForPageLoad stepKey="waitPageLoad"/>
+        <waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForPageTitle"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeCreateNewOrderPageTitle"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminReorderAddressNotSavedInAddressBookTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="Reorder"/>
+            <title value="Same shipping address is not repeating multiple times in storefront checkout when Reordered"/>
+            <description value="Same shipping address is not repeating multiple times in storefront checkout when Reordered"/>
+            <testCaseId value="MC-38412"/>
+            <useCaseId value="MC-38113"/>
+            <severity value="MAJOR"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="category"/>
+            <createData entity="ApiSimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="Simple_Customer_Without_Address" stepKey="customer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+                <argument name="Customer" value="$customer$"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <!-- Create order for registered customer -->
+        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$product$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="openCheckoutPage"/>
+        <actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="fillAddressForm"/>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <!-- Reorder created order -->
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderById">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+        <actionGroup ref="AdminStartReorderFromOrderPageActionGroup" stepKey="startReorder"/>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+
+        <!-- Assert no additional addresses saved -->
+        <actionGroup ref="AssertStorefrontCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -114,7 +114,9 @@ endif; ?>
                    type="checkbox"
                    id="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
                    value="1"
-                <?php if (!$block->getDontSaveInAddressBook()): ?> checked="checked"<?php endif; ?>
+                <?php if (!$block->getDontSaveInAddressBook() && !$block->getAddressId()): ?>
+                    checked="checked"
+                <?php endif; ?>
                    class="admin__control-checkbox"/>
             <label for="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
                    class="admin__field-label"><?= $block->escapeHtml(__('Save in address book')) ?></label>
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
@@ -7,10 +7,7 @@
 
 namespace Magento\Theme\Test\Unit\Block\Adminhtml\Design\Config\Edit;
 
-use Magento\Backend\Block\Widget\Context;
-use Magento\Framework\UrlInterface;
 use Magento\Theme\Block\Adminhtml\Design\Config\Edit\SaveButton;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class SaveButtonTest extends TestCase
@@ -20,16 +17,9 @@ class SaveButtonTest extends TestCase
      */
     protected $block;
 
-    /**
-     * @var Context|MockObject
-     */
-    protected $context;
-
     protected function setUp(): void
     {
-        $this->initContext();
-
-        $this->block = new SaveButton($this->context);
+        $this->block = new SaveButton();
     }
 
     public function testGetButtonData()
@@ -41,18 +31,4 @@ public function testGetButtonData()
         $this->assertArrayHasKey('data_attribute', $result);
         $this->assertIsArray($result['data_attribute']);
     }
-
-    protected function initContext()
-    {
-        $this->urlBuilder = $this->getMockBuilder(UrlInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->context->expects($this->any())
-            ->method('getUrlBuilder')
-            ->willReturn($this->urlBuilder);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
@@ -52,7 +52,7 @@ function ($values, $index) use ($optionsPerAttribute) {
         );
         $data['optionvisual']['value'] = array_reduce(
             range(1, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values['option_' . $index] = ['option ' . $index];
                 return $values;
             },
@@ -61,7 +61,7 @@ function ($values, $index) use ($optionsPerAttribute) {
 
         $data['options']['option'] = array_reduce(
             range(1, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values[] = [
                     'label' => 'option ' . $index,
                     'value' => 'option_' . $index
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeOptionAddTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeOptionAddTest.php
@@ -40,7 +40,7 @@ public function testSwatchOptionAdd()
 
         $data['options']['option'] = array_reduce(
             range(10, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values[] = [
                     'label' => 'option ' . $index,
                     'value' => 'option_' . $index
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
@@ -16,8 +16,7 @@ class QueueInstallerTest extends TestCase
 {
     public function testInstall()
     {
-        $bindingInstaller = $this->getMockForAbstractClass(QueueConfigItemInterface::class);
-        $model = new QueueInstaller($bindingInstaller);
+        $model = new QueueInstaller();
         $channel = $this->createMock(AMQPChannel::class);
 
         $queue = $this->getMockForAbstractClass(QueueConfigItemInterface::class);
diff --git a/lib/internal/Magento/Framework/Setup/ExternalFKSetup.php b/lib/internal/Magento/Framework/Setup/ExternalFKSetup.php
@@ -92,10 +92,10 @@ protected function execute()
     /**
      * Get foreign keys for tables and columns
      *
-     * @param string $refTable
-     * @param string $refColumn
      * @param string $targetTable
      * @param string $targetColumn
+     * @param string $refTable
+     * @param string $refColumn
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -110,7 +110,7 @@ protected function getForeignKeys(
         );
         $foreignKeys = array_filter(
             $foreignKeys,
-            function ($key) use ($targetColumn, $refTable, $refColumn) {
+            function ($key) use ($targetColumn, $refTable) {
                 return $key['COLUMN_NAME'] == $targetColumn
                 && $key['REF_TABLE_NAME'] == $refTable;
             }
diff --git a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
@@ -7,6 +7,7 @@
 namespace Magento\Setup\Console\Command;
 
 use Magento\Framework\Setup\ConsoleLogger;
+use Magento\Framework\Validation\ValidationException;
 use Magento\Setup\Model\AdminAccount;
 use Magento\Setup\Model\InstallerFactory;
 use Magento\User\Model\UserValidationRules;
@@ -81,7 +82,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
             $question = new Question('<question>Admin password:</question> ', '');
             $question->setHidden(true);
 
-            $question->setValidator(function ($value) use ($output) {
+            $question->setValidator(function ($value) {
                 $user = new \Magento\Framework\DataObject();
                 $user->setPassword($value);
 
@@ -90,7 +91,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
                 $validator->isValid($user);
                 foreach ($validator->getMessages() as $message) {
-                    throw new \Exception($message);
+                    throw new ValidationException(__($message));
                 }
 
                 return $value;
@@ -143,7 +144,7 @@ private function addNotEmptyValidator(Question $question)
     {
         $question->setValidator(function ($value) {
             if (trim($value) == '') {
-                throw new \Exception('The value cannot be empty');
+                throw new ValidationException(__('The value cannot be empty'));
             }
 
             return $value;
diff --git a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
diff --git a/setup/src/Magento/Setup/Fixtures/AttributeSet/SwatchesGenerator.php b/setup/src/Magento/Setup/Fixtures/AttributeSet/SwatchesGenerator.php
diff --git a/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php b/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
diff --git a/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php b/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php

Original file line number	Diff line number	Diff line change
`@@ -289,9 +289,8 @@ protected function prepareDefaultCustomerTitle(\Magento\Backend\Model\View\Resul`
`289`	`289`	`protected function _addSessionErrorMessages($messages)`
`290`	`290`	`{`
`291`	`291`	`$messages = (array)$messages;`
`292`		`- $session = $this->_getSession();`
`293`	`292`
`294`		`- $callback = function ($error) use ($session) {`
	`293`	`+ $callback = function ($error) {`
`295`	`294`	`if (!$error instanceof Error) {`
`296`	`295`	`$error = new Error($error);`
`297`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;`
`13`	`13`	`use Magento\Framework\DataObject;`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Psr\Log\LoggerInterface;`
`16`	`15`
`17`	`16`	`class BillingTest extends TestCase`
`18`	`17`	`{`
`@@ -23,10 +22,7 @@ class BillingTest extends TestCase`
`23`	`22`
`24`	`23`	`protected function setUp(): void`
`25`	`24`	`{`
`26`		`- $logger = $this->getMockBuilder(LoggerInterface::class)`
`27`		`- ->getMock();`
`28`		`- /** @var LoggerInterface $logger */`
`29`		`- $this->testable = new Billing($logger);`
	`25`	`+ $this->testable = new Billing();`
`30`	`26`	`}`
`31`	`27`
`32`	`28`	`public function testBeforeSave()`