[Process] Allow non-blocking start with PhpProcess

krichprollsch · fabpot · commit 2cd43da120dd · 2012-12-19T14:27:19.000+01:00
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
@@ -55,16 +55,9 @@ public function setPhpBinary($php)
     }
 
     /**
-     * Runs the process.
-     *
-     * @param Closure|string|array $callback A PHP callback to run whenever there is some
-     *                                       output available on STDOUT or STDERR
-     *
-     * @return integer The exit status code
-     *
-     * @api
+     * {@inheritdoc}
      */
-    public function run($callback = null)
+    public function start($callback = null)
     {
         if (null === $this->getCommandLine()) {
             if (false === $php = $this->executableFinder->find()) {
@@ -73,6 +66,6 @@ public function run($callback = null)
             $this->setCommandLine($php);
         }
 
-        return parent::run($callback);
+        return parent::start($callback);
     }
 }
diff --git a/src/Symfony/Component/Process/Tests/PhpProcessTest.php b/src/Symfony/Component/Process/Tests/PhpProcessTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\Process\Tests;
+
+use Symfony\Component\Process\PhpProcess;
+
+class PhpProcessTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testNonBlockingWorks()
+    {
+        $expected = 'hello world!';
+        $process = new PhpProcess(<<<PHP
+<?php echo '$expected';
+PHP
+        );
+        $process->start();
+        $process->wait();
+        $this->assertEquals($expected, $process->getOutput());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -55,16 +55,9 @@ public function setPhpBinary($php)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
`58`		`- * Runs the process.`
`59`		`- *`
`60`		`- * @param Closure\|string\|array $callback A PHP callback to run whenever there is some`
`61`		`- * output available on STDOUT or STDERR`
`62`		`- *`
`63`		`- * @return integer The exit status code`
`64`		`- *`
`65`		`- * @api`
	`58`	`+ * {@inheritdoc}`
`66`	`59`	`*/`
`67`		`- public function run($callback = null)`
	`60`	`+ public function start($callback = null)`
`68`	`61`	`{`
`69`	`62`	`if (null === $this->getCommandLine()) {`
`70`	`63`	`if (false === $php = $this->executableFinder->find()) {`
`@@ -73,6 +66,6 @@ public function run($callback = null)`
`73`	`66`	`$this->setCommandLine($php);`
`74`	`67`	`}`
`75`	`68`
`76`		`- return parent::run($callback);`
	`69`	`+ return parent::start($callback);`
`77`	`70`	`}`
`78`	`71`	`}`