PHPUnit10 minor newly changed test fixes

Author: nishant04412

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Action/RowsTest.php

@@ -7,7 +7,9 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Category\Product\Action;
 
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Store;
 use Magento\Catalog\Model\Config;
@@ -112,6 +114,15 @@ class RowsTest extends TestCase
      */
     protected function setUp() : void
     {
+        $objectManager = new ObjectManager($this);
+        $objects = [
+            [
+                Visibility::class,
+                $this->createMock(Visibility::class)
+            ]
+        ];
+        $objectManager->prepareObjectManager($objects);
+
         $this->workingStateProvider = $this->getMockBuilder(WorkingStateProvider::class)
             ->disableOriginalConstructor()
             ->getMock();

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Category/Action/RowsTest.php

@@ -7,7 +7,9 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Category\Action;
 
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Store;
 use Magento\Catalog\Model\Config;
@@ -112,6 +114,15 @@ class RowsTest extends TestCase
      */
     protected function setUp() : void
     {
+        $objectManager = new ObjectManager($this);
+        $objects = [
+            [
+                Visibility::class,
+                $this->createMock(Visibility::class)
+            ]
+        ];
+        $objectManager->prepareObjectManager($objects);
+
         $this->workingStateProvider = $this->getMockBuilder(WorkingStateProvider::class)
             ->disableOriginalConstructor()
             ->getMock();

app/code/Magento/Sales/Test/Unit/Model/Order/Address/RendererTest.php

@@ -180,15 +180,15 @@ private function setStoreExpectations(): void
         $this->storeManagerMck->expects(self::once())->method('getStore')->willReturn($originalStoreMock);
         $this->storeManagerMck->expects(self::any())->method('setCurrentStore')->with(
             $this->callback(function ($store) use ($matcher, $expected) {
-                $this->assertEquals($store, $expected[$matcher->getInvocationCount()]);
+                $this->assertEquals($store, $expected[$matcher->numberOfInvocations()]);
                 return true;
             })
         );
 
         // One call to setup the store from the order, and an other one to rollback to the original store value
         $this->customerAddressConfigMock->expects(self::any())->method('setStore')->with(
             $this->callback(function ($store) use ($matcher, $expected) {
-                $this->assertEquals($store, $expected[$matcher->getInvocationCount()]);
+                $this->assertEquals($store, $expected[$matcher->numberOfInvocations()]);
                 return true;
             })
         );