Merge remote-tracking branch 'origin/AC-12092_PHPUnit10' into AC-12092_PHPUnit10

Author: Raj Mohan

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/VariationMatrixTest.php

@@ -45,8 +45,8 @@ public function testGetVariations($expectedResult)
     public static function variationProvider()
     {
         return [
-            'with_attribute_id' => [
-                'expectedResult' => [
+            [
+                [
                     'result' => [
                         [
                             130 => [
@@ -101,10 +101,8 @@ public static function variationProvider()
                             ],
                         ],
                     ]
-                ]
-            ],
-            'without_attribute_id' => [
-                'expectedResult' => [
+                ],
+                [
                     'result' => [
                         [
                             130 => [

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

@@ -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

@@ -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

@@ -75,8 +75,6 @@ public function testBeforePublishMass(
     ): void {
         if ($willThrowException) {
             $this->expectException(AuthorizationException::class);
-        } else {
-            $this->expectNotToPerformAssertions();
         }
         $customer = $this->getMockForAbstractClass(CustomerInterface::class);
         $customer->method('getGroupId')->willReturn($groupId);

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

@@ -66,9 +66,6 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testExecute()
     {
         $this->pageConfigMock->expects($this->once())
@@ -94,9 +91,6 @@ public function testDispatchRejectsWhenDisabled()
         $this->indexAction->dispatch($request);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testDispatchIsSuccessfulWhenEnabled()
     {
         $request = self::getMockBuilder(Http::class)

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

@@ -37,9 +37,6 @@ protected function setUp(): void
         $this->setter = new DefaultPageSizeSetter($this->configProvider);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testPageSizeIsNotSetWhenLimitingIsDisabled()
     {
         $this->configProvider->method('isInputLimitingEnabled')
@@ -54,9 +51,6 @@ public function testPageSizeIsNotSetWhenLimitingIsDisabled()
         $this->setter->processSearchCriteria($searchCriteria);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testPageSizeIsNotSetWhenAlreadySet()
     {
         $this->configProvider->method('isInputLimitingEnabled')
@@ -71,9 +65,6 @@ public function testPageSizeIsNotSetWhenAlreadySet()
         $this->setter->processSearchCriteria($searchCriteria);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testPageSizeIsSetWithPreferredConfigValue()
     {
         $this->configProvider->method('isInputLimitingEnabled')
@@ -92,9 +83,6 @@ public function testPageSizeIsSetWithPreferredConfigValue()
         $this->setter->processSearchCriteria($searchCriteria, 678);
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testPageSizeIsSetWithPreferredFallbackValue()
     {
         $this->configProvider->method('isInputLimitingEnabled')

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

@@ -414,9 +414,6 @@ public function testArrayOfDataObjectPropertiesIsValidated()
         );
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testDefaultPageSizeSetterIsInvoked()
     {
         $this->defaultPageSizeSetter->expects(self::once())

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

@@ -48,10 +48,7 @@ protected function setUp(): void
             $this->inputArraySizeLimitValueMock
         );
     }
-
-    /**
-     * @doesNotPerformAssertions
-     */
+    
     public function testAllowsDataWhenBelowLimitWhenUsingRouteInputLimit()
     {
         $this->configMock->expects(self::once())
@@ -65,9 +62,6 @@ public function testAllowsDataWhenBelowLimitWhenUsingRouteInputLimit()
         $this->validator->validateComplexArrayType("foo", array_fill(0, 5, []));
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testFailsDataWhenAboveLimitUsingRouteInputLimit()
     {
         $this->expectException(InvalidArgumentException::class);
@@ -83,9 +77,6 @@ public function testFailsDataWhenAboveLimitUsingRouteInputLimit()
         $this->validator->validateComplexArrayType("foo", array_fill(0, 5, []));
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testAllowsDataWhenBelowLimit()
     {
         $this->configMock->expects(self::once())
@@ -100,9 +91,6 @@ public function testAllowsDataWhenBelowLimit()
         $this->validator->validateComplexArrayType("foo", array_fill(0, 3, []));
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testAllowsDataWhenBelowLimitUsingConfig()
     {
         $this->configMock->expects(self::once())
@@ -117,9 +105,6 @@ public function testAllowsDataWhenBelowLimitUsingConfig()
         $this->validator->validateComplexArrayType("foo", array_fill(0, 5, []));
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testFailsDataWhenAboveLimit()
     {
         $this->expectException(InvalidArgumentException::class);
@@ -136,9 +121,6 @@ public function testFailsDataWhenAboveLimit()
         $this->validator->validateComplexArrayType("foo", array_fill(0, 4, []));
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testFailsDataWhenAboveLimitUsingConfig()
     {
         $this->expectException(InvalidArgumentException::class);
@@ -155,9 +137,6 @@ public function testFailsDataWhenAboveLimitUsingConfig()
         $this->validator->validateComplexArrayType("foo", array_fill(0, 7, []));
     }
 
-    /**
-     * @doesNotPerformAssertions
-     */
     public function testAboveLimitWithDisabledLimiting()
     {
         $this->configMock->expects(self::once())