Merge branch '2.8' into 3.2

* 2.8:
  Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes

Author: nicolas-grekas

Core/Tests/Resources/TranslationFilesTest.php

@@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase
      */
     public function testTranslationFileIsValid($filePath)
     {
-        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+        if (class_exists('PHPUnit_Util_XML')) {
+            \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+        } else {
+            \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
+        }
     }
 
     public function provideTranslationFiles()

Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php

@@ -29,7 +29,7 @@ public static function setUpBeforeClass()
         try {
             random_bytes(1);
         } catch (\Exception $e) {
-            throw new \PHPUnit_Framework_SkippedTestError($e->getMessage());
+            self::markTestSkipped($e->getMessage());
         }
     }