Skip to content

Commit 956898d

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Fix typo Fix deprecated libxml_disable_entity_loader Add Tagalog translations for validator messages 94, 95, 96 and 99 PHPUnit's assertContains() performs strict comparisons now. [ClassLoader][Routing] Fix namespace parsing on php 8. Fix deprecated libxml_disable_entity_loader Made reference to PHPUnit\Util\XML::loadfile php5-compatible. [Validator] Add missing translations for german and vietnamese Modernized deprecated PHPUnit assertion calls [Console] The message of "class not found" errors has changed in php 8. The PHPUnit\Util\XML class has been removed in PHPUnit 9.3. [Console] Make sure we pass a numeric array of arguments to call_user_func_array(). [Serializer] Fix that it will never reach DOMNode [Validator] sync translations [VarDumper] Improve previous fix on light array coloration [Cache] Fix #37667
2 parents 44bba5d + 36efa3a commit 956898d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Command/LintCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testLintIncorrectFile()
4343
$ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
4444

4545
$this->assertEquals(1, $ret, 'Returns 1 in case of error');
46-
$this->assertRegExp('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
46+
$this->assertMatchesRegularExpression('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
4747
}
4848

4949
public function testLintFileNotReadable()
@@ -64,7 +64,7 @@ public function testLintFileCompileTimeException()
6464
$ret = $tester->execute(['filename' => [$filename]], ['decorated' => false]);
6565

6666
$this->assertEquals(1, $ret, 'Returns 1 in case of error');
67-
$this->assertRegExp('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
67+
$this->assertMatchesRegularExpression('/ERROR in \S+ \(line /', trim($tester->getDisplay()));
6868
}
6969

7070
/**

0 commit comments

Comments
 (0)