CE-33709: Fixed errors and warnings that were missed

bohdan-harniuk · bohdan-harniuk · commit 65593e20e446 · 2021-08-20T17:32:07.000+03:00
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/GuestValidationTest.php
@@ -174,7 +174,7 @@ private function getPaymentExtension(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(PaymentExtension::class);
         try {
-            $mockBuilder->addMethods(['getAgreementIds']);
+            $mockBuilder->onlyMethods(['getAgreementIds']);
         } catch (RuntimeException $e) {
             // Payment extension already generated.
         }
diff --git a/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php b/app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php
@@ -203,7 +203,7 @@ private function getPaymentExtension(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(PaymentExtension::class);
         try {
-            $mockBuilder->addMethods(['getAgreementIds']);
+            $mockBuilder->onlyMethods(['getAgreementIds']);
         } catch (RuntimeException $e) {
             // Payment extension already generated.
         }
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/CatalogRule/AddCustomerGroupExcludedWebsiteTest.php b/app/code/Magento/Customer/Test/Unit/Observer/CatalogRule/AddCustomerGroupExcludedWebsiteTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->ruleExtensionMock = $this->getMockBuilder(RuleExtension::class)
-            ->addMethods(['setExcludeWebsiteIds'])
+            ->onlyMethods(['setExcludeWebsiteIds'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->observerMock->expects(self::atLeastOnce())
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php
@@ -250,7 +250,7 @@ private function getProductOptionExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(ProductOptionExtension::class);
         try {
-            $mockBuilder->addMethods(['setDownloadableOption']);
+            $mockBuilder->onlyMethods(['setDownloadableOption']);
         } catch (RuntimeException $e) {
             // ProductOptionExtension already generated.
         }
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderGetTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderGetTest.php
@@ -279,7 +279,7 @@ private function getOrderExtensionMock(): MockObject
     {
         $mockObject = $this->getMockBuilder(OrderExtension::class);
         try {
-            $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockObject->onlyMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // Order extension already generated.
         }
@@ -296,7 +296,7 @@ private function getOrderItemExtensionMock(): MockObject
     {
         $mockObject = $this->getMockBuilder(OrderItemExtension::class);
         try {
-            $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockObject->onlyMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // Order extension already generated.
         }
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -199,7 +199,7 @@ private function getOrderExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(OrderExtension::class);
         try {
-            $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockBuilder->onlyMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // OrderExtension already generated.
         }
@@ -216,7 +216,7 @@ private function getOrderItemExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(OrderItemExtension::class);
         try {
-            $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);
+            $mockBuilder->onlyMethods(['getGiftMessage', 'setGiftMessage']);
         } catch (RuntimeException $e) {
             // OrderItemExtension already generated.
         }
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ConfigureProductToAddTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ConfigureProductToAddTest.php
@@ -95,7 +95,7 @@ class ConfigureProductToAddTest extends TestCase
     private $configureProductToAdd;
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     protected function setUp(): void
     {
@@ -181,14 +181,10 @@ public function testExecute(): void
             ->method('getParam')
             ->with('id')
             ->willReturn($productId);
-        $this->objectManagerMock->expects($this->at(0))
+        $this->objectManagerMock
             ->method('get')
-            ->with(Quote::class)
-            ->willReturn($this->quoteSessionMock);
-        $this->objectManagerMock->expects($this->at(1))
-            ->method('get')
-            ->with(Composite::class)
-            ->willReturn($this->compositeHelperMock);
+            ->withConsecutive([Quote::class], [Composite::class])
+            ->willReturnOnConsecutiveCalls($this->quoteSessionMock, $this->compositeHelperMock);
         $this->quoteSessionMock->expects($this->any())
             ->method('getStore')
             ->willReturn($this->storeMock);
@@ -208,6 +204,7 @@ public function testExecute(): void
         $this->compositeHelperMock->expects($this->once())
             ->method('renderConfigureResult')
             ->with($configureResult)->willReturn($this->layoutMock);
+
         $this->assertInstanceOf(Layout::class, $this->configureProductToAdd->execute());
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
@@ -253,15 +253,16 @@ private function getOrderExtensionMock(): MockObject
     {
         $mockBuilder = $this->getMockBuilder(OrderExtensionInterface::class)->disableOriginalConstructor();
         try {
-            $mockBuilder->addMethods(
-                [
-                    'getShippingAssignments',
-                    'setAppliedTaxes',
-                    'setConvertingFromQuote',
-                    'setItemAppliedTaxes',
-                    'setPaymentAdditionalInfo',
-                ]
-            );
+            $mockBuilder
+                ->onlyMethods(
+                    [
+                        'getShippingAssignments',
+                        'setAppliedTaxes',
+                        'setConvertingFromQuote',
+                        'setItemAppliedTaxes',
+                        'setPaymentAdditionalInfo'
+                    ]
+                );
         } catch (RuntimeException $e) {
             // Order extension already generated.
         }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -108,7 +108,7 @@ protected function setupExtensionAttributeMock(): MockObject
     {
         $orderExtensionAttributeMock = $this->getMockBuilder(OrderExtensionInterface::class)
             ->disableOriginalConstructor()
-            ->addMethods(
+            ->onlyMethods(
                 [
                     'getAppliedTaxes',
                     'getConvertingFromQuote',
diff --git a/app/code/Magento/WeeeGraphQl/Test/Unit/Model/Resolver/FixedProductTaxResolverTest.php b/app/code/Magento/WeeeGraphQl/Test/Unit/Model/Resolver/FixedProductTaxResolverTest.php
@@ -128,8 +128,8 @@ protected function setUp(): void
             ->getMock();
 
         $this->contextExtensionAttributesMock = $this->getMockBuilder(ContextExtensionInterface::class)
-            ->addMethods(['getStore'])
-            ->getMock();
+            ->onlyMethods(['getStore'])
+            ->getMockForAbstractClass();
         $this->storeMock = $this->createMock(StoreInterface::class);
         $this->cartItemMock = $this->createMock(CartItemInterface::class);
         $this->fieldMock = $this->createMock(Field::class);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AbstractDataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AbstractDataFixture.php
@@ -7,6 +7,7 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestCase;
@@ -45,7 +46,8 @@ protected function _getFixtures(TestCase $test, $scope = null)
 
         $resolver = Resolver::getInstance();
         $resolver->setCurrentFixtureType($annotationKey);
-        $annotations = $scope === null ? $this->getAnnotations($test) : $test->getAnnotations()[$scope];
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
+        $annotations = $scope === null ? $this->getAnnotations($test) : $annotations[$scope];
         $existingFixtures = $annotations[$annotationKey] ?? [];
         /* Need to be applied even test does not have added fixtures because fixture can be added via config */
         $this->fixtures[$annotationKey][$this->getTestKey($test)] = $resolver->applyDataFixtures(
@@ -67,7 +69,8 @@ protected function _getFixtures(TestCase $test, $scope = null)
      */
     protected function getAnnotations(TestCase $test): array
     {
-        $annotations = $test->getAnnotations();
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
+
         return array_replace((array)$annotations['class'], (array)$annotations['method']);
     }
 
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php
@@ -10,6 +10,7 @@
 namespace Magento\TestFramework\Annotation;
 
 use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 use PHPUnit\Framework\TestCase;
@@ -67,7 +68,7 @@ protected function _setConfigValue($configPath, $value)
     protected function _assignConfigData(TestCase $test)
     {
         $resolver = Resolver::getInstance();
-        $annotations = $test->getAnnotations();
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
         $existingFixtures = $annotations['method'][self::ANNOTATION] ?? [];
         /* Need to be applied even test does not have added fixtures because fixture can be added via config */
         $testAnnotations = $resolver->applyConfigFixtures($test, $existingFixtures, self::ANNOTATION);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppArea.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppArea.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\Annotation;
 
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
+
 class AppArea
 {
     const ANNOTATION_NAME = 'magentoAppArea';
@@ -75,7 +77,8 @@ protected function _getTestAppArea($annotations)
      */
     public function startTest(\PHPUnit\Framework\TestCase $test)
     {
-        $area = $this->_getTestAppArea($test->getAnnotations());
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
+        $area = $this->_getTestAppArea($annotations);
         if ($this->_application->getArea() !== $area) {
             $this->_application->reinitialize();
 
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php
@@ -10,6 +10,7 @@
 namespace Magento\TestFramework\Annotation;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use Magento\TestFramework\Application;
 use Magento\TestFramework\TestCase\AbstractController;
 use PHPUnit\Framework\TestCase;
@@ -105,16 +106,16 @@ public function endTest(TestCase $test)
     }
 
     /**
-     * Get method annotations.
-     *
-     * Overwrites class-defined annotations.
+     * Get method annotations. Overwrites class-defined annotations.
      *
      * @param TestCase $test
+     *
      * @return array
      */
     private function getAnnotations(TestCase $test): array
     {
-        $annotations = $test->getAnnotations();
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
+
         return array_replace((array)$annotations['class'], (array)$annotations['method']);
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
@@ -6,6 +6,7 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -28,7 +29,7 @@ class Cache
      */
     public function startTest(\PHPUnit\Framework\TestCase $test)
     {
-        $source = $test->getAnnotations();
+        $source = TestCaseAnnotation::getInstance()->getAnnotations($test);
         if (isset($source['method']['magentoCache'])) {
             $annotations = $source['method']['magentoCache'];
         } elseif (isset($source['class']['magentoCache'])) {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ComponentRegistrarFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ComponentRegistrarFixture.php
@@ -6,6 +6,7 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RegexIterator;
@@ -82,7 +83,7 @@ public function endTest(\PHPUnit\Framework\TestCase $test)
      */
     private function registerComponents(\PHPUnit\Framework\TestCase $test)
     {
-        $annotations = $test->getAnnotations();
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
         $componentAnnotations = [];
         if (isset($annotations['class'][self::ANNOTATION_NAME])) {
             $componentAnnotations = array_merge($componentAnnotations, $annotations['class'][self::ANNOTATION_NAME]);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\Config\MutableScopeConfigInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 use PHPUnit\Framework\TestCase;
@@ -149,7 +150,7 @@ protected function getScopeConfig(): ScopeConfigInterface
     protected function _assignConfigData(TestCase $test)
     {
         $resolver = Resolver::getInstance();
-        $annotations = $test->getAnnotations();
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
         $existingFixtures = $annotations['method'][self::ANNOTATION] ?? [];
         /* Need to be applied even test does not have added fixtures because fixture can be added via config */
         $testAnnotations = $resolver->applyConfigFixtures(
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DbIsolation.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DbIsolation.php
@@ -6,6 +6,7 @@
 namespace Magento\TestFramework\Annotation;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use Magento\TestFramework\Event\Param\Transaction;
 use PHPUnit\Framework\TestCase;
 
@@ -108,7 +109,8 @@ protected function _getIsolation(TestCase $test)
      */
     private function getAnnotations(TestCase $test)
     {
-        $annotations = $test->getAnnotations();
+        $annotations = TestCaseAnnotation::getInstance()->getAnnotations($test);
+
         return array_replace((array)$annotations['class'], (array)$annotations['method']);
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/IndexerDimensionMode.php
@@ -7,15 +7,16 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
 use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcher;
 use Magento\Catalog\Model\Indexer\Product\Price\ModeSwitcherConfiguration;
 use Magento\Catalog\Model\Indexer\Product\Price\Processor;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Annotation\TestCaseAnnotation;
 use Magento\TestFramework\App\Config;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Catalog\Model\Indexer\Product\Price\DimensionModeConfiguration;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -88,7 +89,7 @@ private function setDimensionMode(string $mode, TestCase $test)
      */
     public function startTest(TestCase $test)
     {
-        $source = $test->getAnnotations();
+        $source = TestCaseAnnotation::getInstance()->getAnnotations($test);
 
         if (isset($source['method']['magentoIndexerDimensionMode'])) {
             $annotations = $source['method']['magentoIndexerDimensionMode'];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/TestCaseAnnotation.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/TestCaseAnnotation.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author Atwix Team
+ * @copyright Copyright (c) Atwix (https://www.atwix.com/)
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Annotation;
+
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Util\Test as TestUtil;
+
+/**
+ * Returns annotations for given testcase.
+ */
+class TestCaseAnnotation
+{
+    /**
+     * @var TestCaseAnnotation
+     */
+    private static $instance;
+
+    /**
+     * Get instance of test case annotation access service.
+     *
+     * @return TestCaseAnnotation
+     */
+    public static function getInstance(): TestCaseAnnotation
+    {
+        return self::$instance ?? self::$instance = new TestCaseAnnotation();
+    }
+
+    /**
+     * Get annotations for the given test case.
+     *
+     * @param TestCase $testCase
+     *
+     * @return array
+     */
+    public function getAnnotations(TestCase $testCase): array
+    {
+        return TestUtil::parseTestMethodAnnotations(
+            get_class($testCase),
+            $testCase->getName(false)
+        );
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/TestsIsolation.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/TestsIsolation.php
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/ConfigFixtureTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/ConfigFixtureTest.php
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/CopyModules.php
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/DataProviderFromFile.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/DataProviderFromFile.php
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/SchemaFixture.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/SchemaFixture.php

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private function getPaymentExtension(): MockObject`
`174`	`174`	`{`
`175`	`175`	`$mockBuilder = $this->getMockBuilder(PaymentExtension::class);`
`176`	`176`	`try {`
`177`		`- $mockBuilder->addMethods(['getAgreementIds']);`
	`177`	`+ $mockBuilder->onlyMethods(['getAgreementIds']);`
`178`	`178`	`} catch (RuntimeException $e) {`
`179`	`179`	`// Payment extension already generated.`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private function getPaymentExtension(): MockObject`
`203`	`203`	`{`
`204`	`204`	`$mockBuilder = $this->getMockBuilder(PaymentExtension::class);`
`205`	`205`	`try {`
`206`		`- $mockBuilder->addMethods(['getAgreementIds']);`
	`206`	`+ $mockBuilder->onlyMethods(['getAgreementIds']);`
`207`	`207`	`} catch (RuntimeException $e) {`
`208`	`208`	`// Payment extension already generated.`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ private function getProductOptionExtensionMock(): MockObject`
`250`	`250`	`{`
`251`	`251`	`$mockBuilder = $this->getMockBuilder(ProductOptionExtension::class);`
`252`	`252`	`try {`
`253`		`- $mockBuilder->addMethods(['setDownloadableOption']);`
	`253`	`+ $mockBuilder->onlyMethods(['setDownloadableOption']);`
`254`	`254`	`} catch (RuntimeException $e) {`
`255`	`255`	`// ProductOptionExtension already generated.`
`256`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private function getOrderExtensionMock(): MockObject`
`279`	`279`	`{`
`280`	`280`	`$mockObject = $this->getMockBuilder(OrderExtension::class);`
`281`	`281`	`try {`
`282`		`- $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);`
	`282`	`+ $mockObject->onlyMethods(['getGiftMessage', 'setGiftMessage']);`
`283`	`283`	`} catch (RuntimeException $e) {`
`284`	`284`	`// Order extension already generated.`
`285`	`285`	`}`
`@@ -296,7 +296,7 @@ private function getOrderItemExtensionMock(): MockObject`
`296`	`296`	`{`
`297`	`297`	`$mockObject = $this->getMockBuilder(OrderItemExtension::class);`
`298`	`298`	`try {`
`299`		`- $mockObject->addMethods(['getGiftMessage', 'setGiftMessage']);`
	`299`	`+ $mockObject->onlyMethods(['getGiftMessage', 'setGiftMessage']);`
`300`	`300`	`} catch (RuntimeException $e) {`
`301`	`301`	`// Order extension already generated.`
`302`	`302`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ private function getOrderExtensionMock(): MockObject`
`199`	`199`	`{`
`200`	`200`	`$mockBuilder = $this->getMockBuilder(OrderExtension::class);`
`201`	`201`	`try {`
`202`		`- $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);`
	`202`	`+ $mockBuilder->onlyMethods(['getGiftMessage', 'setGiftMessage']);`
`203`	`203`	`} catch (RuntimeException $e) {`
`204`	`204`	`// OrderExtension already generated.`
`205`	`205`	`}`
`@@ -216,7 +216,7 @@ private function getOrderItemExtensionMock(): MockObject`
`216`	`216`	`{`
`217`	`217`	`$mockBuilder = $this->getMockBuilder(OrderItemExtension::class);`
`218`	`218`	`try {`
`219`		`- $mockBuilder->addMethods(['getGiftMessage', 'setGiftMessage']);`
	`219`	`+ $mockBuilder->onlyMethods(['getGiftMessage', 'setGiftMessage']);`
`220`	`220`	`} catch (RuntimeException $e) {`
`221`	`221`	`// OrderItemExtension already generated.`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected function setupExtensionAttributeMock(): MockObject`
`108`	`108`	`{`
`109`	`109`	`$orderExtensionAttributeMock = $this->getMockBuilder(OrderExtensionInterface::class)`
`110`	`110`	`->disableOriginalConstructor()`
`111`		`- ->addMethods(`
	`111`	`+ ->onlyMethods(`
`112`	`112`	`[`
`113`	`113`	`'getAppliedTaxes',`
`114`	`114`	`'getConvertingFromQuote',`