Merge pull request #200 from Yoast/feature/3.x/new-expectuserdeprecat…

…ion-polyfill-trait

PHPUnit 11 | ExpectUserDeprecationtrait: polyfill the TestCase::expectUserDeprecation*() methods

.github/workflows/test.yml

@@ -46,7 +46,10 @@ jobs:
           # it would result PHP 7.0 - 7.4 all using PHPUnit 6.4.4, which is not the intention.
           # It also would run into trouble with PHP 8.5.12 being used on PHP 8.0+, while the
           # 8.5.12 release still contained a bug which makes it incompatible with PHP 8.1+,
-          # even though it officially allows for it..
+          # even though it officially allows for it.
+          #
+          # Note: PHPUnit 10 is not supported for the PHPUnit Polyfills 3.x branch, so there are
+          # no builds against PHPUnit 10!
           - php: '7.0'
             phpunit: '6.4.4'
             coverage: true
@@ -86,12 +89,6 @@ jobs:
             phpunit: '9.3.0'
             coverage: true
             experimental: false
-          - php: '8.1'
-            # Specifically set at 10.0.12 minimum to prevent needing a toggle in the tests for something
-            # related to the ArrayIsList polyfill, but not necessarily relevant.
-            phpunit: '10.0.12'
-            coverage: true
-            experimental: false
           - php: '8.2'
             phpunit: '9.3.0'
             coverage: true
@@ -100,10 +97,6 @@ jobs:
             phpunit: '~11.1.0' # See note above about PHPUnit 11.2.
             coverage: true
             experimental: false
-          - php: '8.3'
-            phpunit: '10.1.0'
-            coverage: true
-            experimental: false
           - php: '8.3'
             phpunit: '11.0.0'
             coverage: true
@@ -114,10 +107,6 @@ jobs:
             phpunit: '^9.6'
             coverage: false
             experimental: true
-          - php: 'nightly'
-            phpunit: '^10.5'
-            coverage: false
-            experimental: true
           - php: 'nightly'
             phpunit: 'auto' # PHPUnit 11.x.
             coverage: false
@@ -132,9 +121,6 @@ jobs:
 
     continue-on-error: ${{ matrix.experimental }}
 
-    env:
-      EXTRA_PHPUNIT_CLIARGS: '--fail-on-deprecation --fail-on-notice'
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -178,40 +164,23 @@ jobs:
       - name: "DEBUG: Show grabbed version"
         run: echo ${{ steps.phpunit_version.outputs.VERSION }}
 
-      # NEEDS_MIGRATION toggle has two functions:
-      # 1. yes/no run PHPUnit "migrate-configuration" for PHPUnit 10.1+.
-      # 2. yes/no pass the "EXTRA_PHPUNIT_CLIARGS" on PHPUnit 10.1+ (which can't be added to the config as that would
-      #    make the config incompatible with PHPUnit 10.0).
-      # The variable should only be set for the "yes" cases.
       - name: Determine PHPUnit config
         id: phpunit_config
         run: |
           if [ "${{ matrix.phpunit == 'dev-main' }}" == "true" ]; then
             echo 'FILE=phpunit10.xml.dist' >> $GITHUB_OUTPUT
-            echo 'NEEDS_MIGRATION=true' >> $GITHUB_OUTPUT
-          elif [ "${{ steps.phpunit_version.outputs.VERSION }}" == "10.0" ]; then
-            echo 'FILE=phpunit10.xml.dist' >> $GITHUB_OUTPUT
-          elif [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) || startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
+          elif [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
             echo 'FILE=phpunit10.xml.dist' >> $GITHUB_OUTPUT
-            echo 'NEEDS_MIGRATION=true' >> $GITHUB_OUTPUT
           else
             echo 'FILE=phpunit.xml.dist' >> $GITHUB_OUTPUT
           fi
 
-        # Migrate PHPUnit configuration to deal with changes in the coverage/source setting across PHPUnit 10.x
-        # versions as otherwise the warnings about these would fail the build (which to me, feels like a bug).
-      - name: "Migrate configuration (PHPUnit 10.1+)"
-        if: ${{ steps.phpunit_config.outputs.NEEDS_MIGRATION }}
-        continue-on-error: true
-        run: vendor/bin/phpunit -c ${{ steps.phpunit_config.outputs.FILE }} --migrate-configuration
-
       - name: "Run the unit tests"
         # Don't fail the build on a test run failure against a future PHPUnit version.
         continue-on-error: ${{ matrix.phpunit == 'dev-main' }}
         run: >
           vendor/bin/phpunit -c ${{ steps.phpunit_config.outputs.FILE }}
           ${{ ! matrix.coverage && '--no-coverage' || '' }}
-          ${{ steps.phpunit_config.outputs.NEEDS_MIGRATION && env.EXTRA_PHPUNIT_CLIARGS || '' }}
 
       - name: Upload coverage results to Coveralls
         if: ${{ success() && matrix.coverage == true }}
@@ -310,21 +279,7 @@ jobs:
             phpunit: '9'
             coverage: true
 
-          # PHPUnit 10 is fully supported for the officially supported PHP versions.
-          - php: '8.1'
-            phpunit: '10.0'
-            coverage: true
-          - php: '8.1'
-            phpunit: '10'
-          - php: '8.2'
-            phpunit: '10.0'
-          - php: '8.2'
-            phpunit: '10'
-          - php: '8.3'
-            phpunit: '10.0'
-          - php: '8.3'
-            phpunit: '10'
-            coverage: true
+          # PHPUnit 10 is NOT supported in PHPUnit Polyfills 3.x.
 
           # PHPUnit 11 is fully supported for the officially supported PHP versions.
           #
@@ -344,18 +299,13 @@ jobs:
           # Experimental builds.
           - php: 'nightly'
             phpunit: '9'
-          - php: 'nightly'
-            phpunit: '10'
           - php: 'nightly'
             phpunit: '11'
 
     name: "PHAR test: PHP ${{ matrix.php }} - PHPUnit: ${{matrix.phpunit}}"
 
     continue-on-error: ${{ matrix.php == 'nightly' }}
 
-    env:
-      EXTRA_PHPUNIT_CLIARGS: '--fail-on-deprecation --fail-on-notice'
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -403,35 +353,19 @@ jobs:
       - name: "DEBUG: Show grabbed version"
         run: echo ${{ steps.phpunit_version.outputs.VERSION }}
 
-      # NEEDS_MIGRATION toggle has two functions:
-      # 1. yes/no run PHPUnit "migrate-configuration" for PHPUnit 10.1+.
-      # 2. yes/no pass the "EXTRA_PHPUNIT_CLIARGS" on PHPUnit 10.1+ (which can't be added to the config as that would
-      #    make the config incompatible with PHPUnit 10.0).
-      # The variable should only be set for the "yes" cases.
       - name: Determine PHPUnit config
         id: phpunit_config
         run: |
-          if [ "${{ steps.phpunit_version.outputs.VERSION }}" == "10.0" ]; then
-            echo 'FILE=phpunit10.xml.dist' >> $GITHUB_OUTPUT
-          elif [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '10.' ) || startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
+          if [ "${{ startsWith( steps.phpunit_version.outputs.VERSION, '11.' ) }}" == "true" ]; then
             echo 'FILE=phpunit10.xml.dist' >> $GITHUB_OUTPUT
-            echo 'NEEDS_MIGRATION=true' >> $GITHUB_OUTPUT
           else
             echo 'FILE=phpunit.xml.dist' >> $GITHUB_OUTPUT
           fi
 
-        # Migrate PHPUnit configuration to deal with changes in the coverage/source setting across PHPUnit 10.x
-        # versions as otherwise the warnings about these would fail the build (which to me, feels like a bug).
-      - name: "Migrate configuration (PHPUnit 10.1+)"
-        if: ${{ steps.phpunit_config.outputs.NEEDS_MIGRATION }}
-        continue-on-error: true
-        run: phpunit -c ${{ steps.phpunit_config.outputs.FILE }} --migrate-configuration
-
       - name: "Run the unit tests"
         run: >
           phpunit -c ${{ steps.phpunit_config.outputs.FILE }}
           ${{ ! matrix.coverage && '--no-coverage' || '' }}
-          ${{ steps.phpunit_config.outputs.NEEDS_MIGRATION && env.EXTRA_PHPUNIT_CLIARGS || '' }}
 
       - name: Upload coverage results to Coveralls
         if: ${{ success() && matrix.coverage }}

README.md

@@ -443,6 +443,36 @@ Refactoring tests which still use `Assert::assertArraySubset()` to use the new a
 [`Assert::assertArrayIsIdenticalToArrayOnlyConsideringListOfKeys()`]: https://docs.phpunit.de/en/main/assertions.html#assertarrayisidenticaltoarrayonlyconsideringlistofkeys
 [`Assert::assertArrayIsIdenticalToArrayIgnoringListOfKeys()`]:        https://docs.phpunit.de/en/main/assertions.html#assertarrayisidenticaltoarrayignoringlistofkeys
 
+#### PHPUnit < 11.0.0: `Yoast\PHPUnitPolyfills\Polyfills\ExpectUserDeprecation`
+
+|                                              |                                                     |
+| -------------------------------------------- | --------------------------------------------------- |
+| [`TestCase::expectUserDeprecationMessage()`] | [`TestCase::expectUserDeprecationMessageMatches()`] |
+
+These methods were introduced in PHPUnit 11.0.0.
+
+This functionality resembles the functionality previously offered by the `TestCase::expectDeprecationMessage()` and `TestCase::expectDeprecationMessageMatches()` methods, which were removed in PHPUnit 10.0.0.
+
+The polyfill use the old methods under the hood for PHPUnit <= 9, however, there are some pertinent differences in behaviour between the old and the new methods, which users of the polyfill should be aware of.
+
+| PHPUnit <= 9.x | PHPUnit >= 11.0 |
+| -------------- | --------------- |
+| Only one deprecation can be expected per test | Multiple deprecations can be expected per test |
+| The test stops running as soon as the deprecation message has been seen | The test will be executed completely, independently of the deprecation notice |
+| The message passed to `expectUserDeprecationMessage()` will be compared as a substring | The message passed to `expectUserDeprecationMessage()` must be an exact match |
+| Can expect both PHP native and user-land deprecation notices | Can only expect user-land deprecation notices, i.e. `E_USER_DEPRECATED`, not `E_DEPRECATED` |
+
+Please keep these differences in mind when writing tests using the `expectUserDeprecationMessage*()` methods.
+
+Note: on PHPUnit 9.5.x, when using the `expectUserDeprecationMessage*()` expectations, a "_Expecting E_DEPRECATED and E_USER_DEPRECATED is deprecated and will no longer be possible in PHPUnit 10._" deprecation will be shown in the test output.
+As long at the actual test uses the `expectUserDeprecationMessage*()` expectations, this depreation message can be safely ignored.
+
+> :information_source: Important: when using the `expectUserDeprecationMessage*()` expectation(s) in a test, the test should be annotated with a [`#[IgnoreDeprecations]`][ignoredeprecations-attribute] attribute.
+
+[`TestCase::expectUserDeprecationMessage()`]:        https://docs.phpunit.de/en/main/error-handling.html#expecting-deprecations-e-user-deprecated
+[`TestCase::expectUserDeprecationMessageMatches()`]: https://docs.phpunit.de/en/main/error-handling.html#expecting-deprecations-e-user-deprecated
+[ignoredeprecations-attribute]:                      https://docs.phpunit.de/en/main/attributes.html#ignoredeprecations
+
 #### PHPUnit < 11.2.0: `Yoast\PHPUnitPolyfills\Polyfills\AssertObjectNotEquals`
 
 Polyfills the [`Assert::assertObjectNotEquals()`] method to verify two (value) objects are **_not_** considered equal.

composer.json

@@ -27,7 +27,7 @@
 	},
 	"require": {
 		"php": ">=7.0",
-		"phpunit/phpunit": "^6.4.4 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
+		"phpunit/phpunit": "^6.4.4 || ^7.0 || ^8.0 || ^9.0 || ^11.0"
 	},
 	"require-dev": {
 		"php-parallel-lint/php-console-highlighter": "^1.0.0",

phpstan.neon.dist

@@ -26,6 +26,11 @@ parameters:
 			count: 2
 			path: src/Polyfills/AssertIsList.php
 
+		-
+			message: '`^Call to an undefined method Yoast\\PHPUnitPolyfills\\TestCases\\[X]?TestCase::expectExceptionMessageRegExp\(\)\.$`'
+			count: 2
+			path: src/Polyfills/ExpectUserDeprecation.php
+
 		# Level 5
 		-
 			# False positive, a string callback is perfectly fine, especially for static methods.

phpunit10.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd"
     backupGlobals="true"
     bootstrap="./tests/bootstrap.php"
     beStrictAboutOutputDuringTests="true"
@@ -14,6 +14,8 @@
     displayDetailsOnTestsThatTriggerNotices="true"
     displayDetailsOnTestsThatTriggerDeprecations="true"
     failOnWarning="true"
+    failOnNotice="true"
+    failOnDeprecation="true"
     >
 
     <testsuites>
@@ -22,13 +24,16 @@
         </testsuite>
     </testsuites>
 
-    <coverage includeUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">./src/</directory>
         </include>
         <exclude>
             <file>src/Polyfills/AssertClosedResource_Empty.php</file>
         </exclude>
+    </source>
+
+    <coverage includeUncoveredFiles="true">
         <report>
             <text outputFile="php://stdout" showOnlySummary="true"/>
             <clover outputFile="build/logs/clover.xml"/>

phpunitpolyfills-autoload.php

@@ -86,6 +86,10 @@ public static function load( $className ) {
 					self::loadAssertArrayWithListKeys();
 					return true;
 
+				case 'Yoast\PHPUnitPolyfills\Polyfills\ExpectUserDeprecation':
+					self::loadExpectUserDeprecation();
+					return true;
+
 				case 'Yoast\PHPUnitPolyfills\Polyfills\AssertObjectNotEquals':
 					self::loadAssertObjectNotEquals();
 					return true;
@@ -339,6 +343,23 @@ public static function loadAssertArrayWithListKeys() {
 			require_once __DIR__ . '/src/Polyfills/AssertArrayWithListKeys_Empty.php';
 		}
 
+		/**
+		 * Load the ExpectUserDeprecation polyfill or an empty trait with the same name
+		 * if a PHPUnit version is used which already contains this functionality.
+		 *
+		 * @return void
+		 */
+		public static function loadExpectUserDeprecation() {
+			if ( \method_exists( TestCase::class, 'expectUserDeprecationMessage' ) === false ) {
+				// PHPUnit < 11.0.0.
+				require_once __DIR__ . '/src/Polyfills/ExpectUserDeprecation.php';
+				return;
+			}
+
+			// PHPUnit >= 11.0.0.
+			require_once __DIR__ . '/src/Polyfills/ExpectUserDeprecation_Empty.php';
+		}
+
 		/**
 		 * Load the AssertObjectNotEquals polyfill or an empty trait with the same name
 		 * if a PHPUnit version is used which already contains this functionality.

src/Polyfills/ExpectUserDeprecation.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Yoast\PHPUnitPolyfills\Polyfills;
+
+use PHPUnit\Framework\Error\Deprecated;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Polyfill the TestCase::expectUserDeprecationMessage() and the TestCase::expectUserDeprecationMessageMatches() methods.
+ *
+ * Introduced in PHPUnit 11.0.0.
+ *
+ * Note: PHPUnit 10 is not and will not be supported for these polyfills.
+ *
+ * @link https://github.com/sebastianbergmann/phpunit/pull/5605
+ */
+trait ExpectUserDeprecation {
+
+	/**
+	 * Set expectation for the message when receiving a user defined deprecation notice.
+	 *
+	 * @param string $expectedUserDeprecationMessage The message to expect.
+	 *
+	 * @return void
+	 */
+	final protected function expectUserDeprecationMessage( string $expectedUserDeprecationMessage ) {
+		if ( \method_exists( TestCase::class, 'expectDeprecationMessage' ) ) {
+			// PHPUnit 8.4.0 - 9.x.
+			$this->expectDeprecation();
+			$this->expectDeprecationMessage( $expectedUserDeprecationMessage );
+			return;
+		}
+
+		// PHPUnit < 8.4.0.
+		$this->expectException( Deprecated::class );
+		$this->expectExceptionMessage( $expectedUserDeprecationMessage );
+	}
+
+	/**
+	 * Set expectation for the message when receiving a user defined deprecation notice (regex based).
+	 *
+	 * @param string $expectedUserDeprecationMessageRegularExpression A regular expression which must match the message.
+	 *
+	 * @return void
+	 */
+	final protected function expectUserDeprecationMessageMatches( string $expectedUserDeprecationMessageRegularExpression ) {
+		if ( \method_exists( TestCase::class, 'expectDeprecationMessageMatches' ) ) {
+			// PHPUnit 8.4.0 - 9.x.
+			$this->expectDeprecation();
+			$this->expectDeprecationMessageMatches( $expectedUserDeprecationMessageRegularExpression );
+			return;
+		}
+
+		// PHPUnit < 8.4.0.
+		$this->expectException( Deprecated::class );
+		$this->expectExceptionMessageRegExp( $expectedUserDeprecationMessageRegularExpression );
+	}
+}

src/Polyfills/ExpectUserDeprecation_Empty.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Yoast\PHPUnitPolyfills\Polyfills;
+
+/**
+ * Empty trait for use with PHPUnit >= 11.0.0 in which this polyfill is not needed.
+ */
+trait ExpectUserDeprecation {}

src/TestCases/TestCasePHPUnitGte8.php

@@ -14,6 +14,7 @@
 use Yoast\PHPUnitPolyfills\Polyfills\AssertObjectProperty;
 use Yoast\PHPUnitPolyfills\Polyfills\EqualToSpecializations;
 use Yoast\PHPUnitPolyfills\Polyfills\ExpectExceptionMessageMatches;
+use Yoast\PHPUnitPolyfills\Polyfills\ExpectUserDeprecation;
 
 /**
  * Basic test case for use with PHPUnit >= 8.
@@ -37,6 +38,7 @@ abstract class TestCase extends PHPUnit_TestCase {
 	use AssertObjectProperty;
 	use EqualToSpecializations;
 	use ExpectExceptionMessageMatches;
+	use ExpectUserDeprecation;
 
 	/**
 	 * This method is called before the first test of this test class is run.