Merge branch '4.4' into 5.1

fabpot · fabpot · commit 3bac6a361912 · 2020-08-17T12:01:29.000+02:00
* 4.4:
  stop using deprecated PHPUnit APIs
diff --git a/Tests/Command/LintCommandTest.php b/Tests/Command/LintCommandTest.php
@@ -91,7 +91,7 @@ public function testLintFileWithReportedDeprecation()
         $ret = $tester->execute(['filename' => [$filename], '--show-deprecations' => true], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of error');
-        $this->assertRegExp('/ERROR  in \S+ \(line 1\)/', trim($tester->getDisplay()));
+        $this->assertMatchesRegularExpression('/ERROR  in \S+ \(line 1\)/', trim($tester->getDisplay()));
         $this->assertStringContainsString('Filter "deprecated_filter" is deprecated', trim($tester->getDisplay()));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function testLintFileWithReportedDeprecation()`
`91`	`91`	`$ret = $tester->execute(['filename' => [$filename], '--show-deprecations' => true], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE, 'decorated' => false]);`
`92`	`92`
`93`	`93`	`$this->assertEquals(1, $ret, 'Returns 1 in case of error');`
`94`		`- $this->assertRegExp('/ERROR in \S+ \(line 1\)/', trim($tester->getDisplay()));`
	`94`	`+ $this->assertMatchesRegularExpression('/ERROR in \S+ \(line 1\)/', trim($tester->getDisplay()));`
`95`	`95`	`$this->assertStringContainsString('Filter "deprecated_filter" is deprecated', trim($tester->getDisplay()));`
`96`	`96`	`}`
`97`	`97`