Merge remote-tracking branch 'origin/AC-10634-ce' into AC-10821

Author: nishant04412

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

@@ -225,13 +225,15 @@ protected function setUp(): void
             'initWebsites',
             'initCategories'
         ];
+        $mockAddMethods = [
+            '_headerColumns'
+        ];
         $mockMethods = array_merge($constructorMethods, [
             '_customHeadersMapping',
             '_prepareEntityCollection',
             '_getEntityCollection',
             'getWriter',
             'getExportData',
-            '_headerColumns',
             '_customFieldsMapping',
             'getItemsPerPage',
             'paginateCollection',
@@ -243,7 +245,8 @@ protected function setUp(): void
         $this->advancedPricing = $this->getMockBuilder(
             AdvancedPricing::class
         )
-            ->setMethods($mockMethods)
+            ->addMethods($mockAddMethods)
+            ->onlyMethods($mockMethods)
             ->disableOriginalConstructor()
             ->getMock();
         foreach ($constructorMethods as $method) {

app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php

@@ -35,7 +35,7 @@ class RulesTest extends TestCase
     /**
      * Test constants
      */
-    const TEST_ROLE_ID = 13;
+    private const TEST_ROLE_ID = 13;
 
     /**
      * @var Rules

app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Auth/LoginTest.php

@@ -30,6 +30,8 @@
 
 /**
  * Test for \Magento\Backend\Controller\Adminhtml\Auth\Login.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LoginTest extends TestCase
 {

app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php

@@ -1,11 +1,9 @@
 <?php
-declare(strict_types=1);
 /**
- * Test class for \Magento\Bundle\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Bundle
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Bundle\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper\Plugin;
 

app/code/Magento/Bundle/Test/Unit/Model/Plugin/PriceBackendTest.php

@@ -18,7 +18,7 @@
 
 class PriceBackendTest extends TestCase
 {
-    const CLOSURE_VALUE = 'CLOSURE';
+    private const CLOSURE_VALUE = 'CLOSURE';
 
     /** @var  PriceBackend */
     private $priceBackendPlugin;

app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php

@@ -32,7 +32,7 @@ class DefaultTest extends TestCase
     /**
      * Expiration frame
      */
-    const EXPIRE_FRAME = 86400;
+    private const EXPIRE_FRAME = 86400;
 
     /**
      * Captcha default config data

app/code/Magento/Captcha/Test/Unit/Observer/CheckUserForgotPasswordBackendObserverTest.php

@@ -29,8 +29,8 @@
  */
 class CheckUserForgotPasswordBackendObserverTest extends TestCase
 {
-    const STUB_EMAIL = '[email protected]';
-    const STUB_REQUEST_PARAMS = ['STUB_PARAM'];
+    private const STUB_EMAIL = '[email protected]';
+    private const STUB_REQUEST_PARAMS = ['STUB_PARAM'];
 
     /**
      * @var MockObject|DataHelper

app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/UpdateHandlerTest.php

@@ -30,7 +30,7 @@
 class UpdateHandlerTest extends TestCase
 {
     /**
-     * Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
     private $objectManager;
 

app/code/Magento/Cms/Test/Unit/Helper/PageTest.php

@@ -153,21 +153,20 @@ protected function setUp(): void
             ->getMock();
         $this->pageFactoryMock = $this->getMockBuilder(PageFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
         $this->pageMock = $this->getMockBuilder(\Magento\Cms\Model\Page::class)
             ->disableOriginalConstructor()
-            ->setMethods(
+            ->addMethods(['setStoreId', 'getCustomPageLayout'])
+            ->onlyMethods(
                 [
                     'getId',
-                    'setStoreId',
                     'load',
                     'getCustomThemeFrom',
                     'getCustomThemeTo',
                     'getCustomTheme',
                     'getPageLayout',
                     'getIdentifier',
-                    'getCustomPageLayout',
                     'getCustomLayoutUpdateXml',
                     'getLayoutUpdateXml',
                     'getContentHeading',
@@ -203,7 +202,7 @@ protected function setUp(): void
         $this->layoutProcessorMock = $this->getMockBuilder(ProcessorInterface::class)
             ->getMockForAbstractClass();
         $this->blockMock = $this->getMockBuilder(AbstractBlock::class)
-            ->setMethods(['setContentHeading'])
+            ->addMethods(['setContentHeading'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->messagesBlockMock = $this->getMockBuilder(Messages::class)
@@ -398,7 +397,7 @@ public function testPrepareResultPage(
     /**
      * @return array
      */
-    public function renderPageExtendedDataProvider()
+    public static function renderPageExtendedDataProvider()
     {
         return [
             'ids NOT EQUAL BUT page->load() NOT SUCCESSFUL' => [
@@ -501,7 +500,7 @@ public function testGetPageUrl(
     /**
      * @return array
      */
-    public function getPageUrlDataProvider()
+    public static function getPageUrlDataProvider()
     {
         return [
             'ids NOT EQUAL BUT page->load() NOT SUCCESSFUL' => [

app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php

@@ -138,9 +138,10 @@ protected function setUp(): void
             ->method('getDirectoryReadByPath')
             ->willReturn($this->directoryReadMock);
         $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
-            ->setMethods(
+            ->addMethods(['clearWebsiteCache'])
+            ->onlyMethods(
                 [
-                    'clearWebsiteCache', 'getDefaultStoreView', 'getGroup', 'getGroups',
+                    'getDefaultStoreView', 'getGroup', 'getGroups',
                     'getStore', 'getStores', 'getWebsite', 'getWebsites', 'hasSingleStore',
                     'isSingleStoreMode', 'reinitStores', 'setCurrentStore', 'setIsSingleStoreModeAllowed',
                 ]
@@ -290,7 +291,7 @@ public function testConvertIdToPathAnyId($path, $pathId)
     /**
      * @return array
      */
-    public function providerConvertIdToPath()
+    public static function providerConvertIdToPath()
     {
         return [
             ['', ''],
@@ -318,7 +319,7 @@ public function testGetShortFilename($fileName, $maxLength, $expectedFilename)
     /**
      * @return array
      */
-    public function providerShortFilename()
+    public static function providerShortFilename()
     {
         return [
             ['test', 3, 'tes...'],
@@ -340,7 +341,7 @@ public function testGetShortFilenameDefaultMaxLength($fileName, $expectedFilenam
     /**
      * @return array
      */
-    public function providerShortFilenameDefaultMaxLength()
+    public static function providerShortFilenameDefaultMaxLength()
     {
         return [
             ['Mini text', 'Mini text'],
@@ -380,7 +381,7 @@ protected function generalSettingsIsUsingStaticUrlsAllowed($allowedValue)
     /**
      * @return array
      */
-    public function providerIsUsingStaticUrlsAllowed()
+    public static function providerIsUsingStaticUrlsAllowed()
     {
         return [
             [true],
@@ -467,7 +468,7 @@ public function testGetCurrentPathThrowException()
     /**
      * @return array
      */
-    public function providerGetCurrentPath()
+    public static function providerGetCurrentPath()
     {
         return [
             ['L3Rlc3RfcGF0aA--', 'L3Rlc3RfcGF0aA--', 'PATH/test_path', true],
@@ -523,7 +524,7 @@ public function testGetImageHtmlDeclarationRenderingAsTag(
     /**
      * @return array
      */
-    public function providerGetImageHtmlDeclarationRenderingAsTag()
+    public static function providerGetImageHtmlDeclarationRenderingAsTag()
     {
         return [
             [
@@ -572,7 +573,7 @@ public function testGetImageHtmlDeclaration($baseUrl, $fileName, $isUsingStaticU
     /**
      * @return array
      */
-    public function providerGetImageHtmlDeclaration()
+    public static function providerGetImageHtmlDeclaration()
     {
         return [
             ['http://localhost', 'test.png', true, 'http://localhost/test.png'],