Merge pull request #90 from Yoast/feature/phpunit-10-tweak-test-expec…

…tations AssertClosedResource* Tests: update exception message expectation
Yoast · Mar 10, 2023 · 4485b06 · 4485b06
2 parents 686f13b + 86657f3
commit 4485b06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/Polyfills/AssertClosedResourceNotResourceTest.php b/tests/Polyfills/AssertClosedResourceNotResourceTest.php
@@ -31,7 +31,7 @@ final class AssertClosedResourceNotResourceTest extends TestCase {
 	 * @return void
 	 */
 	public function testAssertIsClosedResource( $value ) {
-		$pattern   = '`^Failed asserting that .+? is of type "resource \(closed\)"`s';
+		$pattern   = '`^Failed asserting that .+? is of type ["]?resource \(closed\)["]?`s';
 		$exception = 'PHPUnit\Framework\AssertionFailedError';
 		if ( \class_exists( 'PHPUnit_Framework_AssertionFailedError' ) ) {
 			// PHPUnit < 6.

diff --git a/tests/Polyfills/AssertClosedResourceTestCase.php b/tests/Polyfills/AssertClosedResourceTestCase.php
@@ -24,7 +24,7 @@ abstract class AssertClosedResourceTestCase extends TestCase {
 	 * @return void
 	 */
 	public function isClosedResourceExpectExceptionOnOpenResource( $actual ) {
-		$pattern   = '`^Failed asserting that .+? is of type "resource \(closed\)"`';
+		$pattern   = '`^Failed asserting that .+? is of type ["]?resource \(closed\)["]?`';
 		$exception = 'PHPUnit\Framework\AssertionFailedError';
 		if ( \class_exists( 'PHPUnit_Framework_AssertionFailedError' ) ) {
 			// PHPUnit < 6.
@@ -49,7 +49,7 @@ public function isNotClosedResourceExpectExceptionOnClosedResource( $actual ) {
 		 * PHPUnit itself will report closed resources as `NULL` prior to Exporter 3.0.4/4.1.4.
 		 * See: https://github.com/sebastianbergmann/exporter/pull/37
 		 */
-		$pattern   = '`^Failed asserting that (resource \(closed\)|NULL) is not of type "resource \(closed\)"`';
+		$pattern   = '`^Failed asserting that (resource \(closed\)|NULL) is not of type ["]?resource \(closed\)["]?`';
 		$exception = 'PHPUnit\Framework\AssertionFailedError';
 		if ( \class_exists( 'PHPUnit_Framework_AssertionFailedError' ) ) {
 			// PHPUnit < 6.