Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit e2ad89268b9a · 2017-11-13T11:20:40.000+01:00
* 3.3:
  [Process] Skip ProcessTest::testSimpleInputStream() because of bug #75515 in PHP 7.2RC6
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1263,6 +1263,10 @@ public function testIteratorInput()
 
     public function testSimpleInputStream()
     {
+        if (\PHP_VERSION_ID === 70200 && \PHP_EXTRA_VERSION === 'RC6') {
+            $this->markTestSkipped('See bug #75515 in PHP 7.2RC6.');
+        }
+
         $input = new InputStream();
 
         $process = $this->getProcessForCode('echo \'ping\'; stream_copy_to_stream(STDIN, STDOUT);');

Original file line number	Diff line number	Diff line change
`@@ -1263,6 +1263,10 @@ public function testIteratorInput()`
`1263`	`1263`
`1264`	`1264`	`public function testSimpleInputStream()`
`1265`	`1265`	`{`
	`1266`	`+ if (\PHP_VERSION_ID === 70200 && \PHP_EXTRA_VERSION === 'RC6') {`
	`1267`	`+ $this->markTestSkipped('See bug #75515 in PHP 7.2RC6.');`
	`1268`	`+ }`
	`1269`	`+`
`1266`	`1270`	`$input = new InputStream();`
`1267`	`1271`
`1268`	`1272`	`$process = $this->getProcessForCode('echo \'ping\'; stream_copy_to_stream(STDIN, STDOUT);');`