Merge pull request #144 from magento-trigger/MC-34039

[TR] MC-34039: Merge 2.4-develop into 2.4-develop-php74

Author: xmav

app/code/Magento/TaxSampleData/Test/Model/TaxTest.php

@@ -29,62 +29,62 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class TaxTest extends \PHPUnit_Framework_TestCase
+class TaxTest extends \PHPUnit\Framework\TestCase
 {
  /**
  * @var Tax
  */
  private $taxModel;
 
  /**
- * @var TaxRuleRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var TaxRuleRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
  */
  private $taxRuleRepository;
 
  /**
- * @var TaxRuleInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var TaxRuleInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
  */
  private $ruleFactory;
 
  /**
- * @var TaxRateRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var TaxRateRepositoryInterface|\PHPUnit\Framework\MockObject\MockObject
  */
  private $taxRateRepository;
 
  /**
- * @var TaxRateInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var TaxRateInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
  */
  private $rateFactory;
 
  /**
- * @var RateFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var RateFactory|\PHPUnit\Framework\MockObject\MockObject
  */
  private $taxRateFactory;
 
  /**
- * @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+ * @var SearchCriteriaBuilder|\PHPUnit\Framework\MockObject\MockObject
  */
  private $criteriaBuilder;
 
  /**
- * @var FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+ * @var FilterBuilder|\PHPUnit\Framework\MockObject\MockObject
  */
  private $filterBuilder;
 
  /**
- * @var FixtureManager|\PHPUnit_Framework_MockObject_MockObject
+ * @var FixtureManager|\PHPUnit\Framework\MockObject\MockObject
  */
  private $fixtureManager;
 
  /**
- * @var Csv|\PHPUnit_Framework_MockObject_MockObject
+ * @var Csv|\PHPUnit\Framework\MockObject\MockObject
  */
  private $csvReader;
 
  /**
  * Region collection factory.
  *
- * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+ * @var CollectionFactory|\PHPUnit\Framework\MockObject\MockObject
  */
  private $regionCollectionFactory;
 
@@ -96,7 +96,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
  /**
  * @inheritdoc
  */
- protected function setUp()
+ protected function setUp(): void
  {
  $this->objectManager = new ObjectManager($this);
 
@@ -205,7 +205,7 @@ public function installDataProvider()
  /**
  * Prepare region collection mock.
  *
- * @return \PHPUnit_Framework_MockObject_MockObject
+ * @return \PHPUnit\Framework\MockObject\MockObject
  */
  private function prepareRegionCollection()
  {
@@ -312,7 +312,7 @@ private function prepareContext()
  /**
  * Prepare tax rate mock.
  *
- * @return TaxRateInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @return TaxRateInterface|\PHPUnit\Framework\MockObject\MockObject
  */
  private function prepareTaxRate()
  {
@@ -370,7 +370,7 @@ private function prepareFilters()
  ->method('addFilters')
  ->willReturnSelf();
 
- $searchCriteria = $this->getMock(SearchCriteria::class);
+ $searchCriteria = $this->createMock(SearchCriteria::class);
 
  $this->criteriaBuilder->expects(self::once())
  ->method('create')
@@ -392,7 +392,7 @@ private function prepareFilters()
  /**
  * Prepare tax rule mock.
  *
- * @return TaxRuleInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @return TaxRuleInterface|\PHPUnit\Framework\MockObject\MockObject
  */
  private function prepareTaxRule()
  {