Merge branch '4.3' into 4.4

* 4.3: Remove use of ForwardCompatTrait Remove deprecated methods assertArraySubset
symfony · Aug 3, 2019 · 2faaf08 · 2faaf08
2 parents ea1fa76 + c6e7077
commit 2faaf08
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/Tests/ExecutableFinderTest.php b/Tests/ExecutableFinderTest.php
@@ -12,19 +12,16 @@
 namespace Symfony\Component\Process\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Process\ExecutableFinder;
 
 /**
  * @author Chris Smith <chris@cs278.org>
  */
 class ExecutableFinderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $path;
 
-    private function doTearDown()
+    protected function tearDown()
     {
         if ($this->path) {
             // Restore path if it was changed.

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

diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Process\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Process\Exception\LogicException;
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Exception\RuntimeException;
@@ -26,13 +25,11 @@
  */
 class ProcessTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private static $phpBin;
     private static $process;
     private static $sigchild;
 
-    private static function doSetUpBeforeClass()
+    public static function setUpBeforeClass()
     {
         $phpBin = new PhpExecutableFinder();
         self::$phpBin = getenv('SYMFONY_PROCESS_PHP_TEST_BINARY') ?: ('phpdbg' === \PHP_SAPI ? 'php' : $phpBin->find());
@@ -42,7 +39,7 @@ private static function doSetUpBeforeClass()
         self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
     }
 
-    private function doTearDown()
+    protected function tearDown()
     {
         if (self::$process) {
             self::$process->stop(0);