Merge remote-tracking branch 'performance/ims-phase1' into CABPI-324

andimov · andimov · commit 5c90c1065360 · 2022-05-18T03:15:02.000-05:00
diff --git a/app/code/Magento/AdminAdobeIms/Plugin/ResetAttemptForBackendObserverPlugin.php b/app/code/Magento/AdminAdobeIms/Plugin/ResetAttemptForBackendObserverPlugin.php
@@ -33,12 +33,13 @@ public function __construct(ImsConfig $adminImsConfig)
      * @param ResetAttemptForBackendObserver $subject
      * @param callable $proceed
      * @param Observer $observer
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundExecute(ResetAttemptForBackendObserver $subject, callable $proceed, Observer $observer)
+    public function aroundExecute(ResetAttemptForBackendObserver $subject, callable $proceed, Observer $observer): void
     {
         if (!$this->adminImsConfig->enabled()) {
-            return $proceed($observer);
+            $proceed($observer);
         }
     }
 }
diff --git a/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/AdminAdobeImsEnabledInfoCommandTest.xml b/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/AdminAdobeImsEnabledInfoCommandTest.xml
@@ -16,6 +16,9 @@
             <description value="Runs bin/magento admin:adobe-ims info command"/>
             <severity value="MINOR"/>
             <group value="admin_ims"/>
+            <skip>
+                <issueId value="DEPRECATED">Temp disable</issueId>
+            </skip>
             <testCaseId value="CABPI-186"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/AdminSignInWithAdobeIdTest.xml b/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/AdminSignInWithAdobeIdTest.xml
@@ -16,6 +16,9 @@
             <severity value="CRITICAL"/>
             <group value="admin_ims"/>
             <testCaseId value="CABPI-102"/>
+            <skip>
+                <issueId value="DEPRECATED">Temp disable</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminEnableAdobeImsActionGroup" stepKey="enableAdminAdobeImsModule" />
diff --git a/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/CallbackWithoutCodeRedirectsToAdminLoginTest.xml b/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/CallbackWithoutCodeRedirectsToAdminLoginTest.xml
@@ -15,6 +15,9 @@
             <description value="ImsCallback Controller redirects to admin login when no code is given"/>
             <severity value="CRITICAL"/>
             <group value="admin_ims"/>
+            <skip>
+                <issueId value="DEPRECATED">Temp disable</issueId>
+            </skip>
             <testCaseId value="CABPI-205"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/CreateNewUserWithoutPasswordTest.xml b/app/code/Magento/AdminAdobeIms/Test/Mftf/Test/CreateNewUserWithoutPasswordTest.xml
@@ -15,6 +15,9 @@
             <description value="Create a new admin user without password when AdminAdobeImsModule is enabled"/>
             <severity value="CRITICAL"/>
             <group value="admin_ims"/>
+            <skip>
+                <issueId value="DEPRECATED">Temp disable</issueId>
+            </skip>
             <testCaseId value="CABPI-227"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/AdminAdobeIms/etc/webapi_rest/di.xml b/app/code/Magento/AdminAdobeIms/etc/webapi_rest/di.xml
@@ -11,7 +11,7 @@
             <argument name="userContexts" xsi:type="array">
                 <item name="adobeImsTokenUserContext" xsi:type="array">
                     <item name="type" xsi:type="object">Magento\AdminAdobeIms\Model\Authorization\AdobeImsTokenUserContext</item>
-                    <item name="sortOrder" xsi:type="string">5</item>
+                    <item name="sortOrder" xsi:type="string">90</item>
                 </item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/AdminAdobeIms/etc/webapi_soap/di.xml b/app/code/Magento/AdminAdobeIms/etc/webapi_soap/di.xml
@@ -11,7 +11,7 @@
             <argument name="userContexts" xsi:type="array">
                 <item name="adobeImsTokenUserContext" xsi:type="array">
                     <item name="type" xsi:type="object">Magento\AdminAdobeIms\Model\Authorization\AdobeImsTokenUserContext</item>
-                    <item name="sortOrder" xsi:type="string">3</item>
+                    <item name="sortOrder" xsi:type="string">90</item>
                 </item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Captcha\Observer;
 
-use Magento\Captcha\Model\ResourceModel\Log;
 use Magento\Captcha\Model\ResourceModel\LogFactory;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
@@ -34,11 +33,11 @@ public function __construct(
      * Reset Attempts For Backend
      *
      * @param Observer $observer
-     * @return Log
+     * @return void
      * @throws LocalizedException
      */
     public function execute(Observer $observer)
     {
-        return $this->resLogFactory->create()->deleteUserAttempts($observer->getUser()->getUsername());
+        $this->resLogFactory->create()->deleteUserAttempts($observer->getUser()->getUsername());
     }
 }
diff --git a/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForBackendObserverTest.php b/app/code/Magento/Captcha/Test/Unit/Observer/ResetAttemptForBackendObserverTest.php
@@ -51,6 +51,6 @@ public function testExecuteExpectsDeleteUserAttemptsCalled()
             ResetAttemptForBackendObserver::class,
             ['resLogFactory' => $resLogFactoryMock]
         );
-        $this->assertInstanceOf(Log::class, $observer->execute($eventObserverMock));
+        $observer->execute($eventObserverMock);
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -40,8 +40,6 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
     protected $_useLinkForAsLowAs = false;
 
     /**
-     * Customer id
-     *
      * @var null|int
      */
     protected $_customerId = null;
@@ -52,22 +50,16 @@ class ListCompare extends \Magento\Catalog\Block\Product\AbstractProduct
     protected $httpContext;
 
     /**
-     * Customer visitor
-     *
      * @var \Magento\Customer\Model\Visitor
      */
     protected $_customerVisitor;
 
     /**
-     * Catalog product visibility
-     *
      * @var \Magento\Catalog\Model\Product\Visibility
      */
     protected $_catalogProductVisibility;
 
     /**
-     * Item collection factory
-     *
      * @var \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory
      */
     protected $_itemCollectionFactory;
@@ -205,6 +197,9 @@ public function getProductAttributeValue($product, $attribute)
         } else {
             $value = $product->getData($attribute->getAttributeCode());
         }
+        if (is_array($value)) {
+            return __('N/A');
+        }
         return (string)$value == '' ? __('No') : $value;
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/Compare/ListCompareTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/Compare/ListCompareTest.php
@@ -10,6 +10,8 @@
 use Magento\Catalog\Block\Product\Compare\ListCompare;
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Framework\Pricing\Render;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Layout;
@@ -50,6 +52,48 @@ protected function tearDown(): void
         $this->block = null;
     }
 
+    /**
+     * @dataProvider attributeDataProvider
+     * @param array $attributeData
+     * @param string $expectedResult
+     */
+    public function testProductAttributeValue($attributeData, $expectedResult)
+    {
+        $attribute = $this->getMockBuilder(AttributeInterface::class)
+            ->addMethods(['getAttributeCode', 'getSourceModel', 'getFrontendInput', 'getFrontend'])
+            ->getMockForAbstractClass();
+        $frontEndModel = $this->createPartialMock(AbstractFrontend::class, ['getValue']);
+        $productMock = $this->createPartialMock(Product::class, ['getId', 'getData', 'hasData']);
+        $productMock->expects($this->any())
+            ->method('hasData')
+            ->with($attributeData['attribute_code'])
+            ->willReturn(true);
+        $productMock->expects($this->any())
+            ->method('getData')
+            ->with($attributeData['attribute_code'])
+            ->willReturn($attributeData['attribute_value']);
+        $attribute->expects($this->any())
+            ->method('getAttributeCode')
+            ->willReturn($attributeData['attribute_code']);
+        $attribute->expects($this->any())
+            ->method('getSourceModel')
+            ->willReturn($attributeData['source_model']);
+        $attribute->expects($this->any())
+            ->method('getFrontendInput')
+            ->willReturn($attributeData['frontend_input']);
+        $frontEndModel->expects($this->any())
+            ->method('getValue')
+            ->with($productMock)
+            ->willReturn($attributeData['attribute_value']);
+        $attribute->expects($this->any())
+            ->method('getFrontend')
+            ->willReturn($frontEndModel);
+        $this->assertEquals(
+            $expectedResult,
+            $this->block->getProductAttributeValue($productMock, $attribute)
+        );
+    }
+
     public function testGetProductPrice()
     {
         //Data
@@ -84,4 +128,31 @@ public function testGetProductPrice()
 
         $this->assertEquals($expectedResult, $this->block->getProductPrice($product, '-compare-list-top'));
     }
+
+    /**
+     * @return array
+     */
+    public function attributeDataProvider(): array
+    {
+        return [
+            [
+                'attributeData' => [
+                    'attribute_code' => 'tier_price',
+                    'source_model' => null,
+                    'frontend_input' => 'text',
+                    'attribute_value' => []
+                ],
+                'expectedResult' => __('N/A')
+            ],
+            [
+                'attributeData' => [
+                    'attribute_code' => 'special_price',
+                    'source_model' => null,
+                    'frontend_input' => 'decimal',
+                    'attribute_value' => 50.00
+                ],
+                'expectedResult' => '50.00'
+            ]
+        ];
+    }
 }
diff --git a/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php b/app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php
@@ -8,55 +8,27 @@
 namespace Magento\Multishipping\Model\Cart\Controller;
 
 use Magento\Checkout\Controller\Cart;
-use Magento\Checkout\Model\Session;
-use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Multishipping\Model\DisableMultishipping;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Multishipping\Model\Cart\MultishippingClearItemAddress;
 
 /**
  * Cleans shipping addresses and item assignments after MultiShipping flow
  */
 class CartPlugin
 {
     /**
-     * @var CartRepositoryInterface
+     * @var MultishippingClearItemAddress
      */
-    private $cartRepository;
+    private $multishippingClearItemAddress;
 
     /**
-     * @var Session
-     */
-    private $checkoutSession;
-
-    /**
-     * @var AddressRepositoryInterface
-     */
-    private $addressRepository;
-
-    /**
-     * @var DisableMultishipping
-     */
-    private $disableMultishipping;
-
-    /**
-     * @param CartRepositoryInterface $cartRepository
-     * @param Session $checkoutSession
-     * @param AddressRepositoryInterface $addressRepository
-     * @param DisableMultishipping $disableMultishipping
+     * @param MultishippingClearItemAddress $multishippingClearItemAddress
      */
     public function __construct(
-        CartRepositoryInterface $cartRepository,
-        Session $checkoutSession,
-        AddressRepositoryInterface $addressRepository,
-        DisableMultishipping $disableMultishipping
+        MultishippingClearItemAddress $multishippingClearItemAddress
     ) {
-        $this->cartRepository = $cartRepository;
-        $this->checkoutSession = $checkoutSession;
-        $this->addressRepository = $addressRepository;
-        $this->disableMultishipping = $disableMultishipping;
+        $this->multishippingClearItemAddress = $multishippingClearItemAddress;
     }
 
     /**
@@ -70,62 +42,6 @@ public function __construct(
      */
     public function beforeDispatch(Cart $subject, RequestInterface $request)
     {
-        /** @var Quote $quote */
-        $quote = $this->checkoutSession->getQuote();
-        $isMultipleShippingAddressesPresent = $quote->isMultipleShippingAddresses();
-        if ($isMultipleShippingAddressesPresent || $this->isDisableMultishippingRequired($request, $quote)) {
-            $this->disableMultishipping->execute($quote);
-            foreach ($quote->getAllShippingAddresses() as $address) {
-                $quote->removeAddress($address->getId());
-            }
-
-            $shippingAddress = $quote->getShippingAddress();
-            $defaultShipping = $quote->getCustomer()->getDefaultShipping();
-            if ($defaultShipping) {
-                $defaultCustomerAddress = $this->addressRepository->getById($defaultShipping);
-                $shippingAddress->importCustomerAddressData($defaultCustomerAddress);
-            }
-            if ($isMultipleShippingAddressesPresent) {
-                $this->checkoutSession->setMultiShippingAddressesFlag(true);
-            }
-            $this->cartRepository->save($quote);
-        } elseif ($this->disableMultishipping->execute($quote) && $this->isVirtualItemInQuote($quote)) {
-            $quote->setTotalsCollectedFlag(false);
-            $this->cartRepository->save($quote);
-        }
-    }
-
-    /**
-     * Checks whether quote has virtual items
-     *
-     * @param Quote $quote
-     * @return bool
-     */
-    private function isVirtualItemInQuote(Quote $quote): bool
-    {
-        $items = $quote->getItems();
-        if (!empty($items)) {
-            foreach ($items as $item) {
-                if ($item->getIsVirtual()) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if we have to disable multishipping mode depends on the request action name
-     *
-     * We should not disable multishipping mode if we are adding a new product item to the existing quote
-     *
-     * @param RequestInterface $request
-     * @param Quote $quote
-     * @return bool
-     */
-    private function isDisableMultishippingRequired(RequestInterface $request, Quote $quote): bool
-    {
-        return $request->getActionName() !== "add" && $quote->getIsMultiShipping();
+        $this->multishippingClearItemAddress->clearAddressItem($subject, $request);
     }
 }
diff --git a/app/code/Magento/Multishipping/Model/Cart/Controller/MiniCartPlugin.php b/app/code/Magento/Multishipping/Model/Cart/Controller/MiniCartPlugin.php
diff --git a/app/code/Magento/Multishipping/Model/Cart/MultishippingClearItemAddress.php b/app/code/Magento/Multishipping/Model/Cart/MultishippingClearItemAddress.php
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Cart/MultishippingClearItemAddressTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Cart/MultishippingClearItemAddressTest.php
diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceTest.xml
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,13 @@ public function __construct(ImsConfig $adminImsConfig)`
`33`	`33`	`* @param ResetAttemptForBackendObserver $subject`
`34`	`34`	`* @param callable $proceed`
`35`	`35`	`* @param Observer $observer`
	`36`	`+ * @return void`
`36`	`37`	`* @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`37`	`38`	`*/`
`38`		`- public function aroundExecute(ResetAttemptForBackendObserver $subject, callable $proceed, Observer $observer)`
	`39`	`+ public function aroundExecute(ResetAttemptForBackendObserver $subject, callable $proceed, Observer $observer): void`
`39`	`40`	`{`
`40`	`41`	`if (!$this->adminImsConfig->enabled()) {`
`41`		`- return $proceed($observer);`
	`42`	`+ $proceed($observer);`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\Captcha\Observer;`
`7`	`7`
`8`		`-use Magento\Captcha\Model\ResourceModel\Log;`
`9`	`8`	`use Magento\Captcha\Model\ResourceModel\LogFactory;`
`10`	`9`	`use Magento\Framework\Event\Observer;`
`11`	`10`	`use Magento\Framework\Event\ObserverInterface;`
`@@ -34,11 +33,11 @@ public function __construct(`
`34`	`33`	`* Reset Attempts For Backend`
`35`	`34`	`*`
`36`	`35`	`* @param Observer $observer`
`37`		`- * @return Log`
	`36`	`+ * @return void`
`38`	`37`	`* @throws LocalizedException`
`39`	`38`	`*/`
`40`	`39`	`public function execute(Observer $observer)`
`41`	`40`	`{`
`42`		`- return $this->resLogFactory->create()->deleteUserAttempts($observer->getUser()->getUsername());`
	`41`	`+ $this->resLogFactory->create()->deleteUserAttempts($observer->getUser()->getUsername());`
`43`	`42`	`}`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ public function testExecuteExpectsDeleteUserAttemptsCalled()`
`51`	`51`	`ResetAttemptForBackendObserver::class,`
`52`	`52`	`['resLogFactory' => $resLogFactoryMock]`
`53`	`53`	`);`
`54`		`- $this->assertInstanceOf(Log::class, $observer->execute($eventObserverMock));`
	`54`	`+ $observer->execute($eventObserverMock);`
`55`	`55`	`}`
`56`	`56`	`}`