Merge branch '2.7' into 2.8

* 2.7: Update to PHPUnit namespaces remove translation data collector when not usable
symfony · Feb 18, 2017 · e017c13 · e017c13
2 parents 9773908 + 144acc8
commit e017c13
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Process\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\ExecutableFinder;
 
 /**
  * @author Chris Smith <chris@cs278.org>
  */
-class ExecutableFinderTest extends \PHPUnit_Framework_TestCase
+class ExecutableFinderTest extends TestCase
 {
     private $path;
 

diff --git a/Tests/PhpExecutableFinderTest.php b/Tests/PhpExecutableFinderTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Process\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\PhpExecutableFinder;
 
 /**
  * @author Robert Schönthal <seroscho@googlemail.com>
  */
-class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
+class PhpExecutableFinderTest extends TestCase
 {
     /**
      * tests find() with the env var PHP_PATH.

diff --git a/Tests/PhpProcessTest.php b/Tests/PhpProcessTest.php
@@ -11,10 +11,11 @@
 
 namespace Symfony\Component\Process\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\PhpProcess;
 
-class PhpProcessTest extends \PHPUnit_Framework_TestCase
+class PhpProcessTest extends TestCase
 {
     public function testNonBlockingWorks()
     {

diff --git a/Tests/ProcessBuilderTest.php b/Tests/ProcessBuilderTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Process\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\ProcessBuilder;
 
-class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
+class ProcessBuilderTest extends TestCase
 {
     public function testInheritEnvironmentVars()
     {

diff --git a/Tests/ProcessFailedExceptionTest.php b/Tests/ProcessFailedExceptionTest.php
@@ -11,12 +11,13 @@
 
 namespace Symfony\Component\Process\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 
 /**
  * @author Sebastian Marek <proofek@gmail.com>
  */
-class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
+class ProcessFailedExceptionTest extends TestCase
 {
     /**
      * tests ProcessFailedException throws exception if the process was successful.

diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Process\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\Exception\LogicException;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Exception\RuntimeException;
@@ -21,7 +22,7 @@
 /**
  * @author Robert Schönthal <seroscho@googlemail.com>
  */
-class ProcessTest extends \PHPUnit_Framework_TestCase
+class ProcessTest extends TestCase
 {
     private static $phpBin;
     private static $process;

diff --git a/Tests/ProcessUtilsTest.php b/Tests/ProcessUtilsTest.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Component\Process\Tests;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\ProcessUtils;
 
-class ProcessUtilsTest extends \PHPUnit_Framework_TestCase
+class ProcessUtilsTest extends TestCase
 {
     /**
      * @dataProvider dataArguments