Merge remote-tracking branch 'origin/2.4-develop' into Arrows-AC-15503

Author: DeepaAdobe

.php-cs-fixer.dist.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 /**

Gruntfile.js.sample

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 // For performance use one level down: 'name/{,*/}*.js'

README.md

@@ -41,13 +41,13 @@ We encourage experts from the Community to help us with GitHub routines such as
 - [Learn more about the Maintainer role](https://developer.adobe.com/commerce/contributor/guides/maintainers/)
 - [Maintainer's Handbook](https://developer.adobe.com/commerce/contributor/guides/maintainers/handbook/)
 
-[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://magento.com/magento-contributors#maintainers)
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png)](https://developer.adobe.com/commerce/contributor/guides/maintainers/)
 
 ### Leaders
 
-Adobe highly appreciates contributions that help us to improve the code, clarify the documentation, and increase test coverage. Check out our Community leaders, superstars, and superheroes on the [leaderboard](https://magento.biterg.io/app/kibana#/dashboard/41dc0c60-fa06-11eb-bbaa-dd6ca6f8fda8?_g=()).
+Adobe highly appreciates contributions that help us to improve the code, clarify the documentation, and increase test coverage. Check out our Community leaders, superstars, and superheroes on the [leaderboard](https://github.com/magento/magento2/graphs/contributors).
 
-[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png)](https://magento.com/magento-contributors)
+[![](https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png)](https://github.com/magento/magento2/graphs/contributors)
 
 ### Labeling
 

app/autoload.php

@@ -2,8 +2,8 @@
 /**
  * Register basic autoloader that uses include path
  *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 

app/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/ActionsTest.php

@@ -39,13 +39,13 @@ protected function setUp(): void
         $escaperMock->expects($this->atLeastOnce())->method('escapeUrl')->willReturn('https://magento.com');
 
         /** @var AuthorizationInterface|MockObject $authorizationMock */
-        $authorizationMock = $this->getMockForAbstractClass(AuthorizationInterface::class);
+        $authorizationMock = $this->createMock(AuthorizationInterface::class);
         $authorizationMock->expects($this->atLeastOnce())
             ->method('isAllowed')
             ->willReturn(true);
 
         /** @var UrlInterface|MockObject $urlBuilder */
-        $urlBuilder = $this->getMockForAbstractClass(UrlInterface::class);
+        $urlBuilder = $this->createMock(UrlInterface::class);
         $urlBuilder->expects($this->once())->method('getUrl')->willReturn('http://magento.com');
 
         /** @var Context|MockObject $contextMock */

app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php

@@ -16,11 +16,14 @@
 use Magento\Backend\Block\Context;
 use Magento\Backend\Block\Widget\Grid\Column;
 use Magento\Framework\DataObject;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class SeverityTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * System under Test
      *
@@ -44,10 +47,7 @@ protected function setUp(): void
     public function testShouldRenderSeverity() : void
     {
         /** @var Column|MockObject $columnMock */
-        $columnMock = $this->getMockBuilder(Column::class)
-            ->disableOriginalConstructor()
-            ->addMethods(['getIndex'])
-            ->getMock();
+        $columnMock = $this->createPartialMockWithReflection(Column::class, ['getIndex']);
         $columnMock->expects($this->exactly(5))->method('getIndex')->willReturn('index');
         $this->sut->setColumn($columnMock);
         $dataObject = new DataObject();

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -20,6 +20,7 @@
 use Magento\Framework\HTTP\Adapter\CurlFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -100,10 +101,7 @@ protected function setUp(): void
         $this->curlFactory = $this->createPartialMock(CurlFactory::class, ['create']);
         $this->curl = $this->createMock(Curl::class);
         $this->appState = $this->createPartialMock(State::class, []);
-        $this->inboxModel = $this->createPartialMock(Inbox::class, [
-            '__wakeup',
-            'parse'
-        ]);
+        $this->inboxModel = $this->createMock(Inbox::class);
         $this->backendConfig = $this->createPartialMock(
             ConfigInterface::class,
             [
@@ -126,7 +124,7 @@ protected function setUp(): void
         $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->productMetadata = $this->createMock(ProductMetadata::class);
-        $this->urlBuilder = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->urlBuilder = $this->createMock(UrlInterface::class);
 
         $this->feed = $this->objectManagerHelper->getObject(
             Feed::class,
@@ -148,8 +146,8 @@ protected function setUp(): void
      * @param string $curlRequest
      *
      * @return void
-     * @dataProvider checkUpdateDataProvider
      */
+    #[DataProvider('checkUpdateDataProvider')]
     public function testCheckUpdate(bool $callInbox, string $curlRequest): void
     {
         $mockName    = 'Test Product Name';

app/code/Magento/AdminNotification/Test/Unit/Model/NotificationServiceTest.php

@@ -14,11 +14,14 @@
 use Magento\AdminNotification\Model\InboxFactory;
 use Magento\AdminNotification\Model\NotificationService;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class NotificationServiceTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * Retrieve instance of notification service model
      *
@@ -30,15 +33,11 @@ protected function _getServiceInstanceForMarkAsReadTest($notificationId)
         /**
          * @var MockObject|InboxFactory $notificationFactory
          */
-        $notificationFactory = $this->createPartialMock(
-            InboxFactory::class,
-            ['create']
+        $notificationFactory = $this->createMock(InboxFactory::class);
+        $notification = $this->createPartialMockWithReflection(
+            Inbox::class,
+            ['load', 'getId', 'save', 'setData', 'setIsRead']
         );
-        $notification = $this->getMockBuilder(Inbox::class)
-            ->addMethods(['setIsRead'])
-            ->onlyMethods(['load', 'getId', 'save', 'setData', '__sleep', '__wakeup'])
-            ->disableOriginalConstructor()
-            ->getMock();
         $notification->expects($this->once())->method('load')->with($notificationId)->willReturnSelf();
         $notification->expects($this->once())->method('getId')->willReturn($notificationId);
 

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

@@ -10,13 +10,17 @@
 use Magento\AdminNotification\Model\System\Message\CacheOutdated;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class CacheOutdatedTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var MockObject
      */
@@ -39,9 +43,9 @@ class CacheOutdatedTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->_authorizationMock = $this->getMockForAbstractClass(AuthorizationInterface::class);
-        $this->_urlInterfaceMock = $this->getMockForAbstractClass(UrlInterface::class);
-        $this->_cacheTypeListMock = $this->getMockForAbstractClass(TypeListInterface::class);
+        $this->_authorizationMock = $this->createMock(AuthorizationInterface::class);
+        $this->_urlInterfaceMock = $this->createMock(UrlInterface::class);
+        $this->_cacheTypeListMock = $this->createMock(TypeListInterface::class);
 
         $objectManagerHelper = new ObjectManager($this);
         $arguments = [
@@ -58,8 +62,8 @@ protected function setUp(): void
     /**
      * @param string $expectedSum
      * @param array $cacheTypes
-     * @dataProvider getIdentityDataProvider
      */
+    #[DataProvider('getIdentityDataProvider')]
     public function testGetIdentity($expectedSum, $types)
     {
         $cacheType = [];
@@ -77,9 +81,7 @@ public function testGetIdentity($expectedSum, $types)
 
     protected function getMockForStdClass($mockReturn)
     {
-        $cacheTypeMock = $this->getMockBuilder(\stdClass::class)->addMethods(['getCacheType'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $cacheTypeMock = $this->createPartialMockWithReflection(\stdClass::class, ['getCacheType']);
         $cacheTypeMock->method('getCacheType')->willReturn($mockReturn);
         return $cacheTypeMock;
     }
@@ -102,8 +104,8 @@ public static function getIdentityDataProvider()
      * @param bool $expected
      * @param bool $allowed
      * @param array $cacheTypes
-     * @dataProvider isDisplayedDataProvider
      */
+    #[DataProvider('isDisplayedDataProvider')]
     public function testIsDisplayed($expected, $allowed, $cacheTypes)
     {
         $cacheType1 = [];