fix cs

ewgRa · ewgRa · commit c4cf1c6692b2 · 2015-11-10T01:34:32.000+01:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -119,12 +119,12 @@ class Process
     /**
      * Constructor.
      *
-     * @param string             $commandline The command line to run
-     * @param string|null        $cwd         The working directory or null to use the working dir of the current PHP process
-     * @param array|null         $env         The environment variables or null to inherit
-     * @param string|null        $stdin       The STDIN content
-     * @param integer|float|null $timeout     The timeout in seconds or null to disable
-     * @param array              $options     An array of options for proc_open
+     * @param string         $commandline The command line to run
+     * @param string|null    $cwd         The working directory or null to use the working dir of the current PHP process
+     * @param array|null     $env         The environment variables or null to inherit
+     * @param string|null    $stdin       The STDIN content
+     * @param int|float|null $timeout     The timeout in seconds or null to disable
+     * @param array          $options     An array of options for proc_open
      *
      * @throws RuntimeException When proc_open is not installed
      *
@@ -184,7 +184,7 @@ public function __clone()
      * @param callback|null $callback A PHP callback to run whenever there is some
      *                                output available on STDOUT or STDERR
      *
-     * @return integer The exit status code
+     * @return int The exit status code
      *
      * @throws RuntimeException When process can't be launch or is stopped
      *
@@ -244,7 +244,7 @@ public function start($callback = null)
             // Workaround for the bug, when PTS functionality is enabled.
             // @see : https://github.com/symfony/symfony/issues/12643
             // @see : https://github.com/php/php-src/pull/1588
-            $ptsWorkaround = fopen("php://fd/0", "r");
+            $ptsWorkaround = fopen('php://fd/0', 'r');
         }
 
         $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);
@@ -300,7 +300,7 @@ public function restart($callback = null)
      *
      * @param callback|null $callback A valid PHP callback
      *
-     * @return integer The exitcode of the process
+     * @return int The exitcode of the process
      *
      * @throws RuntimeException When process timed out
      * @throws RuntimeException When process stopped after receiving signal
@@ -315,7 +315,7 @@ public function wait($callback = null)
         do {
             $this->checkTimeout();
             $running = defined('PHP_WINDOWS_VERSION_BUILD') ? $this->isRunning() : $this->processPipes->hasOpenHandles();
-            $close = !defined('PHP_WINDOWS_VERSION_BUILD') || !$running;;
+            $close = !defined('PHP_WINDOWS_VERSION_BUILD') || !$running;
             $this->readPipes(true, $close);
         } while ($running);
 
@@ -337,7 +337,7 @@ public function wait($callback = null)
     /**
      * Returns the Pid (process identifier), if applicable.
      *
-     * @return integer|null The process id if running, null otherwise
+     * @return int|null The process id if running, null otherwise
      *
      * @throws RuntimeException In case --enable-sigchild is activated
      */
@@ -355,7 +355,8 @@ public function getPid()
     /**
      * Sends a posix signal to the process.
      *
-     * @param  integer $signal A valid posix signal (see http://www.php.net/manual/en/pcntl.constants.php)
+     * @param int $signal A valid posix signal (see http://www.php.net/manual/en/pcntl.constants.php)
+     *
      * @return Process
      *
      * @throws LogicException   In case the process is not running
@@ -447,7 +448,7 @@ public function getIncrementalErrorOutput()
     /**
      * Returns the exit code returned by the process.
      *
-     * @return integer The exit status code
+     * @return int The exit status code
      *
      * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled
      *
@@ -521,7 +522,7 @@ public function hasBeenSignaled()
      *
      * It is only meaningful if hasBeenSignaled() returns true.
      *
-     * @return integer
+     * @return int
      *
      * @throws RuntimeException In case --enable-sigchild is activated
      *
@@ -559,7 +560,7 @@ public function hasBeenStopped()
      *
      * It is only meaningful if hasBeenStopped() returns true.
      *
-     * @return integer
+     * @return int
      *
      * @api
      */
@@ -625,10 +626,10 @@ public function getStatus()
     /**
      * Stops the process.
      *
-     * @param integer|float $timeout The timeout in seconds
-     * @param integer       $signal  A posix signal to send in case the process has not stop at timeout, default is SIGKILL
+     * @param int|float $timeout The timeout in seconds
+     * @param int       $signal  A posix signal to send in case the process has not stop at timeout, default is SIGKILL
      *
-     * @return integer The exit-code of the process
+     * @return int The exit-code of the process
      *
      * @throws RuntimeException if the process got signaled
      */
@@ -717,7 +718,7 @@ public function getTimeout()
      *
      * To disable the timeout, set this value to null.
      *
-     * @param integer|float|null $timeout The timeout in seconds
+     * @param int|float|null $timeout The timeout in seconds
      *
      * @return self The current Process instance
      *
@@ -741,7 +742,7 @@ public function setTimeout($timeout)
     /**
      * Enables or disables the TTY mode.
      *
-     * @param boolean $tty True to enabled and false to disable
+     * @param bool $tty True to enabled and false to disable
      *
      * @return self The current Process instance
      */

Original file line number	Diff line number	Diff line change
`@@ -119,12 +119,12 @@ class Process`
`119`	`119`	`/**`
`120`	`120`	`* Constructor.`
`121`	`121`	`*`
`122`		`- * @param string $commandline The command line to run`
`123`		`- * @param string\|null $cwd The working directory or null to use the working dir of the current PHP process`
`124`		`- * @param array\|null $env The environment variables or null to inherit`
`125`		`- * @param string\|null $stdin The STDIN content`
`126`		`- * @param integer\|float\|null $timeout The timeout in seconds or null to disable`
`127`		`- * @param array $options An array of options for proc_open`
	`122`	`+ * @param string $commandline The command line to run`
	`123`	`+ * @param string\|null $cwd The working directory or null to use the working dir of the current PHP process`
	`124`	`+ * @param array\|null $env The environment variables or null to inherit`
	`125`	`+ * @param string\|null $stdin The STDIN content`
	`126`	`+ * @param int\|float\|null $timeout The timeout in seconds or null to disable`
	`127`	`+ * @param array $options An array of options for proc_open`
`128`	`128`	`*`
`129`	`129`	`* @throws RuntimeException When proc_open is not installed`
`130`	`130`	`*`
`@@ -184,7 +184,7 @@ public function __clone()`
`184`	`184`	`* @param callback\|null $callback A PHP callback to run whenever there is some`
`185`	`185`	`* output available on STDOUT or STDERR`
`186`	`186`	`*`
`187`		`- * @return integer The exit status code`
	`187`	`+ * @return int The exit status code`
`188`	`188`	`*`
`189`	`189`	`* @throws RuntimeException When process can't be launch or is stopped`
`190`	`190`	`*`
`@@ -244,7 +244,7 @@ public function start($callback = null)`
`244`	`244`	`// Workaround for the bug, when PTS functionality is enabled.`
`245`	`245`	`// @see : https://github.com/symfony/symfony/issues/12643`
`246`	`246`	`// @see : https://github.com/php/php-src/pull/1588`
`247`		`- $ptsWorkaround = fopen("php://fd/0", "r");`
	`247`	`+ $ptsWorkaround = fopen('php://fd/0', 'r');`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`$this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);`
`@@ -300,7 +300,7 @@ public function restart($callback = null)`
`300`	`300`	`*`
`301`	`301`	`* @param callback\|null $callback A valid PHP callback`
`302`	`302`	`*`
`303`		`- * @return integer The exitcode of the process`
	`303`	`+ * @return int The exitcode of the process`
`304`	`304`	`*`
`305`	`305`	`* @throws RuntimeException When process timed out`
`306`	`306`	`* @throws RuntimeException When process stopped after receiving signal`
`@@ -315,7 +315,7 @@ public function wait($callback = null)`
`315`	`315`	`do {`
`316`	`316`	`$this->checkTimeout();`
`317`	`317`	`$running = defined('PHP_WINDOWS_VERSION_BUILD') ? $this->isRunning() : $this->processPipes->hasOpenHandles();`
`318`		`- $close = !defined('PHP_WINDOWS_VERSION_BUILD') \|\| !$running;;`
	`318`	`+ $close = !defined('PHP_WINDOWS_VERSION_BUILD') \|\| !$running;`
`319`	`319`	`$this->readPipes(true, $close);`
`320`	`320`	`} while ($running);`
`321`	`321`
`@@ -337,7 +337,7 @@ public function wait($callback = null)`
`337`	`337`	`/**`
`338`	`338`	`* Returns the Pid (process identifier), if applicable.`
`339`	`339`	`*`
`340`		`- * @return integer\|null The process id if running, null otherwise`
	`340`	`+ * @return int\|null The process id if running, null otherwise`
`341`	`341`	`*`
`342`	`342`	`* @throws RuntimeException In case --enable-sigchild is activated`
`343`	`343`	`*/`
`@@ -355,7 +355,8 @@ public function getPid()`
`355`	`355`	`/**`
`356`	`356`	`* Sends a posix signal to the process.`
`357`	`357`	`*`
`358`		`- * @param integer $signal A valid posix signal (see http://www.php.net/manual/en/pcntl.constants.php)`
	`358`	`+ * @param int $signal A valid posix signal (see http://www.php.net/manual/en/pcntl.constants.php)`
	`359`	`+ *`
`359`	`360`	`* @return Process`
`360`	`361`	`*`
`361`	`362`	`* @throws LogicException In case the process is not running`
`@@ -447,7 +448,7 @@ public function getIncrementalErrorOutput()`
`447`	`448`	`/**`
`448`	`449`	`* Returns the exit code returned by the process.`
`449`	`450`	`*`
`450`		`- * @return integer The exit status code`
	`451`	`+ * @return int The exit status code`
`451`	`452`	`*`
`452`	`453`	`* @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled`
`453`	`454`	`*`
`@@ -521,7 +522,7 @@ public function hasBeenSignaled()`
`521`	`522`	`*`
`522`	`523`	`* It is only meaningful if hasBeenSignaled() returns true.`
`523`	`524`	`*`
`524`		`- * @return integer`
	`525`	`+ * @return int`
`525`	`526`	`*`
`526`	`527`	`* @throws RuntimeException In case --enable-sigchild is activated`
`527`	`528`	`*`
`@@ -559,7 +560,7 @@ public function hasBeenStopped()`
`559`	`560`	`*`
`560`	`561`	`* It is only meaningful if hasBeenStopped() returns true.`
`561`	`562`	`*`
`562`		`- * @return integer`
	`563`	`+ * @return int`
`563`	`564`	`*`
`564`	`565`	`* @api`
`565`	`566`	`*/`
`@@ -625,10 +626,10 @@ public function getStatus()`
`625`	`626`	`/**`
`626`	`627`	`* Stops the process.`
`627`	`628`	`*`
`628`		`- * @param integer\|float $timeout The timeout in seconds`
`629`		`- * @param integer $signal A posix signal to send in case the process has not stop at timeout, default is SIGKILL`
	`629`	`+ * @param int\|float $timeout The timeout in seconds`
	`630`	`+ * @param int $signal A posix signal to send in case the process has not stop at timeout, default is SIGKILL`
`630`	`631`	`*`
`631`		`- * @return integer The exit-code of the process`
	`632`	`+ * @return int The exit-code of the process`
`632`	`633`	`*`
`633`	`634`	`* @throws RuntimeException if the process got signaled`
`634`	`635`	`*/`
`@@ -717,7 +718,7 @@ public function getTimeout()`
`717`	`718`	`*`
`718`	`719`	`* To disable the timeout, set this value to null.`
`719`	`720`	`*`
`720`		`- * @param integer\|float\|null $timeout The timeout in seconds`
	`721`	`+ * @param int\|float\|null $timeout The timeout in seconds`
`721`	`722`	`*`
`722`	`723`	`* @return self The current Process instance`
`723`	`724`	`*`
`@@ -741,7 +742,7 @@ public function setTimeout($timeout)`
`741`	`742`	`/**`
`742`	`743`	`* Enables or disables the TTY mode.`
`743`	`744`	`*`
`744`		`- * @param boolean $tty True to enabled and false to disable`
	`745`	`+ * @param bool $tty True to enabled and false to disable`
`745`	`746`	`*`
`746`	`747`	`* @return self The current Process instance`
`747`	`748`	`*/`