Merge branch '2.4-develop' into MC-37128

Author: ysapiga

app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php

@@ -117,7 +117,7 @@ protected function _countExpr($expr, $collection)
         foreach ($parsedExpression as $operand) {
             if ($this->_parser->isOperation($operand)) {
                 $this->_checkOperandsSet($firstOperand, $secondOperand, $tmpResult, $result);
-                $result = $this->_operate($firstOperand, $secondOperand, $operand, $tmpResult, $result);
+                $result = $this->_operate($firstOperand, $secondOperand, $operand);
                 $firstOperand = $secondOperand = null;
             } else {
                 if (null === $firstOperand) {
@@ -133,9 +133,9 @@ protected function _countExpr($expr, $collection)
     /**
      * Check if operands in not null and set operands values if they are empty
      *
-     * @param float|int &$firstOperand
-     * @param float|int &$secondOperand
-     * @param float|int &$tmpResult
+     * @param float|int $firstOperand
+     * @param float|int $secondOperand
+     * @param float|int $tmpResult
      * @param float|int $result
      * @return void
      */

app/code/Magento/Backend/Test/Unit/Helper/DataTest.php

@@ -42,7 +42,6 @@ protected function setUp(): void
             $this->createMock(Auth::class),
             $this->_frontResolverMock,
             $this->createMock(Random::class),
-            $this->getMockForAbstractClass(RequestInterface::class)
         );
     }
 

app/code/Magento/Catalog/Block/Product/View/Details.php

@@ -27,10 +27,11 @@ class Details extends \Magento\Framework\View\Element\Template
      *
      * @return array
      * @since 103.0.1
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getGroupSortedChildNames(string $groupName, string $callback): array
     {
-        $groupChildNames = $this->getGroupChildNames($groupName, $callback);
+        $groupChildNames = $this->getGroupChildNames($groupName);
         $layout = $this->getLayout();
 
         $childNamesSortOrder = [];

app/code/Magento/Catalog/Helper/Product/View.php

@@ -193,7 +193,7 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
                 $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
-    
+
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
         $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 

app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php

@@ -24,6 +24,11 @@ class Tree extends Dbp
 
     const LEVEL_FIELD = 'level';
 
+    /**
+     * @var array
+     */
+    private $_inactiveItems;
+
     /**
      * @var \Magento\Framework\Event\ManagerInterface
      */
@@ -290,7 +295,7 @@ protected function _getDisabledIds($collection, $allIds)
         foreach ($allIds as $id) {
             $parents = $this->getNodeById($id)->getPath();
             foreach ($parents as $parent) {
-                if (!$this->_getItemIsActive($parent->getId(), $storeId)) {
+                if (!$this->_getItemIsActive($parent->getId())) {
                     $disabledIds[] = $id;
                     continue;
                 }
@@ -680,6 +685,8 @@ public function getExistingCategoryIdsBySpecifiedIds($ids)
     }
 
     /**
+     * Get entity methadata pool.
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()

app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php

@@ -160,7 +160,7 @@ protected function _saveAttributeValue($object, $attribute, $value)
         $storeId = (int) $this->_storeManager->getStore($object->getStoreId())->getId();
         $table = $attribute->getBackend()->getTable();
 
-        $entityId = $this->resolveEntityId($object->getId(), $table);
+        $entityId = $this->resolveEntityId($object->getId());
 
         /**
          * If we work in single store mode all values should be saved just

app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

@@ -127,8 +127,7 @@
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see userInput="You saved the customer." stepKey="CustomerIsSaved"/>
 
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomers"/>
         <click selector="{{AdminCustomerFiltersSection.clearAll}}" stepKey="ClearFilters"/>
         <waitForPageLoad stepKey="waitForFiltersClear"/>
 

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

@@ -83,11 +83,6 @@ class RepositoryTest extends TestCase
      */
     protected $searchResultMock;
 
-    /**
-     * @var AttributeOptionManagementInterface|MockObject
-     */
-    private $optionManagementMock;
-
     /**
      * @inheritdoc
      */
@@ -116,8 +111,6 @@ protected function setUp(): void
                     ['getItems', 'getSearchCriteria', 'getTotalCount', 'setItems', 'setSearchCriteria', 'setTotalCount']
                 )
                 ->getMockForAbstractClass();
-        $this->optionManagementMock =
-            $this->getMockForAbstractClass(ProductAttributeOptionManagementInterface::class);
 
         $this->model = new Repository(
             $this->attributeResourceMock,
@@ -126,8 +119,7 @@ protected function setUp(): void
             $this->eavAttributeRepositoryMock,
             $this->eavConfigMock,
             $this->validatorFactoryMock,
-            $this->searchCriteriaBuilderMock,
-            $this->optionManagementMock
+            $this->searchCriteriaBuilderMock
         );
     }
 
@@ -291,7 +283,6 @@ public function testSaveDoesNotSaveAttributeOptionsIfOptionsAreAbsentInPayload()
         // Attribute code must not be changed after attribute creation
         $attributeMock->expects($this->once())->method('setAttributeCode')->with($attributeCode);
         $this->attributeResourceMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->optionManagementMock->expects($this->never())->method('add');
 
         $this->model->save($attributeMock);
     }

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php

@@ -66,7 +66,7 @@ protected function setUp(): void
         ];
         $configMock->expects($this->once())->method('getAll')->willReturn($config);
         $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', 'getData'];
-        $this->valueMock = $this->createPartialMock(Option::class, $methods, []);
+        $this->valueMock = $this->createPartialMock(Option::class, $methods);
         $this->validator = new Select(
             $configMock,
             $priceConfigMock,

app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php

@@ -301,7 +301,7 @@ public function testDeleteWithException()
             ->willReturn($idsBySku);
         $this->attributeRepository->expects($this->once())->method('get')->willReturn($this->productAttribute);
         $this->productAttribute->expects($this->once())->method('getAttributeId')->willReturn($attributeId);
-        $this->attributeResource->expects($this->atLeastOnce(2))->method('getConnection')
+        $this->attributeResource->expects($this->atLeastOnce())->method('getConnection')
             ->willReturn($this->connection);
         $this->connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
         $this->attributeResource