Merge remote-tracking branch 'origin/MC-33069-CE-4' into MC-33069

Author: zakdma

app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Report/CollectionTest.php

@@ -177,10 +177,7 @@ public function testApplyRulesFilterWithRulesList()
 
         $this->selectMock->expects($this->at(3))
             ->method('where')
-            ->with(implode([
-                'test_1',
-                'test_2',
-            ], ' OR '));
+            ->with(implode(' OR ', ['test_1', 'test_2']));
 
         $ruleMock = $this->getRuleMock();
         $ruleMock->expects($this->once())

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/CartFixedTest.php

@@ -118,6 +118,12 @@ protected function setUp(): void
      */
     public function testCalculate()
     {
+        $ruleItemTotals = [
+            'items_price' => 100,
+            'base_items_price' => 100,
+            'items_count' => 1,
+        ];
+
         $this->rule->setData(['id' => 1, 'discount_amount' => 10.0]);
 
         $this->quote->expects($this->any())->method('getCartFixedRules')->willReturn([]);
@@ -126,6 +132,11 @@ public function testCalculate()
         $this->priceCurrency->expects($this->atLeastOnce())->method('round')->willReturnArgument(0);
         $this->quote->expects($this->any())->method('getStore')->willReturn($store);
 
+        $this->validator->expects($this->once())
+            ->method('getRuleItemTotalsInfo')
+            ->with($this->rule->getId())
+            ->willReturn($ruleItemTotals);
+
         /** validators data */
         $this->validator->expects(
             $this->once()

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/MemoryLimitTest.php

@@ -18,17 +18,17 @@ public function testPrintStats()
     {
         $object = $this->_createObject(0, 0);
         $result = $object->printStats();
-        $this->assertContains('Memory usage (OS):', $result);
-        $this->assertContains('1.00M', $result);
-        $this->assertContains('Estimated memory leak:', $result);
-        $this->assertContains('reported by PHP', $result);
+        $this->assertStringContainsString('Memory usage (OS):', $result);
+        $this->assertStringContainsString('1.00M', $result);
+        $this->assertStringContainsString('Estimated memory leak:', $result);
+        $this->assertStringContainsString('reported by PHP', $result);
         $this->assertStringEndsWith(PHP_EOL, $result);
 
         $object = $this->_createObject('2M', 0);
-        $this->assertContains('50.00% of configured 2.00M limit', $object->printStats());
+        $this->assertStringContainsString('50.00% of configured 2.00M limit', $object->printStats());
 
         $object = $this->_createObject(0, '500K');
-        $this->assertContains('% of configured 0.49M limit', $object->printStats());
+        $this->assertStringContainsString('% of configured 0.49M limit', $object->printStats());
     }
 
     public function testValidateUsage()

lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php

@@ -246,11 +246,11 @@ protected function _getGetMethod()
             'parameters' => [
                 [
                     'name' => 'id',
-                    'type' => $parameterReflection->getType(),
+                    'type' => $this->getTypeHintText($parameterReflection->getType()),
                 ],
             ],
             'body' => $body,
-            'returnType' => $methodReflection->getReturnType(),
+            'returnType' => $this->getTypeHintText($methodReflection->getReturnType()),
             'docblock' => [
                 'shortDescription' => 'load entity',
                 'tags' => [
@@ -722,9 +722,9 @@ private function getMethodParamAndReturnType($methodName)
         if (!empty($params[0])) {
             /** @var ParameterReflection $parameterReflection */
             $parameterReflection = $params[0];
-            $result['paramType'] = $parameterReflection->getType();
+            $result['paramType'] = $this->getTypeHintText($parameterReflection->getType());
         }
-        $result['returnType'] = $methodReflection->getReturnType();
+        $result['returnType'] = $this->getTypeHintText($methodReflection->getReturnType());
 
         return $result;
     }
@@ -742,4 +742,15 @@ private function getClassMethods($name)
         }
         return $this->methodList;
     }
+
+    /**
+     * Get the text of the type hint.
+     *
+     * @param \ReflectionType|null $type
+     * @return string|null
+     */
+    private function getTypeHintText($type)
+    {
+        return $type instanceof \ReflectionType ? $type->getName() : $type;
+    }
 }

lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchIteratorTest.php

@@ -97,6 +97,19 @@ public function testCurrent()
         $this->selectMock->expects($this->once())->method('where')->with($filed . ' > ?', 0);
         $this->selectMock->expects($this->once())->method('limit')->with($this->batchSize);
         $this->selectMock->expects($this->once())->method('order')->with($filed . ' ASC');
+        $this->wrapperSelectMock->expects($this->once())
+            ->method('from')
+            ->with(
+                $this->selectMock,
+                [
+                    new \Zend_Db_Expr('MAX(' . $this->rangeFieldAlias . ') as max'),
+                    new \Zend_Db_Expr('COUNT(*) as cnt'),
+                ]
+            );
+        $this->connectionMock->expects($this->once())
+            ->method('fetchRow')
+            ->with($this->wrapperSelectMock)
+            ->willReturn(['max' => 10, 'cnt' => 10]);
         $this->assertEquals($this->selectMock, $this->model->current());
         $this->assertEquals($this->selectMock, $this->model->current());
         $this->assertEquals(0, $this->model->key());

lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchRangeIteratorTest.php

@@ -99,6 +99,16 @@ public function testCurrent()
     {
         $this->selectMock->expects($this->once())->method('limit')->with($this->batchSize, $this->currentBatch);
         $this->selectMock->expects($this->once())->method('order')->with('correlationName.rangeField' . ' ASC');
+        $this->wrapperSelectMock->expects($this->once())
+            ->method('from')
+            ->with(
+                $this->selectMock,
+                [new \Zend_Db_Expr('COUNT(*) as cnt')]
+            );
+        $this->connectionMock->expects($this->once())
+            ->method('fetchRow')
+            ->with($this->wrapperSelectMock)
+            ->willReturn(['cnt' => 10]);
         $this->assertEquals($this->selectMock, $this->model->current());
         $this->assertEquals(0, $this->model->key());
     }