Merge branch '2.3-develop-php74' of github.com:magento-commerce/magento2ce into MC-40562

svera · svera · commit df19533c7b36 · 2021-02-23T09:07:08.000+01:00
diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -501,7 +501,12 @@ public function getWord()
     private function getWords()
     {
         $sessionData = $this->session->getData($this->getFormIdKey(self::SESSION_WORD));
-        return time() < $sessionData['expires'] ? $sessionData['words'] : null;
+        $words = '';
+        if (isset($sessionData['expires'], $sessionData['words']) && time() < $sessionData['expires']) {
+            $words = $sessionData['words'];
+        }
+
+        return $words;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -136,7 +136,13 @@ public function getLayer()
      */
     public function getLoadedProductCollection()
     {
-        return $this->_getProductCollection();
+        $collection = $this->_getProductCollection();
+        $categoryId = $this->getLayer()->getCurrentCategory()->getId();
+        foreach ($collection as $product) {
+            $product->setData('category_id', $categoryId);
+        }
+
+        return $collection;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -194,7 +194,12 @@ public function execute()
             $attributeCode = $model && $model->getId()
                 ? $model->getAttributeCode()
                 : $this->getRequest()->getParam('attribute_code');
-            $attributeCode = $attributeCode ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
+
+            if (!$attributeCode) {
+                $frontendLabel = $this->getRequest()->getParam('frontend_label')[0] ?? '';
+                $attributeCode = $this->generateCode($frontendLabel);
+            }
+
             $data['attribute_code'] = $attributeCode;
 
             //validate frontend_input
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
@@ -725,9 +725,14 @@ public function getIdBySku($sku)
      */
     public function getCategoryId()
     {
+        if ($this->hasData('category_id')) {
+            return $this->getData('category_id');
+        }
         $category = $this->_registry->registry('current_category');
-        if ($category && in_array($category->getId(), $this->getCategoryIds())) {
-            return $category->getId();
+        $categoryId = $category ? $category->getId() : null;
+        if ($categoryId && in_array($categoryId, $this->getCategoryIds())) {
+            $this->setData('category_id', $categoryId);
+            return $categoryId;
         }
         return false;
     }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php
@@ -10,6 +10,9 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 
+/**
+ * Controller for save creditmemo
+ */
 class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
@@ -54,6 +57,7 @@ public function __construct(
 
     /**
      * Save creditmemo
+     *
      * We can save only new creditmemo. Existing creditmemos are not editable
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward
@@ -104,7 +108,8 @@ public function execute()
                     \Magento\Sales\Api\CreditmemoManagementInterface::class
                 );
                 $creditmemo->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
-                $creditmemoManagement->refund($creditmemo, (bool)$data['do_offline']);
+                $doOffline = isset($data['do_offline']) ? (bool)$data['do_offline'] : false;
+                $creditmemoManagement->refund($creditmemo, $doOffline);
 
                 if (!empty($data['send_email'])) {
                     $this->creditmemoSender->send($creditmemo);
diff --git a/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php b/app/code/Magento/Wishlist/Model/LocaleQuantityProcessor.php
@@ -7,6 +7,8 @@
 namespace Magento\Wishlist\Model;
 
 /**
+ * Class LocaleQuantityProcessor for localized quantity to internal format
+ *
  * @api
  * @since 100.0.2
  */
@@ -43,7 +45,7 @@ public function __construct(
     public function process($qty)
     {
         $this->localFilter->setOptions(['locale' => $this->localeResolver->getLocale()]);
-        $qty = $this->localFilter->filter((double)$qty);
+        $qty = $this->localFilter->filter((string)$qty);
         if ($qty < 0) {
             $qty = null;
         }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php
@@ -109,7 +109,7 @@ public function dispatch($uri)
         $request = $this->getRequest();
         $request->setRequestUri($uri);
         if ($request->isPost()
-            && !array_key_exists('form_key', $request->getPost())
+            && !property_exists($request->getPost(), 'form_key')
         ) {
             /** @var FormKey $formKey */
             $formKey = $this->_objectManager->get(FormKey::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
@@ -92,8 +92,10 @@ public function testGetAdditionalHtml()
 
     public function testSetCollection()
     {
-        $this->_block->setCollection('test');
-        $this->assertEquals('test', $this->_block->getLoadedProductCollection());
+        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Framework\Data\Collection::class);
+        $this->_block->setCollection($collection);
+        $this->assertEquals($collection, $this->_block->getLoadedProductCollection());
     }
 
     public function testGetPriceBlockTemplate()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php
@@ -114,8 +114,8 @@ public function testGetParentIds()
         $this->assertEmpty($this->_model->getParentIds());
         $this->_model->unsetData();
         $this->_model->load(4);
-        $this->assertTrue(in_array(3, $this->_model->getParentIds()));
-        $this->assertFalse(in_array(4, $this->_model->getParentIds()));
+        $this->assertContainsEquals(3, $this->_model->getParentIds());
+        $this->assertNotContainsEquals(4, $this->_model->getParentIds());
     }
 
     public function testGetChildren()
@@ -167,9 +167,9 @@ public function testGetLevel()
     public function testGetAnchorsAbove()
     {
         $this->_model->load(4);
-        $this->assertTrue(in_array(3, $this->_model->getAnchorsAbove()));
+        $this->assertContainsEquals(3, $this->_model->getAnchorsAbove());
         $this->_model->load(5);
-        $this->assertTrue(in_array(4, $this->_model->getAnchorsAbove()));
+        $this->assertContainsEquals(4, $this->_model->getAnchorsAbove());
     }
 
     public function testGetParentCategories()
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php
@@ -85,7 +85,7 @@ public function testUrlKeyHasChangedInGlobalContext()
         ];
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
 
         $product->setData('save_rewrites_history', true);
@@ -126,7 +126,7 @@ public function testUrlKeyHasChangedInGlobalContext()
 
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
     }
 
@@ -182,7 +182,7 @@ public function testUrlKeyHasChangedInStoreviewContextWithPermanentRedirection()
 
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
     }
 
@@ -231,7 +231,7 @@ public function testUrlKeyHasChangedInStoreviewContextWithoutPermanentRedirectio
 
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php
@@ -170,11 +170,11 @@ public function testAddProductFromUnavailableWebsite(): void
     public function testAddProductWithUnavailableQty(): void
     {
         $product = $this->productRepository->get('simple-1');
-        $postData = ['product' => $product->getId(), 'qty' => 1000];
+        $postData = ['product' => $product->getId(), 'qty' => '1000'];
         $this->dispatchAddToCartRequest($postData);
-        $this->assertRedirect($this->stringContains($product->getProductUrl()));
         $message = (string)__('The requested qty is not available');
         $this->assertSessionMessages($this->containsEqual($message), MessageInterface::TYPE_ERROR);
+        $this->assertRedirect($this->stringContains($product->getProductUrl()));
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php
@@ -152,11 +152,7 @@ public function testCreateCustomerErrors(array $postData, array $expectedData, a
         );
         $customerFormData = $this->session->getCustomerFormData();
         unset($customerFormData['form_key']);
-        if (!empty($expectedData) && !empty($customerFormData)) {
-            $expectedData = array_shift($expectedData);
-            $customerFormData = array_shift($customerFormData);
-        }
-        $this->assertEmpty(array_diff_assoc($expectedData, $customerFormData));
+        $this->assertEquals($expectedData, $customerFormData);
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
     }
 
@@ -389,12 +385,9 @@ public function testCreateSameEmailFormatDateError(): void
         $customerFormData = $this->session->getCustomerFormData();
         $this->assertNotEmpty($customerFormData);
         unset($customerFormData['form_key']);
-        if (!empty($customerFormData)) {
-            $customerFormData = array_shift($customerFormData);
-            $postFormatted = array_shift($postFormatted);
-        }
-        $this->assertEmpty(
-            array_diff_assoc($postFormatted, $customerFormData),
+        $this->assertEquals(
+            $postFormatted,
+            $customerFormData,
             'Customer form data should be formatted'
         );
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
@@ -115,20 +115,6 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * Test constructor
-     *
-     * @magentoDataFixture Magento/Customer/_files/import_export/customer_with_addresses.php
-     */
-    public function testConstruct()
-    {
-        $this->assertObjectHasAttribute('_entityTable', $this->_entityAdapter, 'Entity table must not be empty');
-        $this->assertObjectHasAttribute('errorMessageTemplates', $this->_entityAdapter, 'Templates must not be empty');
-        $this->assertObjectHasAttribute('_attributes', $this->_entityAdapter, 'Attributes must not be empty');
-        $this->assertObjectHasAttribute('_countryRegions', $this->_entityAdapter, 'Country regions must not be empty');
-        $this->assertObjectHasAttribute('_regions', $this->_entityAdapter, 'Regions must not be empty');
-    }
-
     /**
      * Test _saveAddressEntity
      *
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Setup/AddOptionToAttributeTest.php b/dev/tests/integration/testsuite/Magento/Eav/Setup/AddOptionToAttributeTest.php
@@ -100,7 +100,7 @@ public function testAddNewOptions()
         $optionsAfter = $this->getAttributeOptions(false);
         $this->assertEquals(count($optionsBefore) + 2, count($optionsAfter));
         foreach ($optionsBefore as $option) {
-            $this->assertTrue(in_array($option, $optionsAfter));
+            $this->assertContainsEquals($option, $optionsAfter);
         }
     }
 
@@ -119,7 +119,7 @@ public function testAddExistingOptionsWithTheSameSortOrder()
         $optionsAfter = $this->getAttributeOptions();
         $this->assertEquals(count($optionsBefore), count($optionsAfter));
         foreach ($optionsBefore as $option) {
-            $this->assertTrue(in_array($option, $optionsAfter));
+            $this->assertContainsEquals($option, $optionsAfter);
         }
     }
 
@@ -202,7 +202,7 @@ public function testDeleteOption()
         );
         $updatedOptions = $this->getAttributeOptions();
         foreach ($updatedOptions as $option) {
-            $this->assertTrue(in_array($option, $optionsBefore));
+            $this->assertContainsEquals($option, $optionsBefore);
         }
         $this->assertEquals(count($updatedOptions), count($optionsBefore) - 1);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Newsletter\Model;
 
+use Laminas\Mail\Headers;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Api\AccountManagementInterface;
@@ -120,12 +121,27 @@ public function testUnsubscribeSubscribe(): void
         $subscriber = $this->subscriberFactory->create();
         $this->assertSame($subscriber, $subscriber->loadByCustomerId(1));
         $this->assertEquals($subscriber, $subscriber->unsubscribe());
-        $this->assertStringContainsString('You have been unsubscribed from the newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage());
+        $this->assertStringContainsString(
+            'You have been unsubscribed from the newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         // Subscribe and verify
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('customer@example.com'));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertStringContainsString('You have been successfully subscribed to our newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage());
+        $this->assertStringContainsString(
+            'You have been successfully subscribed to our newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
+    }
+
+    /**
+     * @param TransportBuilderMock $transportBuilderMock
+     * @return string
+     */
+    private function getFilteredRawMessage(TransportBuilderMock $transportBuilderMock): string
+    {
+        return str_replace('=' . Headers::EOL, '', $transportBuilderMock->getSentMessage()->getRawMessage());
     }
 
     /**
@@ -141,11 +157,17 @@ public function testUnsubscribeSubscribeByCustomerId(): void
         // Unsubscribe and verify
         $this->assertSame($subscriber, $subscriber->unsubscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertStringContainsString('You have been unsubscribed from the newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage());
+        $this->assertStringContainsString(
+            'You have been unsubscribed from the newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
         // Subscribe and verify
         $this->assertSame($subscriber, $subscriber->subscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertStringContainsString('You have been successfully subscribed to our newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage());
+        $this->assertStringContainsString(
+            'You have been successfully subscribed to our newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
     }
 
     /**
@@ -162,7 +184,10 @@ public function testConfirm(): void
         $subscriber->subscribe($customerEmail);
         $subscriber->loadByEmail($customerEmail);
         $subscriber->confirm($subscriber->getSubscriberConfirmCode());
-        $this->assertStringContainsString('You have been successfully subscribed to our newsletter.', $this->transportBuilder->getSentMessage()->getRawMessage());
+        $this->assertStringContainsString(
+            'You have been successfully subscribed to our newsletter.',
+            $this->getFilteredRawMessage($this->transportBuilder)
+        );
     }
 
     /**
@@ -184,6 +209,8 @@ public function testSubscribeUnconfirmedCustomerWithSubscription(): void
      * @magentoDataFixture Magento/Customer/_files/unconfirmed_customer.php
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSubscribeUnconfirmedCustomerWithoutSubscription(): void
     {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/ProductPageViewTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/ProductPageViewTest.php
diff --git a/lib/internal/Magento/Framework/Archive/Tar.php b/lib/internal/Magento/Framework/Archive/Tar.php
diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,12 @@ public function getWord()`
`501`	`501`	`private function getWords()`
`502`	`502`	`{`
`503`	`503`	`$sessionData = $this->session->getData($this->getFormIdKey(self::SESSION_WORD));`
`504`		`- return time() < $sessionData['expires'] ? $sessionData['words'] : null;`
	`504`	`+ $words = '';`
	`505`	`+ if (isset($sessionData['expires'], $sessionData['words']) && time() < $sessionData['expires']) {`
	`506`	`+ $words = $sessionData['words'];`
	`507`	`+ }`
	`508`	`+`
	`509`	`+ return $words;`
`505`	`510`	`}`
`506`	`511`
`507`	`512`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,13 @@ public function getLayer()`
`136`	`136`	`*/`
`137`	`137`	`public function getLoadedProductCollection()`
`138`	`138`	`{`
`139`		`- return $this->_getProductCollection();`
	`139`	`+ $collection = $this->_getProductCollection();`
	`140`	`+ $categoryId = $this->getLayer()->getCurrentCategory()->getId();`
	`141`	`+ foreach ($collection as $product) {`
	`142`	`+ $product->setData('category_id', $categoryId);`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ return $collection;`
`140`	`146`	`}`
`141`	`147`
`142`	`148`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -725,9 +725,14 @@ public function getIdBySku($sku)`
`725`	`725`	`*/`
`726`	`726`	`public function getCategoryId()`
`727`	`727`	`{`
	`728`	`+ if ($this->hasData('category_id')) {`
	`729`	`+ return $this->getData('category_id');`
	`730`	`+ }`
`728`	`731`	`$category = $this->_registry->registry('current_category');`
`729`		`- if ($category && in_array($category->getId(), $this->getCategoryIds())) {`
`730`		`- return $category->getId();`
	`732`	`+ $categoryId = $category ? $category->getId() : null;`
	`733`	`+ if ($categoryId && in_array($categoryId, $this->getCategoryIds())) {`
	`734`	`+ $this->setData('category_id', $categoryId);`
	`735`	`+ return $categoryId;`
`731`	`736`	`}`
`732`	`737`	`return false;`
`733`	`738`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,10 @@ public function testGetAdditionalHtml()`
`92`	`92`
`93`	`93`	`public function testSetCollection()`
`94`	`94`	`{`
`95`		`- $this->_block->setCollection('test');`
`96`		`- $this->assertEquals('test', $this->_block->getLoadedProductCollection());`
	`95`	`+ $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()`
	`96`	`+ ->create(\Magento\Framework\Data\Collection::class);`
	`97`	`+ $this->_block->setCollection($collection);`
	`98`	`+ $this->assertEquals($collection, $this->_block->getLoadedProductCollection());`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`public function testGetPriceBlockTemplate()`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testUrlKeyHasChangedInGlobalContext()`
`85`	`85`	`];`
`86`	`86`	`$actual = $this->getActualResults($productFilter);`
`87`	`87`	`foreach ($expected as $row) {`
`88`		`- $this->assertTrue(in_array($row, $actual));`
	`88`	`+ $this->assertContainsEquals($row, $actual);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`$product->setData('save_rewrites_history', true);`
`@@ -126,7 +126,7 @@ public function testUrlKeyHasChangedInGlobalContext()`
`126`	`126`
`127`	`127`	`$actual = $this->getActualResults($productFilter);`
`128`	`128`	`foreach ($expected as $row) {`
`129`		`- $this->assertTrue(in_array($row, $actual));`
	`129`	`+ $this->assertContainsEquals($row, $actual);`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`@@ -182,7 +182,7 @@ public function testUrlKeyHasChangedInStoreviewContextWithPermanentRedirection()`
`182`	`182`
`183`	`183`	`$actual = $this->getActualResults($productFilter);`
`184`	`184`	`foreach ($expected as $row) {`
`185`		`- $this->assertTrue(in_array($row, $actual));`
	`185`	`+ $this->assertContainsEquals($row, $actual);`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`@@ -231,7 +231,7 @@ public function testUrlKeyHasChangedInStoreviewContextWithoutPermanentRedirectio`
`231`	`231`
`232`	`232`	`$actual = $this->getActualResults($productFilter);`
`233`	`233`	`foreach ($expected as $row) {`
`234`		`- $this->assertTrue(in_array($row, $actual));`
	`234`	`+ $this->assertContainsEquals($row, $actual);`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`	`}`