🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #21576: [Backport] Fix for issue #21510: Can't access backend indexers page after creating a custom index (by @ccasciotti)
 - #21661: [backport] Improve swatch table overflow handling (by @Cyanoxide)
 - #21845: [Backport] #12396: Total Amount cart rule without tax (by @eduard13)
 - #21543: [BP] static tests forbid or instead of 21062 (by @novikor)


Fixed GitHub Issues:
 - #21510: Can't access backend indexers page after creating a custom index (reported by @ccasciotti) has been fixed in #21576 by @ccasciotti in 2.2-develop branch
   Related commits:
     1. 2c956f6
     2. d5ed9e8

 - #12396: "Total Amount" cart rule without tax (reported by @Chei20) has been fixed in #21845 by @eduard13 in 2.2-develop branch
   Related commits:
     1. 9529d31
     2. 362bbf2
     3. a5608f0

 - #21062: Static tests: forbid 'or' instead of '||' (reported by @novikor) has been fixed in #21543 by @novikor in 2.2-develop branch
   Related commits:
     1. 9f0ef59

Author: magento-engcom-team

app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php

@@ -111,7 +111,7 @@ public function testBuild()
      * @expectedException \Magento\Payment\Gateway\Command\CommandException
      * @expectedExceptionMessage The Payment Token is not available to perform the request.
      */
-    public function testBuildWithoutPaymentToken(): void
+    public function testBuildWithoutPaymentToken()
     {
         $amount = 30.00;
         $buildSubject = [

app/code/Magento/Indexer/Model/Indexer.php

@@ -361,7 +361,7 @@ public function getLatestUpdated()
                 return $this->getView()->getUpdated();
             }
         }
-        return $this->getState()->getUpdated();
+        return $this->getState()->getUpdated() ?: '';
     }
 
     /**

app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php

@@ -164,7 +164,12 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
                 }
             }
         } else {
-            $this->assertEquals($getStateGetUpdated, $this->model->getLatestUpdated());
+            $getLatestUpdated = $this->model->getLatestUpdated();
+            $this->assertEquals($getStateGetUpdated, $getLatestUpdated);
+
+            if ($getStateGetUpdated === null) {
+                $this->assertNotNull($getLatestUpdated);
+            }
         }
     }
 
@@ -182,7 +187,8 @@ public function getLatestUpdatedDataProvider()
             [true, '', '06-Jan-1944'],
             [true, '06-Jan-1944', ''],
             [true, '', ''],
-            [true, '06-Jan-1944', '05-Jan-1944']
+            [true, '06-Jan-1944', '05-Jan-1944'],
+            [false, null, null],
         ];
     }
 

app/code/Magento/SalesRule/Model/Rule/Condition/Address.php

@@ -58,6 +58,7 @@ public function __construct(
     public function loadAttributeOptions()
     {
         $attributes = [
+            'base_subtotal_with_discount' => __('Subtotal (Excl. Tax)'),
             'base_subtotal' => __('Subtotal'),
             'total_qty' => __('Total Items Quantity'),
             'weight' => __('Total Weight'),

app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css

@@ -150,7 +150,19 @@
 }
 
 .col-swatch-min-width {
-    min-width: 30px;
+    min-width: 65px;
+}
+
+[class^=swatch-col],
+[class^=col-]:not(.col-draggable):not(.col-default) {
+    min-width: 150px;
+}
+
+#swatch-visual-options-panel,
+#swatch-text-options-panel,
+#manage-options-panel {
+    overflow: auto;
+    width: 100%;
 }
 
 .swatches-visual-col.unavailable:after {

dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php

@@ -195,6 +195,13 @@ class ConditionsElement extends SimpleElement
      */
     protected $exception;
 
+    /**
+     * Condition option text selector.
+     *
+     * @var string
+     */
+    private $conditionOptionTextSelector = '//option[normalize-space(text())="%s"]';
+
     /**
      * @inheritdoc
      */
@@ -282,10 +289,16 @@ protected function addCondition($type, ElementInterface $context)
         $count = 0;
 
         do {
-            $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
-
             try {
-                $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($type);
+                $specificType = $newCondition->find(
+                    sprintf($this->conditionOptionTextSelector, $type),
+                    Locator::SELECTOR_XPATH
+                )->isPresent();
+                $newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
+                $condition = $specificType
+                    ? $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')
+                    : $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
+                $condition->setValue($type);
                 $isSetType = true;
             } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
                 $isSetType = false;

dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Mtf\Client\Element;
+
+/**
+ * @inheritdoc
+ */
+class SelectconditionElement extends SelectElement
+{
+    /**
+     * @inheritdoc
+     */
+    protected $optionByValue = './/option[normalize-space(.)=%s]';
+}

dev/tests/integration/testsuite/Magento/Framework/Code/Generator/AutoloaderTest.php

@@ -31,7 +31,7 @@ private function getTestFrameworkObjectManager()
     /**
      * @before
      */
-    public function setupLoggerTestDouble(): void
+    public function setupLoggerTestDouble()
     {
         $loggerTestDouble = $this->createMock(LoggerInterface::class);
         $this->getTestFrameworkObjectManager()->addSharedInstance($loggerTestDouble, MagentoMonologLogger::class);
@@ -40,7 +40,7 @@ public function setupLoggerTestDouble(): void
     /**
      * @after
      */
-    public function removeLoggerTestDouble(): void
+    public function removeLoggerTestDouble()
     {
         $this->getTestFrameworkObjectManager()->removeSharedInstance(MagentoMonologLogger::class);
     }
@@ -58,7 +58,7 @@ private function createExceptionThrowingGeneratorTestDouble(\RuntimeException $t
         return $generatorStub;
     }
 
-    public function testLogsExceptionDuringGeneration(): void
+    public function testLogsExceptionDuringGeneration()
     {
         $exceptionMessage = 'Test exception thrown during generation';
         $testException = new \RuntimeException($exceptionMessage);
@@ -70,7 +70,7 @@ public function testLogsExceptionDuringGeneration(): void
         $this->assertNull($autoloader->load(NonExistingClassName::class));
     }
 
-    public function testFiltersDuplicateExceptionMessages(): void
+    public function testFiltersDuplicateExceptionMessages()
     {
         $exceptionMessage = 'Test exception thrown during generation';
         $testException = new \RuntimeException($exceptionMessage);

dev/tests/static/framework/Magento/ruleset.xml

@@ -25,5 +25,6 @@
 
     <rule ref="Squiz.Commenting.DocCommentAlignment"/>
     <rule ref="Squiz.Functions.GlobalFunction"/>
+    <rule ref="Squiz.Operators.ValidLogicalOperators"/>
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
 </ruleset>

lib/internal/Magento/Framework/Code/Generator/Autoloader.php

@@ -62,7 +62,7 @@ public function load($className)
      *
      * @param \Exception $exception
      */
-    private function tryToLogExceptionMessageIfNotDuplicate(\Exception $exception): void
+    private function tryToLogExceptionMessageIfNotDuplicate(\Exception $exception)
     {
         if ($this->lastGenerationErrorMessage !== $exception->getMessage()) {
             $this->lastGenerationErrorMessage = $exception->getMessage();
@@ -84,7 +84,7 @@ private function tryToLogExceptionMessageIfNotDuplicate(\Exception $exception):
      * @param \Exception $exception
      * @return void
      */
-    private function tryToLogException(\Exception $exception): void
+    private function tryToLogException(\Exception $exception)
     {
         try {
             $logger = ObjectManager::getInstance()->get(LoggerInterface::class);