Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 44a5d1dda401 · 2019-08-03T16:00:31.000+02:00
* 3.4:
  Adopt `@PHPUnit55Migration:risky` rule of php-cs-fixer
diff --git a/Tests/Resources/TranslationFilesTest.php b/Tests/Resources/TranslationFilesTest.php
@@ -20,11 +20,7 @@ class TranslationFilesTest extends TestCase
      */
     public function testTranslationFileIsValid($filePath)
     {
-        if (class_exists('PHPUnit_Util_XML')) {
-            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
-        } else {
-            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
-        }
+        \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
 
         $this->addToAssertionCount(1);
     }

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,7 @@ class TranslationFilesTest extends TestCase`
`20`	`20`	`*/`
`21`	`21`	`public function testTranslationFileIsValid($filePath)`
`22`	`22`	`{`
`23`		`- if (class_exists('PHPUnit_Util_XML')) {`
`24`		`- \PHPUnit_Util_XML::loadfile($filePath, false, false, true);`
`25`		`- } else {`
`26`		`- \PHPUnit\Util\XML::loadfile($filePath, false, false, true);`
`27`		`- }`
	`23`	`+ \PHPUnit\Util\XML::loadfile($filePath, false, false, true);`
`28`	`24`
`29`	`25`	`$this->addToAssertionCount(1);`
`30`	`26`	`}`