Merge branch 'ACP2E-3672' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-02-11-2025

Author: chittima

app/code/Magento/Csp/Test/Unit/Plugin/StoreAssetIntegrityHashesTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -62,7 +62,6 @@ protected function setUp(): void
      * Test After Deploy method of plugin
      *
      * @return void
-     * @doesNotPerformAssertions
      */
     public function testAfterDeploy(): void
     {

app/code/Magento/Customer/Test/Unit/Model/AccountManagementApiTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -433,8 +433,6 @@ public function testBeforeCreateAccount(
     ): void {
         if ($willThrowException) {
             $this->expectException(AuthorizationException::class);
-        } else {
-            $this->expectNotToPerformAssertions();
         }
         $this->authorizationMock
             ->expects($this->once())

app/code/Magento/Customer/Test/Unit/Plugin/AsyncRequestCustomerGroupAuthorizationTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -86,7 +86,6 @@ public function testBeforePublishMass(
             [$customer, 'Password1', '']
         ];
         $this->authorizationMock
-            ->expects($this->once())
             ->method('isAllowed')
             ->with('Magento_Customer::manage')
             ->willReturn($isAllowed);

app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php

@@ -1,7 +1,7 @@
 <?php
-/***
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/**
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -67,9 +67,10 @@ protected function setUp(): void
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws NotFoundException
      */
-    public function testExecute()
+    public function testExecute(): void
     {
         $this->pageConfigMock->expects($this->once())
             ->method('addBodyClass')
@@ -95,9 +96,10 @@ public function testDispatchRejectsWhenDisabled()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws NotFoundException
      */
-    public function testDispatchIsSuccessfulWhenEnabled()
+    public function testDispatchIsSuccessfulWhenEnabled(): void
     {
         $request = self::getMockBuilder(Http::class)
             ->disableOriginalConstructor()

lib/internal/Magento/Framework/Webapi/Test/Unit/InputLimit/DefaultPageSizeSetterTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -38,9 +38,9 @@ protected function setUp(): void
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
      */
-    public function testPageSizeIsNotSetWhenLimitingIsDisabled()
+    public function testPageSizeIsNotSetWhenLimitingIsDisabled(): void
     {
         $this->configProvider->method('isInputLimitingEnabled')
             ->willReturn(false);
@@ -55,9 +55,9 @@ public function testPageSizeIsNotSetWhenLimitingIsDisabled()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
      */
-    public function testPageSizeIsNotSetWhenAlreadySet()
+    public function testPageSizeIsNotSetWhenAlreadySet(): void
     {
         $this->configProvider->method('isInputLimitingEnabled')
             ->willReturn(true);
@@ -72,9 +72,9 @@ public function testPageSizeIsNotSetWhenAlreadySet()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
      */
-    public function testPageSizeIsSetWithPreferredConfigValue()
+    public function testPageSizeIsSetWithPreferredConfigValue(): void
     {
         $this->configProvider->method('isInputLimitingEnabled')
             ->willReturn(true);
@@ -93,9 +93,9 @@ public function testPageSizeIsSetWithPreferredConfigValue()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
      */
-    public function testPageSizeIsSetWithPreferredFallbackValue()
+    public function testPageSizeIsSetWithPreferredFallbackValue(): void
     {
         $this->configProvider->method('isInputLimitingEnabled')
             ->willReturn(true);

lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -415,9 +415,10 @@ public function testArrayOfDataObjectPropertiesIsValidated()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws Exception
      */
-    public function testDefaultPageSizeSetterIsInvoked()
+    public function testDefaultPageSizeSetterIsInvoked(): void
     {
         $this->defaultPageSizeSetter->expects(self::once())
             ->method('processSearchCriteria')

lib/internal/Magento/Framework/Webapi/Test/Unit/Validator/EntityArrayValidatorTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -50,9 +50,12 @@ protected function setUp(): void
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testAllowsDataWhenBelowLimitWhenUsingRouteInputLimit()
+    public function testAllowsDataWhenBelowLimitWhenUsingRouteInputLimit(): void
     {
         $this->configMock->expects(self::once())
             ->method('isInputLimitingEnabled')
@@ -66,9 +69,12 @@ public function testAllowsDataWhenBelowLimitWhenUsingRouteInputLimit()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testFailsDataWhenAboveLimitUsingRouteInputLimit()
+    public function testFailsDataWhenAboveLimitUsingRouteInputLimit(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Maximum items of type "foo" is 4');
@@ -84,9 +90,12 @@ public function testFailsDataWhenAboveLimitUsingRouteInputLimit()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testAllowsDataWhenBelowLimit()
+    public function testAllowsDataWhenBelowLimit(): void
     {
         $this->configMock->expects(self::once())
             ->method('isInputLimitingEnabled')
@@ -101,9 +110,12 @@ public function testAllowsDataWhenBelowLimit()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testAllowsDataWhenBelowLimitUsingConfig()
+    public function testAllowsDataWhenBelowLimitUsingConfig(): void
     {
         $this->configMock->expects(self::once())
             ->method('isInputLimitingEnabled')
@@ -118,9 +130,12 @@ public function testAllowsDataWhenBelowLimitUsingConfig()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testFailsDataWhenAboveLimit()
+    public function testFailsDataWhenAboveLimit(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Maximum items of type "foo" is 3');
@@ -137,9 +152,12 @@ public function testFailsDataWhenAboveLimit()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testFailsDataWhenAboveLimitUsingConfig()
+    public function testFailsDataWhenAboveLimitUsingConfig(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Maximum items of type "foo" is 6');
@@ -156,9 +174,12 @@ public function testFailsDataWhenAboveLimitUsingConfig()
     }
 
     /**
-     * @doesNotPerformAssertions
+     * @return void
+     * @throws InvalidArgumentException
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testAboveLimitWithDisabledLimiting()
+    public function testAboveLimitWithDisabledLimiting(): void
     {
         $this->configMock->expects(self::once())
             ->method('isInputLimitingEnabled')