Fix PHPUnit 7 class removals for InvokedCount and ReturnStub

- Replace \PHPUnit_Framework_MockObject_Matcher_InvokedCount
- Replace \PHPUnit_Framework_MockObject_Stub_Return

Author: mikeymike

app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ReportValidatorTest.php

@@ -79,9 +79,9 @@ protected function setUp()
      * @dataProvider errorDataProvider
      * @param string $reportName
      * @param array $result
-     * @param \PHPUnit_Framework_MockObject_Stub $queryReturnStub
+     * @param \PHPUnit\Framework\MockObject\Stub $queryReturnStub
      */
-    public function testValidate($reportName, $result, \PHPUnit_Framework_MockObject_Stub $queryReturnStub)
+    public function testValidate($reportName, $result, \PHPUnit\Framework\MockObject\Stub $queryReturnStub)
     {
         $connectionName = 'testConnection';
         $this->queryFactoryMock->expects($this->once())

app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php

@@ -73,15 +73,15 @@ protected function setUp()
 
     /**
      * @param bool $hasBackendModel
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetBackendModel
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCreate
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetValue
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetPath
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScope
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScopeId
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetValue
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsAfterLoad
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSerialize
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetBackendModel
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCreate
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsGetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetPath
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScope
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetScopeId
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsAfterLoad
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsSerialize
      * @param string $expectsValue
      * @param string $className
      * @param string $value

app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibilityCompositeTest.php

@@ -51,9 +51,9 @@ public function testException()
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects
      * @param bool $firstResult
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects
      * @param bool $secondResult
      * @param bool $expectedResult
      * @dataProvider visibilityDataProvider
@@ -74,9 +74,9 @@ public function testDisabled($firstExpects, $firstResult, $secondExpects, $secon
     }
 
     /**
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $firstExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $firstExpects
      * @param bool $firstResult
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $secondExpects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $secondExpects
      * @param bool $secondResult
      * @param bool $expectedResult
      * @dataProvider visibilityDataProvider

app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php

@@ -98,8 +98,8 @@ protected function setUp()
     /**
      * @param int|null $id
      * @param string $typeId
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetTitle
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectedGetValue
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetTitle
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectedGetValue
      * @return void
      * @dataProvider getLinksTitleDataProvider
      */

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php

@@ -202,7 +202,7 @@ public function testCheckIsLive()
      * @param int $useAggregatedData
      * @param string $mainTable
      * @param int $isFilter
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult
      * @dataProvider useAggregatedDataDataProvider
      * @return void
      */
@@ -309,7 +309,7 @@ public function testAddItemCountExpr()
      * @param int $isFilter
      * @param int $useAggregatedData
      * @param string $mainTable
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $getIfNullSqlResult
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $getIfNullSqlResult
      * @dataProvider totalsDataProvider
      * @return void
      */

app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php

@@ -190,8 +190,8 @@ function ($arg) {
     /**
      * @param mixed $from
      * @param mixed $to
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $truncateCount
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $deleteCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $truncateCount
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $deleteCount
      * @dataProvider intervalsDataProvider
      * @return void
      */

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php

@@ -157,8 +157,8 @@ public function stepIdentityContainerInit($identityMockClassName)
     }
 
     protected function stepSend(
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendExpects,
-        \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendExpects,
+        \PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendCopyToExpects
     ) {
         $senderMock = $this->createPartialMock(\Magento\Sales\Model\Order\Email\Sender::class, ['send', 'sendCopyTo']);
         $senderMock->expects($sendExpects)

lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php

@@ -197,7 +197,7 @@ protected function _makeMock($className)
      * @param \PHPUnit_Framework_MockObject_MockObject                       $object
      * @param string                                                        $stubName
      * @param mixed                                                         $return
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount|null        $expects
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount|null        $expects
      *
      * @return \PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */

lib/internal/Magento/Framework/TestFramework/Unit/Helper/ProxyTesting.php

@@ -40,12 +40,12 @@ public function invokeWithExpectations(
             $expectedParams = $params;
         }
         $builder = $proxiedObject->expects(
-            new \PHPUnit_Framework_MockObject_Matcher_InvokedCount(1)
+            new \PHPUnit\Framework\MockObject\Matcher\InvokedCount(1)
         )->method(
             $expectedMethod
         );
         $builder = call_user_func_array([$builder, 'with'], $expectedParams);
-        $builder->will(new \PHPUnit_Framework_MockObject_Stub_Return($proxiedResult));
+        $builder->will(new \PHPUnit\Framework\MockObject\Stub\ReturnStub($proxiedResult));
 
         return call_user_func_array([$object, $method], $params);
     }

lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php

@@ -220,9 +220,9 @@ public function testToHtmlWhenModuleIsDisabled()
      * @param string|bool $cacheLifetime
      * @param string|bool $dataFromCache
      * @param string $dataForSaveCache
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsDispatchEvent
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheLoad
-     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCacheSave
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsDispatchEvent
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheLoad
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount $expectsCacheSave
      * @param string $expectedResult
      * @return void
      * @dataProvider getCacheLifetimeDataProvider