minor #24516 [Process] Fix broken tests for PHP 7.2 (sroze)

nicolas-grekas · nicolas-grekas · commit ba3b17719272 · 2017-11-06T15:55:51.000+01:00
This PR was squashed before being merged into the 4.0-dev branch (closes #24516). Discussion ---------- [Process] Fix broken tests for PHP 7.2 | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | #24524, #24515 | License | MIT | Doc PR | ø Following #24515, trying to fix Process tests with PHP 7.2 Commits ------- b410a36 [Process] Fix broken tests for PHP 7.2
diff --git a/.travis.yml b/.travis.yml
@@ -16,15 +16,16 @@ addons:
 env:
     global:
         - MIN_PHP=7.1.3
-        - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/7.1/bin/php
+        - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
 
 matrix:
     include:
         - php: 7.1.3
         - php: 7.1
           env: deps=high
-        - php: 7.1
+        - php: 7.2
           env: deps=low
+
     fast_finish: true
 
 cache:
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -117,9 +117,14 @@ public function testStopWithTimeoutIsActuallyWorking()
         $p = $this->getProcess(array(self::$phpBin, __DIR__.'/NonStopableProcess.php', 30));
         $p->start();
 
-        while (false === strpos($p->getOutput(), 'received')) {
+        while ($p->isRunning() && false === strpos($p->getOutput(), 'received')) {
             usleep(1000);
         }
+
+        if (!$p->isRunning()) {
+            throw new \LogicException('Process is not running: '.$p->getErrorOutput());
+        }
+
         $start = microtime(true);
         $p->stop(0.1);
 
@@ -1456,6 +1461,19 @@ public function testRawCommandLine()
 )
 
 EOTXT;
+
+        if (\PHP_VERSION_ID >= 70200) {
+            $expected = <<<EOTXT
+Array
+(
+    [0] => Standard input code
+    [1] => a
+    [2] => 
+    [3] => b
+)
+
+EOTXT;
+        }
         $this->assertSame($expected, $p->getOutput());
     }
 
