Merge "Use assertMatchesRegularExpression in EntityModificationTestHelper"

jenkins-bot · Gerrit Code Review · commit 00ae4fa4e8da · 2022-10-14T16:05:09.000Z
diff --git a/repo/tests/phpunit/includes/EntityModificationTestHelper.php b/repo/tests/phpunit/includes/EntityModificationTestHelper.php
@@ -246,11 +246,7 @@ public function assertRevisionSummary( $regex, $revid, $message = '' ) {
 
 		$entry = $this->mockRepository->getLogEntry( $revid );
 		Assert::assertNotNull( $entry, "revision not found: $revid" );
-		if ( method_exists( Assert::class, 'assertMatchesRegularExpression' ) ) {
-			Assert::assertMatchesRegularExpression( $regex, $entry['summary'], $message );
-		} else {
-			Assert::assertRegExp( $regex, $entry['summary'], $message );
-		}
+		Assert::assertMatchesRegularExpression( $regex, $entry['summary'], $message );
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -246,11 +246,7 @@ public function assertRevisionSummary( $regex, $revid, $message = '' ) {`
`246`	`246`
`247`	`247`	`$entry = $this->mockRepository->getLogEntry( $revid );`
`248`	`248`	`Assert::assertNotNull( $entry, "revision not found: $revid" );`
`249`		`- if ( method_exists( Assert::class, 'assertMatchesRegularExpression' ) ) {`
`250`		`- Assert::assertMatchesRegularExpression( $regex, $entry['summary'], $message );`
`251`		`- } else {`
`252`		`- Assert::assertRegExp( $regex, $entry['summary'], $message );`
`253`		`- }`
	`249`	`+ Assert::assertMatchesRegularExpression( $regex, $entry['summary'], $message );`
`254`	`250`	`}`
`255`	`251`
`256`	`252`	`}`