Fix new usages after rebase

Jean85 · Jean85 · commit dbd94a22ec75 · 2017-01-09T14:57:24.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -19,12 +19,14 @@
     use PHPUnit\Framework\TestSuite;
     use PHPUnit\Util\Blacklist;
     use PHPUnit\Util\Test as TestUtil;
+    use PHPUnit\Framework\Warning;
 } else {
     use \PHPUnit_Framework_AssertionFailedError as AssertionFailedError;
     use \PHPUnit_Framework_BaseTestListener as BaseTestListener;
     use \PHPUnit_Framework_Test as Test;
     use \PHPUnit_Framework_TestCase as TestCase;
     use \PHPUnit_Framework_TestSuite as TestSuite;
+    use \PHPUnit_Framework_Warning as Warning;
     use \PHPUnit_Runner_BaseTestRunner as BaseTestRunner;
     use \PHPUnit_Util_Blacklist as Blacklist;
     use \PHPUnit_Util_Test as TestUtil;
@@ -191,18 +193,18 @@ public function startTest(Test $test)
         }
     }
 
-    public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time)
+    public function addWarning(Test $test, Warning $e, $time)
     {
-        if ($test instanceof \PHPUnit_Framework_TestCase) {
+        if ($test instanceof TestCase) {
             $this->testsWithWarnings[$test->getName()] = true;
         }
     }
 
     public function endTest(Test $test, $time)
     {
         $className = get_class($test);
-        $classGroups = \PHPUnit_Util_Test::getGroups($className);
-        $groups = \PHPUnit_Util_Test::getGroups($className, $test->getName(false));
+        $classGroups = TestUtil::getGroups($className);
+        $groups = TestUtil::getGroups($className, $test->getName(false));
 
         if ($this->expectedDeprecations) {
             restore_error_handler();
@@ -228,19 +230,19 @@ public function endTest(Test $test, $time)
             }
         }
 
-        if ($test instanceof \PHPUnit_Framework_TestCase && 0 === strpos($test->getName(), 'testLegacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $groups, true)) {
+        if ($test instanceof TestCase && 0 === strpos($test->getName(), 'testLegacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $groups, true)) {
             $result = $test->getTestResultObject();
 
             if (method_exists($result, 'addWarning')) {
-                $result->addWarning($test, new \PHPUnit_Framework_Warning('Using the "testLegacy" prefix to mark tests as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);
+                $result->addWarning($test, new Warning('Using the "testLegacy" prefix to mark tests as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);
             }
         }
 
-        if ($test instanceof \PHPUnit_Framework_TestCase && strpos($className, '\Legacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $classGroups, true)) {
+        if ($test instanceof TestCase && strpos($className, '\Legacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $classGroups, true)) {
             $result = $test->getTestResultObject();
 
             if (method_exists($result, 'addWarning')) {
-                $result->addWarning($test, new \PHPUnit_Framework_Warning('Using the "Legacy" prefix to mark all tests of a class as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);
+                $result->addWarning($test, new Warning('Using the "Legacy" prefix to mark all tests of a class as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,14 @@`
`19`	`19`	`use PHPUnit\Framework\TestSuite;`
`20`	`20`	`use PHPUnit\Util\Blacklist;`
`21`	`21`	`use PHPUnit\Util\Test as TestUtil;`
	`22`	`+ use PHPUnit\Framework\Warning;`
`22`	`23`	`} else {`
`23`	`24`	`use \PHPUnit_Framework_AssertionFailedError as AssertionFailedError;`
`24`	`25`	`use \PHPUnit_Framework_BaseTestListener as BaseTestListener;`
`25`	`26`	`use \PHPUnit_Framework_Test as Test;`
`26`	`27`	`use \PHPUnit_Framework_TestCase as TestCase;`
`27`	`28`	`use \PHPUnit_Framework_TestSuite as TestSuite;`
	`29`	`+ use \PHPUnit_Framework_Warning as Warning;`
`28`	`30`	`use \PHPUnit_Runner_BaseTestRunner as BaseTestRunner;`
`29`	`31`	`use \PHPUnit_Util_Blacklist as Blacklist;`
`30`	`32`	`use \PHPUnit_Util_Test as TestUtil;`
`@@ -191,18 +193,18 @@ public function startTest(Test $test)`
`191`	`193`	`}`
`192`	`194`	`}`
`193`	`195`
`194`		`- public function addWarning(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time)`
	`196`	`+ public function addWarning(Test $test, Warning $e, $time)`
`195`	`197`	`{`
`196`		`- if ($test instanceof \PHPUnit_Framework_TestCase) {`
	`198`	`+ if ($test instanceof TestCase) {`
`197`	`199`	`$this->testsWithWarnings[$test->getName()] = true;`
`198`	`200`	`}`
`199`	`201`	`}`
`200`	`202`
`201`	`203`	`public function endTest(Test $test, $time)`
`202`	`204`	`{`
`203`	`205`	`$className = get_class($test);`
`204`		`- $classGroups = \PHPUnit_Util_Test::getGroups($className);`
`205`		`- $groups = \PHPUnit_Util_Test::getGroups($className, $test->getName(false));`
	`206`	`+ $classGroups = TestUtil::getGroups($className);`
	`207`	`+ $groups = TestUtil::getGroups($className, $test->getName(false));`
`206`	`208`
`207`	`209`	`if ($this->expectedDeprecations) {`
`208`	`210`	`restore_error_handler();`
`@@ -228,19 +230,19 @@ public function endTest(Test $test, $time)`
`228`	`230`	`}`
`229`	`231`	`}`
`230`	`232`
`231`		`- if ($test instanceof \PHPUnit_Framework_TestCase && 0 === strpos($test->getName(), 'testLegacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $groups, true)) {`
	`233`	`+ if ($test instanceof TestCase && 0 === strpos($test->getName(), 'testLegacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $groups, true)) {`
`232`	`234`	`$result = $test->getTestResultObject();`
`233`	`235`
`234`	`236`	`if (method_exists($result, 'addWarning')) {`
`235`		`- $result->addWarning($test, new \PHPUnit_Framework_Warning('Using the "testLegacy" prefix to mark tests as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);`
	`237`	`+ $result->addWarning($test, new Warning('Using the "testLegacy" prefix to mark tests as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);`
`236`	`238`	`}`
`237`	`239`	`}`
`238`	`240`
`239`		`- if ($test instanceof \PHPUnit_Framework_TestCase && strpos($className, '\Legacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $classGroups, true)) {`
	`241`	`+ if ($test instanceof TestCase && strpos($className, '\Legacy') && !isset($this->testsWithWarnings[$test->getName()]) && !in_array('legacy', $classGroups, true)) {`
`240`	`242`	`$result = $test->getTestResultObject();`
`241`	`243`
`242`	`244`	`if (method_exists($result, 'addWarning')) {`
`243`		`- $result->addWarning($test, new \PHPUnit_Framework_Warning('Using the "Legacy" prefix to mark all tests of a class as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);`
	`245`	`+ $result->addWarning($test, new Warning('Using the "Legacy" prefix to mark all tests of a class as legacy is deprecated since version 3.3 and will be removed in 4.0. Use the "@group legacy" notation instead to add the test to the legacy group.'), $time);`
`244`	`246`	`}`
`245`	`247`	`}`
`246`	`248`	`}`