diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed cs

Browse Source
This commit is contained in:
drak3 2012-03-23 12:06:08 +01:00
parent af65673363
commit f9f51a5ca3
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Symfony/Component/Process/Process.php
View File

@ -159,7 +159,8 @@ class Process
/** /**
* Starts the process and returns after sending the stdin. * Starts the process and returns after sending the stdin.
* This method blocks until all stdin data is sent to the process then it returns while the pricess runs in the background. *
* This method blocks until all stdin data is sent to the process then it returns while the process runs in the background.
* The termination of the process can be awaited with waitForTermination * The termination of the process can be awaited with waitForTermination
* *
* The callback receives the type of output (out or err) and * The callback receives the type of output (out or err) and
@ -176,7 +177,7 @@ class Process
*/ */
public function start($callback = null) public function start($callback = null)
{ {
if($this->isRunning()) { if ($this->isRunning()) {
throw new \RuntimeException('Process is already running'); throw new \RuntimeException('Process is already running');
} }
$this->stdout = ''; $this->stdout = '';
@ -204,7 +205,7 @@ class Process
stream_set_blocking($pipe, false); stream_set_blocking($pipe, false);
} }
if(null === $this->stdin) { if (null === $this->stdin) {
fclose($this->pipes[0]); fclose($this->pipes[0]);
return; return;
@ -265,7 +266,6 @@ class Process
* from the independent process during execution. * from the independent process during execution.
* *
* @param Closure|string|array $callback * @param Closure|string|array $callback
* @param boolean $invokeCallbackWithStartData
* @return int the exitcode of the process * @return int the exitcode of the process
* @throws \RuntimeException * @throws \RuntimeException
*/ */
@ -282,7 +282,8 @@ class Process
if (false === $n) { if (false === $n) {
break; break;
} elseif ($n === 0) { }
if (0 === $n) {
proc_terminate($this->process); proc_terminate($this->process);
throw new \RuntimeException('The process timed out.'); throw new \RuntimeException('The process timed out.');
@ -302,7 +303,7 @@ class Process
} }
$this->updateStatus(); $this->updateStatus();
if ($this->processInformation['signaled']) { if ($this->processInformation['signaled']) {
throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig'])); throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig']));
} }
$time = 0; $time = 0;
@ -461,8 +462,9 @@ class Process
* Returns if the process is currently running * Returns if the process is currently running
* @return boolean * @return boolean
*/ */
public function isRunning() { public function isRunning()
if(self::STATUS_STARTED === $this->status) { {
if (self::STATUS_STARTED === $this->status) {
$this->updateStatus(); $this->updateStatus();
if($this->processInformation['running'] === false) { if($this->processInformation['running'] === false) {
$this->status = self::STATUS_TERMINATED; $this->status = self::STATUS_TERMINATED;
@ -480,9 +482,10 @@ class Process
* @return int the exitcode of the process * @return int the exitcode of the process
* @throws \RuntimeException if the process got signaled * @throws \RuntimeException if the process got signaled
*/ */
public function stop($timeout=10) { public function stop($timeout=10)
{
$timeoutMicro = (int) $timeout*10E6; $timeoutMicro = (int) $timeout*10E6;
if($this->isRunning()) { if ($this->isRunning()) {
proc_terminate($this->process); proc_terminate($this->process);
$time = 0; $time = 0;
while (1 == $this->isRunning() && $time < $timeoutMicro) { while (1 == $this->isRunning() && $time < $timeoutMicro) {
@ -608,11 +611,11 @@ class Process
*/ */
protected function updateStatus() protected function updateStatus()
{ {
if(self::STATUS_STARTED === $this->status) { if (self::STATUS_STARTED === $this->status) {
$this->processInformation = proc_get_status($this->process); $this->processInformation = proc_get_status($this->process);
if(!$this->processInformation['running']) { if (!$this->processInformation['running']) {
$this->status = self::STATUS_TERMINATED; $this->status = self::STATUS_TERMINATED;
if(-1 !== $this->processInformation['exitcode']) { if (-1 !== $this->processInformation['exitcode']) {
$this->exitcode = $this->processInformation['exitcode']; $this->exitcode = $this->processInformation['exitcode'];
} }
} }
@ -620,13 +623,13 @@ class Process
} }
protected function updateErrorOutput() { protected function updateErrorOutput() {
if(isset($this->pipes[self::STDERR]) && is_resource($this->pipes[self::STDERR])) { if (isset($this->pipes[self::STDERR]) && is_resource($this->pipes[self::STDERR])) {
$this->addErrorOutput(stream_get_contents($this->pipes[self::STDERR])); $this->addErrorOutput(stream_get_contents($this->pipes[self::STDERR]));
} }
} }
protected function updateOutput() { protected function updateOutput() {
if(isset($this->pipes[self::STDOUT]) && is_resource($this->pipes[self::STDOUT])) { if (isset($this->pipes[self::STDOUT]) && is_resource($this->pipes[self::STDOUT])) {
$this->addOutput(stream_get_contents($this->pipes[self::STDOUT])); $this->addOutput(stream_get_contents($this->pipes[self::STDOUT]));
} }
} }