Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit d5b6a16b6c77 · 2017-02-21T09:33:48.000+01:00
* 2.7:
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes
diff --git a/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/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());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static function setUpBeforeClass()`
`29`	`29`	`try {`
`30`	`30`	`random_bytes(1);`
`31`	`31`	`} catch (\Exception $e) {`
`32`		`- throw new \PHPUnit_Framework_SkippedTestError($e->getMessage());`
	`32`	`+ self::markTestSkipped($e->getMessage());`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`