Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into PR-2021-20-08

chittima · chittima · commit 460b32f69612 · 2021-09-22T14:06:57.000-05:00
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
@@ -33,7 +33,7 @@ <h3 translate="'Details'"></h3>
                         <each args="{ data: value, as: 'item'}">
                           <div class="value">
                             <a attr="href: $parents[1].getFilterUrl(item.link)"
-                               text="$parents[1].getUsedInText(item)"></a></br>
+                               text="$parents[1].getUsedInText(item)"></a><br/>
                           </div>
                         </each>
                       </if>
diff --git a/app/code/Magento/Quote/Model/Quote/QuantityCollector.php b/app/code/Magento/Quote/Model/Quote/QuantityCollector.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Quote;
+
+use Magento\Quote\Model\Quote;
+
+class QuantityCollector
+{
+    /**
+     * Collect items qty
+     *
+     * @param Quote $quote
+     * @return Quote
+     */
+    public function collectItemsQtys(Quote $quote)
+    {
+        $quoteItems = $quote->getAllVisibleItems();
+        $quote->setItemsCount(0);
+        $quote->setItemsQty(0);
+        $quote->setVirtualItemsQty(0);
+
+        foreach ($quoteItems as $item) {
+            if ($item->getParentItem()) {
+                continue;
+            }
+
+            $children = $item->getChildren();
+            if ($children && $item->isShipSeparately()) {
+                foreach ($children as $child) {
+                    if ($child->getProduct()->getIsVirtual()) {
+                        $quote->setVirtualItemsQty($quote->getVirtualItemsQty() + $child->getQty() * $item->getQty());
+                    }
+                }
+            }
+
+            if ($item->getProduct()->getIsVirtual()) {
+                $quote->setVirtualItemsQty($quote->getVirtualItemsQty() + $item->getQty());
+            }
+            $quote->setItemsCount($quote->getItemsCount() + 1);
+            $quote->setItemsQty((float)$quote->getItemsQty() + $item->getQty());
+        }
+
+        return $quote;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
@@ -7,12 +7,13 @@
 
 namespace Magento\Quote\Model\Quote;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Quote\Model\Quote\Address\Total\Collector;
 use Magento\Quote\Model\Quote\Address\Total\CollectorFactory;
 use Magento\Quote\Model\Quote\Address\Total\CollectorInterface;
 
 /**
- * Class TotalsCollector
+ * Composite object for collecting total.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TotalsCollector
@@ -68,6 +69,11 @@ class TotalsCollector
      */
     protected $shippingAssignmentFactory;
 
+    /**
+     * @var QuantityCollector
+     */
+    private $quantityCollector;
+
     /**
      * @param Collector $totalCollector
      * @param CollectorFactory $totalCollectorFactory
@@ -78,6 +84,7 @@ class TotalsCollector
      * @param \Magento\Quote\Model\ShippingFactory $shippingFactory
      * @param \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory
      * @param \Magento\Quote\Model\QuoteValidator $quoteValidator
+     * @param QuantityCollector $quantityCollector
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -89,7 +96,8 @@ public function __construct(
         \Magento\Quote\Model\Quote\TotalsCollectorList $collectorList,
         \Magento\Quote\Model\ShippingFactory $shippingFactory,
         \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory,
-        \Magento\Quote\Model\QuoteValidator $quoteValidator
+        \Magento\Quote\Model\QuoteValidator $quoteValidator,
+        QuantityCollector $quantityCollector = null
     ) {
         $this->totalCollector = $totalCollector;
         $this->totalCollectorFactory = $totalCollectorFactory;
@@ -100,6 +108,8 @@ public function __construct(
         $this->shippingFactory = $shippingFactory;
         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
         $this->quoteValidator = $quoteValidator;
+        $this->quantityCollector = $quantityCollector
+            ?: ObjectManager::getInstance()->get(QuantityCollector::class);
     }
 
     /**
@@ -132,7 +142,7 @@ public function collect(\Magento\Quote\Model\Quote $quote)
             ['quote' => $quote]
         );
 
-        $this->_collectItemsQtys($quote);
+        $this->quantityCollector->collectItemsQtys($quote);
 
         $total->setSubtotal(0);
         $total->setBaseSubtotal(0);
@@ -206,6 +216,8 @@ protected function _validateCouponCode(\Magento\Quote\Model\Quote $quote)
      *
      * @param \Magento\Quote\Model\Quote $quote
      * @return $this
+     * @deprecated
+     * @see \Magento\Quote\Model\Quote\QuantityCollector
      */
     protected function _collectItemsQtys(\Magento\Quote\Model\Quote $quote)
     {
@@ -273,7 +285,7 @@ public function collectAddressTotals(
             /** @var CollectorInterface $collector */
             $collector->collect($quote, $shippingAssignment, $total);
         }
-        
+
         $this->eventManager->dispatch(
             'sales_quote_address_collect_totals_after',
             [
diff --git a/app/code/Magento/Security/Model/AdminSessionsManager.php b/app/code/Magento/Security/Model/AdminSessionsManager.php
@@ -8,7 +8,7 @@
 namespace Magento\Security\Model;
 
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
-use \Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
+use Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
 
 /**
  * Admin Sessions Manager Model
@@ -174,8 +174,15 @@ public function processLogout()
     public function getCurrentSession()
     {
         if (!$this->currentSession) {
+            $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
+            if (!$adminSessionInfoId) {
+                $this->createNewSession();
+                $adminSessionInfoId = $this->authSession->getAdminSessionInfoId();
+                $this->logoutOtherUserSessions();
+            }
+
             $this->currentSession = $this->adminSessionInfoFactory->create();
-            $this->currentSession->load($this->authSession->getAdminSessionInfoId(), 'id');
+            $this->currentSession->load($adminSessionInfoId, 'id');
         }
 
         return $this->currentSession;
diff --git a/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php b/app/code/Magento/Security/Test/Unit/Model/AdminSessionsManagerTest.php
@@ -335,9 +335,32 @@ public function testCleanExpiredSessions()
      */
     public function testGetLogoutReasonMessage($expectedResult, $sessionStatus)
     {
-        $this->adminSessionInfoFactoryMock->expects($this->once())
+        $this->adminSessionInfoFactoryMock->expects($this->exactly(2))
             ->method('create')
             ->willReturn($this->currentSessionMock);
+        $this->authSessionMock->expects($this->any())
+            ->method('getUser')
+            ->willReturn($this->userMock);
+        $this->currentSessionMock->expects($this->once())
+            ->method('setData')
+            ->willReturn($this->currentSessionMock);
+        $this->currentSessionMock->expects($this->once())
+            ->method('save')
+            ->willReturn($this->currentSessionMock);
+        $this->adminSessionInfoCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->adminSessionInfoCollectionMock);
+        $this->adminSessionInfoCollectionMock->expects($this->once())->method('filterByUser')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('filterExpiredSessions')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('loadData')
+            ->willReturnSelf();
+        $this->adminSessionInfoCollectionMock->expects($this->once())
+            ->method('setDataToAll')
+            ->willReturnSelf();
         $this->currentSessionMock->expects($this->once())
             ->method('getStatus')
             ->willReturn($sessionStatus);
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
@@ -24,7 +24,7 @@ define([
      * Detect browser transition end event.
      * @return {String|undefined} - transition event.
      */
-    var transitionEvent =  (function () {
+    var transitionEvent = (function () {
         var transition,
             elementStyle = document.createElement('div').style,
             transitions = {
@@ -39,7 +39,39 @@ define([
                 return transitions[transition];
             }
         }
-    })();
+    })(),
+
+    /**
+     * Implementation of zIndex used from jQuery UI
+     * @param {Element} elem
+     * @private
+     */
+    getZIndex = function (elem) {
+        var position, zIndex;
+
+        /* eslint-disable max-depth */
+        while (elem.length && elem[ 0 ] !== document) {
+            // Ignore z-index if position is set to a value where z-index is ignored by the browser
+            // This makes behavior of this function consistent across browsers
+            // WebKit always returns auto if the element is positioned
+            position = elem.css('position');
+
+            if (position === 'absolute' || position === 'relative' || position === 'fixed') {
+                // IE returns 0 when zIndex is not specified
+                // other browsers return a string
+                // we ignore the case of nested elements with an explicit value of 0
+                zIndex = parseInt(elem.css('zIndex'), 10);
+
+                if (!isNaN(zIndex) && zIndex !== 0) {
+                    return zIndex;
+                }
+            }
+            elem = elem.parent();
+        }
+
+        return 0;
+        /* eslint-enable max-depth */
+    };
 
     /**
      * Modal Window Widget
@@ -341,18 +373,17 @@ define([
          * Set z-index and margin for modal and overlay.
          */
         _setActive: function () {
-            var zIndex = this.modal.zIndex(),
+            var zIndex = getZIndex(this.modal),
                 baseIndex = zIndex + this._getVisibleCount();
 
             if (this.modal.data('active')) {
                 return;
             }
-
             this.modal.data('active', true);
 
-            this.overlay.zIndex(++baseIndex);
-            this.prevOverlayIndex = this.overlay.zIndex();
-            this.modal.zIndex(this.overlay.zIndex() + 1);
+            this.overlay.css('z-index', ++baseIndex);
+            this.prevOverlayIndex = baseIndex;
+            this.modal.css('z-index', baseIndex + 1);
 
             if (this._getVisibleSlideCount()) {
                 this.modal.css('marginLeft', this.options.modalLeftMargin * this._getVisibleSlideCount());
@@ -367,7 +398,7 @@ define([
             this.modal.data('active', false);
 
             if (this.overlay) {
-                this.overlay.zIndex(this.prevOverlayIndex - 1);
+                this.overlay.css('z-index', this.prevOverlayIndex - 1);
             }
         },
 
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
@@ -39,6 +39,7 @@ protected function setUp(): void
             ->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
         $this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);
         $this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);
+        $this->authSession->setUser($this->objectManager->create(\Magento\User\Model\User::class));
         $this->auth->setAuthStorage($this->authSession);
         $this->auth->logout();
     }
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
@@ -99,6 +99,7 @@ public function run(array $whiteList)
         $settings['standards'] = [$this->rulesetDir];
         $settings['extensions'] = $this->extensions;
         $settings['reports']['full'] = $this->reportFile;
+        $settings['reportWidth'] = 120;
         $this->wrapper->setSettings($settings);
 
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
@@ -28,7 +28,7 @@ class CodeSnifferTest extends \PHPUnit\Framework\TestCase
     const RULE_SET = 'some/ruleset/directory';
 
     /**
-     * Report file
+     * Report file path
      */
     const REPORT_FILE = 'some/report/file.xml';
 
@@ -52,6 +52,7 @@ public function testRun()
             'standards' => [self::RULE_SET],
             'extensions' => $extensions,
             'reports' => ['full' => self::REPORT_FILE],
+            'reportWidth' => 120
         ];
 
         $this->_tool->setExtensions($extensions);
diff --git a/dev/tests/static/testsuite/Magento/Test/Html/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Html/LiveCodeTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Test\Html;
 
+use Magento\Framework\App\Utility\Files;
 use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
 use Magento\Test\Php\LiveCodeTest as PHPCodeTest;
 use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
@@ -46,12 +47,33 @@ public function testCodeStyle(): void
         $reportFile = self::$reportDir . '/html_report.txt';
         $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
         $codeSniffer->setExtensions([self::FILE_EXTENSION]);
-        $result = $codeSniffer->run(PHPCodeTest::getWhitelist([self::FILE_EXTENSION], __DIR__, __DIR__));
+        $fileList =  $this->isFullScan() ? array_column(Files::init()->getStaticHtmlFiles(), '0')
+            : PHPCodeTest::getWhitelist([self::FILE_EXTENSION], __DIR__, __DIR__);
+        $result = $codeSniffer->run($fileList);
         $report = file_exists($reportFile) ? file_get_contents($reportFile) : '';
         $this->assertEquals(
             0,
             $result,
             "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . $report
         );
     }
+
+    /**
+     * Returns whether a full scan was requested.
+     *
+     * This can be set in the `phpunit.xml` used to run these test cases, by setting the constant
+     * `TESTCODESTYLE_IS_FULL_SCAN` to `1`, e.g.:
+     * ```xml
+     * <php>
+     *     <!-- TESTCODESTYLE_IS_FULL_SCAN - specify if full scan should be performed for test code style test -->
+     *     <const name="TESTCODESTYLE_IS_FULL_SCAN" value="0"/>
+     * </php>
+     * ```
+     *
+     * @return bool
+     */
+    private function isFullScan(): bool
+    {
+        return defined('TESTCODESTYLE_IS_FULL_SCAN') && TESTCODESTYLE_IS_FULL_SCAN === '1';
+    }
 }
diff --git a/lib/web/jquery/editableMultiselect/js/jquery.editable.js b/lib/web/jquery/editableMultiselect/js/jquery.editable.js
diff --git a/lib/web/jquery/editableMultiselect/js/jquery.multiselect.js b/lib/web/jquery/editableMultiselect/js/jquery.multiselect.js
diff --git a/lib/web/mage/backend/editablemultiselect.js b/lib/web/mage/backend/editablemultiselect.js

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ protected function setUp(): void`
`39`	`39`	`->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);`
`40`	`40`	`$this->auth = $this->objectManager->create(\Magento\Backend\Model\Auth::class);`
`41`	`41`	`$this->authSession = $this->objectManager->create(\Magento\Backend\Model\Auth\Session::class);`
	`42`	`+ $this->authSession->setUser($this->objectManager->create(\Magento\User\Model\User::class));`
`42`	`43`	`$this->auth->setAuthStorage($this->authSession);`
`43`	`44`	`$this->auth->logout();`
`44`	`45`	`}`