kakserpom / phpdaemon

lib/BoundUNIXSocket.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 	/**
 	 * Bind socket
-	 * @return boolean Success.
+	 * @return null|boolean Success.
 	 */
 	 public function bind() {
 		$e = explode(':', $this->addr, 4);

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 			$user = $e[0];
 			$group = $e[1];
 			$path = $e[2];
-		}
-		elseif (sizeof($e) == 2) {
+		} elseif (sizeof($e) == 2) {
 			$user = $e[0];
 			$group = FALSE;
 			$path = $e[1];

lib/ConnectionPool.php

Doc Comments +4 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 	}
 	/**
 	 * Setting default config options
-	 * @return array|false
+	 * @return boolean
 	 */
 	protected function getConfigDefaults() {
 		return false;
@@ -246,7 +246,7 @@ 
 	 * Bind given sockets
 	 * @param mixed Addresses to bind
 	 * @param boolean SO_REUSE. Default is true
-	 * @return void
+	 * @return integer
 	 */
 	public function bind($addrs = array(), $reuse = true, $max = 0) {
 		if (is_string($addrs)) {
@@ -314,6 +314,8 @@ 
 	 * @param string Optional. Default port
 	 * @param callback Optional. Callback.
 	 * @param string Optional. Connection class name.
+	 * @param string $addr
+	 * @param Closure $cb
 	 * @return integer Connection's ID. Boolean false when failed.
 	 */
 	public function connectTo($addr, $port = 0, $cb = null, $class = null) {

Indentation +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
 	/**
 	 * Called when the worker is ready to go.
 	 * @return void
-	*/
+	 */
 	public function onReady() {
 		$this->enable();
 	}	
@@ -119,11 +119,11 @@ 
 	
 	
  	/**
-	 * Process default config
-	 * @todo move it to Daemon_Config class
-	 * @param array {"setting": "value"}
-	 * @return void
-	 */
+ 	 * Process default config
+ 	 * @todo move it to Daemon_Config class
+ 	 * @param array {"setting": "value"}
+ 	 * @return void
+ 	 */
 	public function processDefaultConfig($settings = array()) {
 		foreach ($settings as $k => $v) {
 			$k = strtolower(str_replace('-', '', $k));
@@ -158,7 +158,7 @@ 
 	/**
 	 * Enable socket events
 	 * @return void
-	*/
+	 */
 	public function enable() {
 		if ($this->enabled) {
 			return;

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
  */
 class ConnectionPool extends ObjectStorage {
 
-	public $allowedClients  = null;
+	public $allowedClients = null;
 	public $connectionClass;
 	public $name;
 	public $config;
@@ -103,7 +103,7 @@ 
 			if (isset(self::$instances[$key])) {
 				return self::$instances[$key];
 			}
-			$k = 'Pool:' . $class . ($arg !== '' ? ':' . $arg : '' );
+			$k = 'Pool:' . $class . ($arg !== '' ? ':' . $arg : '');
 			
 			$config = (isset(Daemon::$config->{$k}) && Daemon::$config->{$k} instanceof Daemon_ConfigSection) ? Daemon::$config->{$k}: new Daemon_ConfigSection;			
 			$obj = self::$instances[$key] = new $class($config);
@@ -129,16 +129,16 @@ 
 			$k = strtolower(str_replace('-', '', $k));
 
 			if (!isset($this->config->{$k})) {
-			  if (is_scalar($v))	{
+			  if (is_scalar($v)) {
 					$this->config->{$k} = new Daemon_ConfigEntry($v);
 				} else {
 					$this->config->{$k} = $v;
 				}
 			} elseif ($v instanceof Daemon_ConfigSection) {
 			// @todo
-			}	else {
+			} else {
 				$current = $this->config->{$k};
-			  if (is_scalar($v))	{
+			  if (is_scalar($v)) {
 					$this->config->{$k} = new Daemon_ConfigEntry($v);
 				} else {
 					$this->config->{$k} = $v;
@@ -266,10 +266,10 @@ 
 					$socket->setDefaultPort($this->config->port->value);
 				}
 			} else {
-				if (stripos($addr,'tcp://') === 0) {
+				if (stripos($addr, 'tcp://') === 0) {
 					$addr = substr($addr, 6);
 				}
-				elseif (stripos($addr,'tcp:') === 0) {
+				elseif (stripos($addr, 'tcp:') === 0) {
 					$addr = substr($addr, 4);
 				}
 				$socket = new BoundTCPSocket($addr, $reuse);

Braces +6 added lines, -11 removed lines

@@ -70,17 +70,13 @@ 
 			$k = strtolower($k);
 			if ($k === 'connectionclass') {
 				$this->connectionClass = $v;
-			}
-			elseif ($k === 'name') {
+			} elseif ($k === 'name') {
 				$this->name = $v;
-			}
-			elseif ($k === 'allowedclients') {
+			} elseif ($k === 'allowedclients') {
 				$this->allowedClients = $v;
-			}
-			elseif ($k === 'maxallowedpacket') {
+			} elseif ($k === 'maxallowedpacket') {
 				$this->maxAllowedPacket = (int) $v;
-			}
-			elseif ($k === 'maxconcurrency') {
+			} elseif ($k === 'maxconcurrency') {
 				$this->maxConcurrency = (int) $v;
 			}
 		}
@@ -136,7 +132,7 @@ 
 				}
 			} elseif ($v instanceof Daemon_ConfigSection) {
 			// @todo
-			}	else {
+			} else {
 				$current = $this->config->{$k};
 			  if (is_scalar($v))	{
 					$this->config->{$k} = new Daemon_ConfigEntry($v);
@@ -268,8 +264,7 @@ 
 			} else {
 				if (stripos($addr,'tcp://') === 0) {
 					$addr = substr($addr, 6);
-				}
-				elseif (stripos($addr,'tcp:') === 0) {
+				} elseif (stripos($addr,'tcp:') === 0) {
 					$addr = substr($addr, 4);
 				}
 				$socket = new BoundTCPSocket($addr, $reuse);

lib/Daemon.php

Doc Comments +7 added lines, -2 removed lines

@@ -82,6 +82,9 @@ 
 		    define("SO_REUSEPORT", 0x200);	// FIXME: this is a BSD-only hack
 	}
 
+	/**
+	 * @param string $mod
+	 */
 	public static function loadModuleIfAbsent($mod) {
 		if (extension_loaded($mod)) {
 			return true;
@@ -249,7 +252,7 @@ 
 
 	/**
 	 * It allows to run your simple web-apps in spawn-fcgi/php-fpm environment.
-	 * @return boolean - Success.
+	 * @return boolean|null - Success.
 	 */
 	public static function compatRunEmul() {
 		Daemon::$dir = realpath(__DIR__ . '/..');
@@ -473,7 +476,7 @@ 
 
 	/**
 	 * spawn new master process.
-	 * @return boolean - success
+	 * @return null|integer - success
 	 */
 	public static function spawnMaster() {
 		Daemon::$masters->push($thread = new Daemon_MasterThread);
@@ -542,6 +545,8 @@ 
 
 	/**
 	 * Calculates a difference between two dates.
+	 * @param integer $date_start
+	 * @param integer $date_finish
 	 * @return string Something like this: 1 year. 2 mon. 6 day. 4 hours. 21 min. 10 sec.
 	 */
 	public static function date_period_text($date_start, $date_finish) {

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 		Daemon::$reusePort = 1 === preg_match("~BSD~i", php_uname('s'));
 		
 		if (Daemon::$reusePort && !defined("SO_REUSEPORT"))
-		    define("SO_REUSEPORT", 0x200);	// FIXME: this is a BSD-only hack
+			define("SO_REUSEPORT", 0x200);	// FIXME: this is a BSD-only hack
 	}
 
 	public static function loadModuleIfAbsent($mod) {

Spacing +11 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
 	const SUPPORT_RUNKIT_SANDBOX         = 0;	
 	const SUPPORT_RUNKIT_MODIFY          = 1;
 	const SUPPORT_RUNKIT_INTERNAL_MODIFY = 2;
-	const SUPPORT_RUNKIT_IMPORT 		 = 3;
+	const SUPPORT_RUNKIT_IMPORT = 3;
 	const WSTATE_IDLE = 1;
 	const WSTATE_BUSY = 2;
 	const WSTATE_SHUTDOWN = 3;
@@ -79,7 +79,7 @@ 
 		Daemon::$reusePort = 1 === preg_match("~BSD~i", php_uname('s'));
 		
 		if (Daemon::$reusePort && !defined("SO_REUSEPORT"))
-		    define("SO_REUSEPORT", 0x200);	// FIXME: this is a BSD-only hack
+		    define("SO_REUSEPORT", 0x200); // FIXME: this is a BSD-only hack
 	}
 
 	public static function loadModuleIfAbsent($mod) {
@@ -132,9 +132,9 @@ 
 
 	public static function uncaughtExceptionHandler(Exception $e) {
 		$msg = $e->getMessage();
-		Daemon::log('Uncaught '.get_class($e).' (' . $e->getCode() . ')' . (strlen($msg) ? ': ' . $msg : ''). ".\n" . $e->getTraceAsString());
+		Daemon::log('Uncaught ' . get_class($e) . ' (' . $e->getCode() . ')' . (strlen($msg) ? ': ' . $msg : '') . ".\n" . $e->getTraceAsString());
 		if (Daemon::$req) {
-			Daemon::$req->out('<b>Uncaught '.get_class($e).' (' . $e->getCode() . ')</b>' . (strlen($msg) ? ': ' . $msg : ''). '.<br />');
+			Daemon::$req->out('<b>Uncaught ' . get_class($e) . ' (' . $e->getCode() . ')</b>' . (strlen($msg) ? ': ' . $msg : '') . '.<br />');
 		}
 	}
 
@@ -164,9 +164,9 @@ 
 			E_USER_DEPRECATED => 'Deprecated (userland)',
 		);
 		$errtype = $errtypes[$errno];
-		Daemon::log($errtype . ': '.$errstr.' in ' . $errfile . ':' . $errline . "\n" . Debug::backtrace());
+		Daemon::log($errtype . ': ' . $errstr . ' in ' . $errfile . ':' . $errline . "\n" . Debug::backtrace());
 		if (Daemon::$req) {
-			Daemon::$req->out('<strong>' . $errtype . '</strong>: ' . $errstr . ' in ' . basename($errfile) . ':' . $errline.'<br />');
+			Daemon::$req->out('<strong>' . $errtype . '</strong>: ' . $errstr . ' in ' . basename($errfile) . ':' . $errline . '<br />');
 		}
 	}
 
@@ -290,7 +290,7 @@ 
 		$req->attrs->cookie = $_REQUEST;
 		$req->attrs->server = $_SERVER;
 		$req->attrs->files = $_FILES;
-		$req->attrs->session = isset($_SESSION)?$_SESSION:NULL;
+		$req->attrs->session = isset($_SESSION) ? $_SESSION : NULL;
 		$req->attrs->connId = 1;
 		$req->attrs->trole = 'RESPONDER';
 		$req->attrs->flags = 0;
@@ -317,7 +317,7 @@ 
 		$apaths = explode(';', $paths);
 		$found = false;
 
-		foreach($apaths as $path) {
+		foreach ($apaths as $path) {
 			if (is_file($p = realpath($path))) {
 				$found = true;
 
@@ -355,7 +355,7 @@ 
 				chown(Daemon::$config->logstorage->value, Daemon::$config->user->value); // @TODO: rewrite to async I/O
 			}
 			if ((Daemon::$process instanceof Daemon_WorkerThread) && FS::$supported) {
-				FS::open(Daemon::$config->logstorage->value, 'a!', function ($file) {
+				FS::open(Daemon::$config->logstorage->value, 'a!', function($file) {
 					Daemon::$logpointerAsync = $file;
 					if (!$file) {
 						return;
@@ -463,7 +463,7 @@ 
 		if (is_resource(STDERR)) {
 			fwrite(STDERR, '[PHPD] ' . $msg . "\n");
 		}
-		$msg = '[' . date('D, j M Y H:i:s', $mt[1]) . '.' . sprintf('%06d', $mt[0]*1000000) . ' ' . date('O') . '] ' . $msg . "\n";
+		$msg = '[' . date('D, j M Y H:i:s', $mt[1]) . '.' . sprintf('%06d', $mt[0] * 1000000) . ' ' . date('O') . '] ' . $msg . "\n";
 		if (Daemon::$logpointerAsync) {
 			Daemon::$logpointerAsync->write($msg);
 		} elseif (Daemon::$logpointer) {
@@ -547,7 +547,7 @@ 
 	public static function date_period_text($date_start, $date_finish) {
 		$result = Daemon::date_period($date_start, $date_finish);
 
-		$str  = '';
+		$str = '';
 
 		if ($result[5] > 0) {
 			$str .= $result[5] . ' year. ';

Braces +12 added lines, -18 removed lines

@@ -78,8 +78,10 @@ 
 		// only in BSD flavour operating systems via SO_REUSEPORT socket option
 		Daemon::$reusePort = 1 === preg_match("~BSD~i", php_uname('s'));
 		
-		if (Daemon::$reusePort && !defined("SO_REUSEPORT"))
-		    define("SO_REUSEPORT", 0x200);	// FIXME: this is a BSD-only hack
+		if (Daemon::$reusePort && !defined("SO_REUSEPORT")) {
+				    define("SO_REUSEPORT", 0x200);
+		}
+		// FIXME: this is a BSD-only hack
 	}
 
 	public static function loadModuleIfAbsent($mod) {
@@ -144,8 +146,7 @@ 
 			if (!Daemon::$restrictErrorControl) {
 				return;
 			}
-		}
-		elseif (!($l & $errno)) {
+		} elseif (!($l & $errno)) {
 			return;
 		}
 
@@ -404,34 +405,28 @@ 
 					}
 					if ($code === 0) {
 						break 2;
-					}
-					elseif ($code === Daemon::WSTATE_IDLE) {
+					} elseif ($code === Daemon::WSTATE_IDLE) {
 						// idle
 						++$stat['alive'];
 						++$stat['idle'];
-					}
-					elseif ($code === Daemon::WSTATE_BUSY) {
+					} elseif ($code === Daemon::WSTATE_BUSY) {
 						// busy
 						++$stat['alive'];
 						++$stat['busy'];
-					}
-					elseif ($code === Daemon::WSTATE_SHUTDOWN) { 
+					} elseif ($code === Daemon::WSTATE_SHUTDOWN) { 
 						// shutdown
 						++$stat['shutdown'];
-					}
-					elseif ($code === Daemon::WSTATE_PREINIT) {
+					} elseif ($code === Daemon::WSTATE_PREINIT) {
 						// pre-init
 						++$stat['alive'];
 						++$stat['preinit'];
 						++$stat['idle'];
-					}
-					elseif ($code === Daemon::WSTATE_WAITINIT) {
+					} elseif ($code === Daemon::WSTATE_WAITINIT) {
 						// wait-init
 						++$stat['alive'];
 						++$stat['waitinit'];
 						++$stat['idle'];
-					}
-					elseif ($code === Daemon::WSTATE_INIT) { // init
+					} elseif ($code === Daemon::WSTATE_INIT) { // init
 						++$stat['alive'];
 						++$stat['init'];
 						++$stat['idle'];
@@ -453,8 +448,7 @@ 
 		$args = func_get_args();
 		if (sizeof($args) == 1) {
 			$msg = is_scalar($args[0]) ? $args[0] : Debug::dump($args[0]);
-		}
-		else {
+		} else {
 			$msg = Debug::dump($args);
 		}
 	

lib/Daemon_Bootstrap.php

Doc Comments -1 removed lines

@@ -499,7 +499,6 @@
 
 	/**
 	 * Parses command-line arguments.
-	 * @param array $_SERVER['argv']
 	 * @return void
 	 */
 	public static function getArgs($args) {

Spacing +9 added lines, -9 removed lines

@@ -122,7 +122,7 @@ 
 
 
 		if ('log' === $runmode) {
-			passthru('tail -n '.$n.' -f '.escapeshellarg(Daemon::$config->logstorage->value));
+			passthru('tail -n ' . $n . ' -f ' . escapeshellarg(Daemon::$config->logstorage->value));
 			exit;
 		}
 
@@ -131,7 +131,7 @@ 
 		}
 		
 		if (isset(Daemon::$config->locale->value) && Daemon::$config->locale->value !== '') {
-			setlocale(LC_ALL,explode(',', Daemon::$config->locale->value));
+			setlocale(LC_ALL, explode(',', Daemon::$config->locale->value));
 		}
 		
 		if (
@@ -329,7 +329,7 @@ 
 		elseif ($runmode == 'reopenlog') {
 			if (
 				(!Daemon_Bootstrap::$pid) 
-				|| (!posix_kill(Daemon_Bootstrap::$pid,SIGUSR1))
+				|| (!posix_kill(Daemon_Bootstrap::$pid, SIGUSR1))
 			) {
 				echo '[REOPEN-LOG] ERROR. It seems that phpDaemon is not running' . (Daemon_Bootstrap::$pid ? ' (PID ' . Daemon_Bootstrap::$pid . ')' : '') . ".\n";
 			}
@@ -337,7 +337,7 @@ 
 		elseif ($runmode == 'reload') {
 			if (
 				(!Daemon_Bootstrap::$pid) 
-				|| (!posix_kill(Daemon_Bootstrap::$pid,SIGUSR2))
+				|| (!posix_kill(Daemon_Bootstrap::$pid, SIGUSR2))
 			) {
 				echo '[RELOAD] ERROR. It seems that phpDaemon is not running' . (Daemon_Bootstrap::$pid ? ' (PID ' . Daemon_Bootstrap::$pid . ')' : '') . ".\n";
 			}
@@ -368,7 +368,7 @@ 
 			);
 			
 			foreach (Daemon::$config as $name => $entry) {
-				if (!$entry instanceof Daemon_ConfigEntry) {continue;}
+				if (!$entry instanceof Daemon_ConfigEntry) {continue; }
 				
 				$row = array(
 					'parameter' => $name,
@@ -392,7 +392,7 @@ 
 		elseif ($runmode == 'hardstop') {
 			echo '[HARDSTOP] Sending SIGINT to ' . Daemon_Bootstrap::$pid . '... ';
 
-			$ok = Daemon_Bootstrap::$pid && posix_kill(Daemon_Bootstrap::$pid,SIGINT);
+			$ok = Daemon_Bootstrap::$pid && posix_kill(Daemon_Bootstrap::$pid, SIGINT);
 
 			echo $ok ? 'OK.' : 'ERROR. It seems that phpDaemon is not running.';
 
@@ -437,7 +437,7 @@ 
 
 		echo "\nAlso you can use some optional parameters to override the same configuration variables:\n";
 
-		foreach(self::$params as $name => $desc) {
+		foreach (self::$params as $name => $desc) {
 			if (empty($desc)) {
 				continue;
 			} 
@@ -478,7 +478,7 @@ 
 	 * @return void
 	 */
 	public static function stop($mode = 1) {
-		$ok = Daemon_Bootstrap::$pid && posix_kill(Daemon_Bootstrap::$pid, $mode === 3 ? SIGINT:SIGTERM);
+		$ok = Daemon_Bootstrap::$pid && posix_kill(Daemon_Bootstrap::$pid, $mode === 3 ? SIGINT : SIGTERM);
 
 		if (!$ok) {
 			echo '[WARN]. It seems that phpDaemon is not running' . (Daemon_Bootstrap::$pid ? ' (PID ' . Daemon_Bootstrap::$pid . ')' : '') . ".\n";
@@ -506,7 +506,7 @@ 
 		$out = array();
 		$last_arg = NULL;
 		
-		for($i = 1, $il = sizeof($args); $i < $il; ++$i) {
+		for ($i = 1, $il = sizeof($args); $i < $il; ++$i) {
 			if (preg_match('~^--(.+)~', $args[$i], $match)) {
 				$parts = explode('=', $match[1]);
 				$key = preg_replace('~[^a-z0-9]+~', '', $parts[0]);

Braces +19 added lines, -38 removed lines

@@ -90,8 +90,7 @@ 
 
 			self::printUsage();
 			exit;
-		}
-		elseif ('help' === $runmode) {
+		} elseif ('help' === $runmode) {
 			self::printHelp();
 			exit;
 		}
@@ -193,17 +192,14 @@ 
 			}
 
 			Daemon_Bootstrap::$pid = 0;
-		}
-		elseif (!is_file(Daemon::$config->pidfile->value)) {
+		} elseif (!is_file(Daemon::$config->pidfile->value)) {
 			Daemon::log('Pid-file \'' . Daemon::$config->pidfile->value . '\' must be a regular file.');
 			Daemon_Bootstrap::$pid = FALSE;
 			$error = true;
-		}
-		elseif (!is_writable(Daemon::$config->pidfile->value)) {
+		} elseif (!is_writable(Daemon::$config->pidfile->value)) {
 			Daemon::log('Pid-file \'' . Daemon::$config->pidfile->value . '\' must be writable.');
 			$error = true;
-		}
-		elseif (!is_readable(Daemon::$config->pidfile->value)) {
+		} elseif (!is_readable(Daemon::$config->pidfile->value)) {
 			Daemon::log('Pid-file \'' . Daemon::$config->pidfile->value . '\' must be readable.');
 			Daemon_Bootstrap::$pid = FALSE;
 			$error = true;
@@ -238,8 +234,7 @@ 
 			if (($sg = posix_getgrnam(Daemon::$config->group->value)) === FALSE) {
 				Daemon::log('Unexisting group \'' . Daemon::$config->group->value . '\'. You have to replace config-variable \'group\' with existing group-name.');
 				$error = true;
-			}
-			elseif (($sg['gid'] != posix_getgid()) && (posix_getuid() != 0)) {
+			} elseif (($sg['gid'] != posix_getgid()) && (posix_getuid() != 0)) {
 				Daemon::log('You must have the root privileges to change group.');
 				$error = true;
 			}
@@ -252,8 +247,7 @@ 
 			if (($su = posix_getpwnam(Daemon::$config->user->value)) === FALSE) {
 				Daemon::log('Unexisting user \'' . Daemon::$config->user->value . '\', user not found. You have to replace config-variable \'user\' with existing username.');
 				$error = true;
-			}
-			elseif (
+			} elseif (
 				($su['uid'] != posix_getuid()) 
 				&& (posix_getuid() != 0)
 			) {
@@ -284,12 +278,10 @@ 
 		if ($runmode == 'start') {
 			if ($error === FALSE) {
 				Daemon_Bootstrap::start();
-			}
-			else {
+			} else {
 				exit(6);
 			}
-		}
-		elseif (
+		} elseif (
 			$runmode == 'status' 
 			|| $runmode == 'fullstatus'
 		) {
@@ -317,42 +309,36 @@ 
 			}
 
 			echo "\n";
-		}
-		elseif ($runmode == 'update') {
+		} elseif ($runmode == 'update') {
 			if (
 				(!Daemon_Bootstrap::$pid) 
 				|| (!posix_kill(Daemon_Bootstrap::$pid, SIGHUP))
 			) {
 				echo '[UPDATE] ERROR. It seems that phpDaemon is not running' . (Daemon_Bootstrap::$pid ? ' (PID ' . Daemon_Bootstrap::$pid . ')' : '') . ".\n";
 			}
-		}
-		elseif ($runmode == 'reopenlog') {
+		} elseif ($runmode == 'reopenlog') {
 			if (
 				(!Daemon_Bootstrap::$pid) 
 				|| (!posix_kill(Daemon_Bootstrap::$pid,SIGUSR1))
 			) {
 				echo '[REOPEN-LOG] ERROR. It seems that phpDaemon is not running' . (Daemon_Bootstrap::$pid ? ' (PID ' . Daemon_Bootstrap::$pid . ')' : '') . ".\n";
 			}
-		}
-		elseif ($runmode == 'reload') {
+		} elseif ($runmode == 'reload') {
 			if (
 				(!Daemon_Bootstrap::$pid) 
 				|| (!posix_kill(Daemon_Bootstrap::$pid,SIGUSR2))
 			) {
 				echo '[RELOAD] ERROR. It seems that phpDaemon is not running' . (Daemon_Bootstrap::$pid ? ' (PID ' . Daemon_Bootstrap::$pid . ')' : '') . ".\n";
 			}
-		}
-		elseif ($runmode == 'restart') {
+		} elseif ($runmode == 'restart') {
 			if ($error === FALSE) {
 				Daemon_Bootstrap::stop(2);
 				Daemon_Bootstrap::start();
 			}
-		}
-		elseif ($runmode == 'hardrestart') {
+		} elseif ($runmode == 'hardrestart') {
 			Daemon_Bootstrap::stop(3);
 			Daemon_Bootstrap::start();
-		}
-		elseif ($runmode == 'configtest') {
+		} elseif ($runmode == 'configtest') {
 			$term = new Terminal;
 			$term->enable_color = true;
 
@@ -385,11 +371,9 @@ 
 			$term->drawtable($rows);
 
 			echo "\n";
-		}
-		elseif ($runmode == 'stop') {
+		} elseif ($runmode == 'stop') {
 			Daemon_Bootstrap::stop();
-		}
-		elseif ($runmode == 'hardstop') {
+		} elseif ($runmode == 'hardstop') {
 			echo '[HARDSTOP] Sending SIGINT to ' . Daemon_Bootstrap::$pid . '... ';
 
 			$ok = Daemon_Bootstrap::$pid && posix_kill(Daemon_Bootstrap::$pid,SIGINT);
@@ -440,8 +424,7 @@ 
 		foreach(self::$params as $name => $desc) {
 			if (empty($desc)) {
 				continue;
-			} 
-			elseif (!is_array($desc)) {
+			} elseif (!is_array($desc)) {
 				$term->drawParam($name, $desc);
 			} else {
 				$term->drawParam(
@@ -518,16 +501,14 @@ 
 				}
 
 				$last_arg = $key;
-			}
-			elseif (preg_match('~^-([a-zA-Z0-9]+)~', $args[$i], $match)) {
+			} elseif (preg_match('~^-([a-zA-Z0-9]+)~', $args[$i], $match)) {
 				for ($j = 0, $jl = strlen($match[1]); $j < $jl; ++$j) {
 					$key = $match[1]{$j};
 					$out[$key] = true;
 				}
 		
 				$last_arg = $key;
-			}
-			elseif ($last_arg !== NULL) {
+			} elseif ($last_arg !== NULL) {
 				$out[$last_arg] = $args[$i];
 			}
 		}

lib/Daemon_Config.php

Doc Comments +3 added lines

@@ -102,6 +102,9 @@
 		}
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function loadFile($path) {
 		$parser = new Daemon_ConfigParser($path,$this);
 		$this->onLoad();

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	public $configfile     = '/etc/phpdaemon/phpd.conf;/etc/phpd/phpd.conf;./conf/phpd.conf';
 	public $path           = '/etc/phpdaemon/AppResolver.php;./conf/AppResolver.php';
 	public $appfilepath    = '{app-*,applications}/%s.php';
-	public $autoload   	 	= NULL;
+	public $autoload = NULL;
 			
 	// Master-related
 	public $mpmdelay        = '0.1s';
@@ -76,7 +76,7 @@ 
 		static $sizes = array('maxmemoryusage');
 		static $times = array('maxidle', 'autoreload', 'mpmdelay', 'eiosetmaxpolltime');
 		static $numbers = array(
-			'maxrequests', 'autogc','minworkers','maxworkers','minspareworkers','maxspareworkers','masterpriority', 'ipcthreadpriority',
+			'maxrequests', 'autogc', 'minworkers', 'maxworkers', 'minspareworkers', 'maxspareworkers', 'masterpriority', 'ipcthreadpriority',
 			'eiosetmaxidle', 'eiosetmaxparallel', 'eiosetmaxpollreqs', 'eiosetminparallel', 'verbose', 'verbosetty'
 		);
 
@@ -103,7 +103,7 @@ 
 	}
 
 	public function loadFile($path) {
-		$parser = new Daemon_ConfigParser($path,$this);
+		$parser = new Daemon_ConfigParser($path, $this);
 		$this->onLoad();
 		return !$parser->errorneus;
 	}
@@ -143,7 +143,7 @@ 
 		return isset($this->{$offset}) ? $this->{$offset}->value : NULL;
 	}
 	
-	public function offsetSet($offset,$value) {
+	public function offsetSet($offset, $value) {
 		$offset = $this->getRealOffsetName($offset);
 
 		$this->{$offset} = $value;

Braces +4 added lines, -8 removed lines

@@ -83,14 +83,11 @@ 
 		foreach ($this as $name => $value) {
 			if (in_array($name, $sizes)) {
 				$entry = new Daemon_ConfigEntrySize;
-			}
-			elseif (in_array($name, $times)) {
+			} elseif (in_array($name, $times)) {
 				$entry = new Daemon_ConfigEntryTime;
-			}
-			elseif (in_array($name, $numbers)) {
+			} elseif (in_array($name, $numbers)) {
 				$entry = new Daemon_ConfigEntryNumber;
-			} 
-			elseif ($name === 'configfile') {
+			} elseif ($name === 'configfile') {
 				$entry = new Daemon_ConfigEntryConfigFile;
 			} else {
 				$entry = new Daemon_ConfigEntry;
@@ -184,8 +181,7 @@ 
 				Daemon::$config->{$k}->setHumanValue($v);
 				Daemon::$config->{$k}->source = 'cmdline';
 				
-			}
-			else {
+			} else {
 				Daemon::log('Unrecognized parameter \'' . $k . '\'');
 				$error = TRUE;
 			}

lib/Daemon_ConfigEntry.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
 		}
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function setValue($value) {
 		$old = $this->value;
 		$this->value = $value;

lib/Daemon_ConfigParser.php

Doc Comments +5 added lines

@@ -27,6 +27,7 @@ 
 
 	/**
 	 * Constructor
+	 * @param Daemon_Config $config
 	 * @return void
 	 */
 	public function __construct($file, $config, $included = FALSE)
@@ -306,6 +307,9 @@ 
 	 * Raises error message.
 	 * @param string Message.
 	 * @param string Level.
+	 * @param string $msg
+	 * @param integer $line
+	 * @param integer $col
 	 * @return void
 	 */
 	public function raiseError($msg, $level = 'emerg', $line = null, $col = null) {
@@ -324,6 +328,7 @@ 
 
 	/**
 	 * Executes token-parse callback.
+	 * @param string $c
 	 * @return void
 	 */
 	public function token($token, $c) {

Spacing +17 added lines, -17 removed lines

@@ -37,7 +37,7 @@ 
 		$cfg->revision = ++Daemon_Config::$lastRevision;
 		$cfg->data = file_get_contents($file);
 		
-		if (substr($cfg->data,0,2) === '#!') 	{
+		if (substr($cfg->data, 0, 2) === '#!') {
 			if (!is_executable($file)) {
 				$this->raiseError('Shebang (#!) detected in the first line, but file hasn\'t +x mode.');
 				return;
@@ -58,7 +58,7 @@ 
 				$str = '';
 				++$cfg->p;
 
-				for (;$cfg->p < $cfg->len;++$cfg->p) {
+				for (;$cfg->p < $cfg->len; ++$cfg->p) {
 					$c = $cfg->getCurrentChar();
 
 					if ($c === $q) {
@@ -111,7 +111,7 @@ 
 							if ($c === "\n") {
 								$newLineDetected = $prePoint;
 							}
-							if ($elTypes[$i] !== NULL)	{
+							if ($elTypes[$i] !== NULL) {
 								++$i;
 								$elTypes[$i] = NULL;
 							}
@@ -120,14 +120,14 @@ 
 							($c === '"') 
 							|| ($c === '\'')
 						) {
-							if ($elTypes[$i] != NULL)	 {
+							if ($elTypes[$i] != NULL) {
 								$cfg->raiseError('Unexpected T_STRING.');
 							}
 
 							$string = call_user_func($cfg->tokens[Daemon_ConfigParser::T_STRING], $cfg, $c);
 							--$cfg->p;
 
-							if ($elTypes[$i] === NULL)	 {
+							if ($elTypes[$i] === NULL) {
 								$elements[$i] = $string;
 								$elTypes[$i] = Daemon_ConfigParser::T_STRING;
 							}
@@ -146,7 +146,7 @@ 
 							$tokenType = Daemon_ConfigParser::T_BLOCK;
 							break;
 						} else {
-							if ($elTypes[$i] === Daemon_ConfigParser::T_STRING)	 {
+							if ($elTypes[$i] === Daemon_ConfigParser::T_STRING) {
 								$cfg->raiseError('Unexpected T_CVALUE.');
 							} else {
 								if (!isset($elements[$i])) {
@@ -190,8 +190,8 @@ 
 						
 						if ($name === 'include') {
 							$path = $elements[1];
-							if (substr($path,0,1) !== '/') {
-								$path = 'conf/'.$path;
+							if (substr($path, 0, 1) !== '/') {
+								$path = 'conf/' . $path;
 							}
 							$files = glob($path);
 							if ($files) {
@@ -199,14 +199,14 @@ 
 									$parser = new Daemon_ConfigParser($fn, $scope, true);
 								}
 							}
-						} elseif (substr(strtolower($elements[0]),0,4) === 'mod-') { // @TODO: remove in 1.0
+						} elseif (substr(strtolower($elements[0]), 0, 4) === 'mod-') { // @TODO: remove in 1.0
 							$cfg->raiseError('Variable started with \'mod-\'. This style is deprecated. You should replace it with block.');
 						} else {
 							if (sizeof($elements) > 2) {
 								$cfg->raiseError('Too many arguments.');
 							}
 							if (isset($scope->{$name})) {
-								if ($scope->{$name}->source !== 'cmdline')	{
+								if ($scope->{$name}->source !== 'cmdline') {
 									if (!isset($elements[1])) {
 										$elements[1] = true;
 										$elTypes[1] = Daemon_ConfigParser::T_CVALUE;
@@ -233,7 +233,7 @@ 
 								$scope->{$name}->setValue($elements[1]);
 								$scope->{$name}->setValueType($elTypes[1]);
 							}
-							else {$cfg->raiseError('Unrecognized parameter \''.$name.'\'');}
+							else {$cfg->raiseError('Unrecognized parameter \'' . $name . '\''); }
 						}
 					}
 					elseif ($tokenType === Daemon_ConfigParser::T_BLOCK) {
@@ -251,7 +251,7 @@ 
 						);
 					}
 				} else {
-					$cfg->raiseError('Unexpected char \''.Debug::exportBytes($c).'\'');
+					$cfg->raiseError('Unexpected char \'' . Debug::exportBytes($c) . '\'');
 				}
 			}
 		);
@@ -261,7 +261,7 @@ 
 			$e = end($this->state);
 			$cfg->token($e[0], $c);
 		}
-		if (!$included) {$this->purgeScope($this->result);}
+		if (!$included) {$this->purgeScope($this->result); }
 	}
 	
 	/**
@@ -272,7 +272,7 @@ 
 		$cfg = $this;
 		foreach ($scope as $name => $obj) {
 			if ($obj instanceof Daemon_ConfigEntry) {
-					if ($obj->source === 'config' && ($obj->revision < $cfg->revision))	{
+					if ($obj->source === 'config' && ($obj->revision < $cfg->revision)) {
 						if (!$obj->resetToDefault()) {
 							unset($scope->{$name});
 						}
@@ -280,7 +280,7 @@ 
 			}
 			elseif ($obj instanceof Daemon_ConfigSection) {
 				
-				if ($obj->source === 'config' && ($obj->revision < $cfg->revision))	{
+				if ($obj->source === 'config' && ($obj->revision < $cfg->revision)) {
 					if (sizeof($obj) === 0) {
 						unset($scope->{$name});
 					}
@@ -316,10 +316,10 @@ 
 			$line = $this->line;
 		}
 		if ($col === null) {
-			$col = $this->col -1 ;
+			$col = $this->col - 1;
 		}
 
-		Daemon::log('[conf#' . $level . '][' . $this->file . ' L:' . $line . ' C: ' . $col . ']   '.$msg);
+		Daemon::log('[conf#' . $level . '][' . $this->file . ' L:' . $line . ' C: ' . $col . ']   ' . $msg);
 	}
 
 	/**

Braces +16 added lines, -32 removed lines

@@ -64,8 +64,7 @@ 
 					if ($c === $q) {
 						++$cfg->p;
 						break;
-					}
-					elseif ($c === '\\') {
+					} elseif ($c === '\\') {
 						if ($cfg->getNextChar() === $q) {
 							$str .= $q;
 							++$cfg->p;
@@ -84,19 +83,16 @@ 
 				return $str;
 			},
 			self::T_ALL => function($cfg, $c) {
-				if (ctype_space($c)) { }
-				elseif ($c === '#') {
+				if (ctype_space($c)) { } elseif ($c === '#') {
 					$cfg->state[] = array(Daemon_ConfigParser::T_COMMENT);
-				}
-				elseif ($c === '}') {
+				} elseif ($c === '}') {
 					if (sizeof($cfg->state) > 1) {
 						$cfg->purgeScope($cfg->getCurrentScope());
 						array_pop($cfg->state);
 					} else {
 						$cfg->raiseError('Unexpected \'}\'');
 					}
-				}
-				elseif (ctype_alnum($c)) {
+				} elseif (ctype_alnum($c)) {
 					$elements = array('');
 					$elTypes = array(NULL);
 					$i = 0;
@@ -115,8 +111,7 @@ 
 								++$i;
 								$elTypes[$i] = NULL;
 							}
-						}
-						elseif (
+						} elseif (
 							($c === '"') 
 							|| ($c === '\'')
 						) {
@@ -131,18 +126,15 @@ 
 								$elements[$i] = $string;
 								$elTypes[$i] = Daemon_ConfigParser::T_STRING;
 							}
-						}
-						elseif ($c === '}') {
+						} elseif ($c === '}') {
 							$cfg->raiseError('Unexpected \'}\' instead of \';\' or \'{\'');
-						}
-						elseif ($c === ';') {
+						} elseif ($c === ';') {
 							if ($newLineDetected) {
 								$this->raiseError('Unexpected new-line instead of \';\'', 'notice', $newLineDetected[0], $newLineDetected[1]);
 							}
 							$tokenType = Daemon_ConfigParser::T_VAR;
 							break;
-						}
-						elseif ($c === '{') {
+						} elseif ($c === '{') {
 							$tokenType = Daemon_ConfigParser::T_BLOCK;
 							break;
 						} else {
@@ -163,19 +155,16 @@ 
 						if (Daemon_ConfigParser::T_CVALUE === $v) {
 							if (ctype_digit($elements[$k])) {
 								$elements[$k] = (int) $elements[$k];
-							}
-							elseif (is_numeric($elements[$k])) {
+							} elseif (is_numeric($elements[$k])) {
 								$elements[$k] = (float) $elements[$k];
 							} else {
 								$l = strtolower($elements[$k]);
 
 								if (($l === 'true') || ($l === 'on')) {
 									$elements[$k] = true;
-								}
-								elseif (($l === 'false') || ($l === 'off')) {
+								} elseif (($l === 'false') || ($l === 'off')) {
 									$elements[$k] = false;
-								}
-								elseif ($l === 'null') {
+								} elseif ($l === 'null') {
 									$elements[$k] = null;
 								}
 							}
@@ -183,8 +172,7 @@ 
 					}
 					if ($tokenType === 0) {
 						$cfg->raiseError('Expected \';\' or \'{\''); 
-					}
-					elseif ($tokenType === Daemon_ConfigParser::T_VAR) {
+					} elseif ($tokenType === Daemon_ConfigParser::T_VAR) {
 						$name = str_replace('-', '', strtolower($elements[0]));
 						$scope = $cfg->getCurrentScope();
 						
@@ -232,11 +220,9 @@ 
 								}
 								$scope->{$name}->setValue($elements[1]);
 								$scope->{$name}->setValueType($elTypes[1]);
-							}
-							else {$cfg->raiseError('Unrecognized parameter \''.$name.'\'');}
+							} else {$cfg->raiseError('Unrecognized parameter \''.$name.'\'');}
 						}
-					}
-					elseif ($tokenType === Daemon_ConfigParser::T_BLOCK) {
+					} elseif ($tokenType === Daemon_ConfigParser::T_BLOCK) {
 						$scope = $cfg->getCurrentScope();
 						$sectionName = implode('-', $elements);
 						$sectionName = strtr($sectionName, '-. ', ':::');
@@ -277,14 +263,12 @@ 
 							unset($scope->{$name});
 						}
 					}
-			}
-			elseif ($obj instanceof Daemon_ConfigSection) {
+			} elseif ($obj instanceof Daemon_ConfigSection) {
 				
 				if ($obj->source === 'config' && ($obj->revision < $cfg->revision))	{
 					if (sizeof($obj) === 0) {
 						unset($scope->{$name});
-					}
-					elseif (isset($obj->enable)) {
+					} elseif (isset($obj->enable)) {
 						$obj->enable->setValue(FALSE);
 					}
 				}

lib/Daemon_IPCThread.php

Doc Comments +2 added lines, -1 removed lines

@@ -132,6 +132,7 @@ 
 	/**
 	 * Log something
 	 * @param string - Message.
+	 * @param string $message
 	 * @return void
 	 */
 	public function log($message) {
@@ -162,7 +163,7 @@ 
 	/**
 	 * @todo description?
 	 * @param boolean - Hard? If hard, we shouldn't wait for graceful shutdown of the running applications.
-	 * @return boolean - Ready?
+	 * @return boolean|null - Ready?
 	 */
 	public function shutdown($hard = FALSE) {
 		$error = error_get_last(); 

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function prepareSystemEnv() {
 		proc_nice(Daemon::$config->ipcthreadpriority->value);
-		register_shutdown_function(array($this,'shutdown'));
+		register_shutdown_function(array($this, 'shutdown'));
 		
 		$this->setproctitle(
 			Daemon::$runName . ': IPC process'
@@ -168,7 +168,7 @@ 
 		$error = error_get_last(); 
 		if ($error) {
 			if ($error['type'] === E_ERROR) {
-				$this->log('crashed by error \''.$error['message'].'\' at '.$error['file'].':'.$error['line']);
+				$this->log('crashed by error \'' . $error['message'] . '\' at ' . $error['file'] . ':' . $error['line']);
 			}
 
 		}

Braces +3 added lines, -6 removed lines

@@ -87,8 +87,7 @@ 
 			if (posix_getuid() != 0) {
 				$this->log('You must have the root privileges to change root.');
 				exit(0);
-			}
-			elseif (!chroot(Daemon::$config->chroot->value)) {
+			} elseif (!chroot(Daemon::$config->chroot->value)) {
 				Daemon::log('Couldn\'t change root to \'' . Daemon::$config->chroot->value . '\'.');
 				exit(0);
 			}
@@ -98,8 +97,7 @@ 
 			if ($sg === FALSE) {
 				$this->log('Couldn\'t change group to \'' . Daemon::$config->group->value . '\'. You must replace config-variable \'group\' with existing group.');
 				exit(0);
-			}
-			elseif (
+			} elseif (
 				($sg['gid'] != posix_getgid())
 				&& (!posix_setgid($sg['gid']))
 			) {
@@ -112,8 +110,7 @@ 
 			if ($su === FALSE) {
 				$this->log('Couldn\'t change user to \'' . Daemon::$config->user->value . '\', user not found. You must replace config-variable \'user\' with existing username.');
 				exit(0);
-			}
-			elseif (
+			} elseif (
 				($su['uid'] != posix_getuid())
 				&& (!posix_setuid($su['uid']))
 			) {

lib/Daemon_MasterThread.php

Doc Comments +5 added lines

@@ -139,6 +139,7 @@ 
 	/**
 	 * Log something
 	 * @param string - Message.
+	 * @param string $message
 	 * @return void
 	 */
 	public function log($message) {
@@ -167,6 +168,7 @@ 
 	}
 	/**
 	 * @todo description missed
+	 * @param integer $id
 	 */	
 	public function reloadWorker($id) {
 		if (isset($this->workers->threads[$id])) {
@@ -322,6 +324,9 @@ 
 		$this->shutdown(SIGINT);
 	}
 	
+	/**
+	 * @param integer $signo
+	 */
 	public function signalToChildren($signo) {
 		foreach ($this->collections as $col) {
 			$col->signal($signo);

Indentation +8 added lines, -8 removed lines

@@ -155,10 +155,10 @@ 
 		posix_setsid();
 		proc_nice(Daemon::$config->masterpriority->value);
 		if (!Daemon::$config->verbosetty->value) {
-     		fclose(STDIN);
-        	fclose(STDOUT);
-        	fclose(STDERR);
-        }
+	 		fclose(STDIN);
+			fclose(STDOUT);
+			fclose(STDERR);
+		}
 		
 		$this->setproctitle(
 			Daemon::$runName . ': master process' 
@@ -212,10 +212,10 @@ 
 	}
 
 		/**
-	 * Spawn IPC process
-	 * @param $n - integer - number of workers to spawn
-	 * @return boolean - success
-	 */
+		 * Spawn IPC process
+		 * @param $n - integer - number of workers to spawn
+		 * @return boolean - success
+		 */
 	public function spawnIPCThread() {
 		if (FS::$supported) {
 			eio_event_loop();

Spacing +2 added lines, -2 removed lines

@@ -151,7 +151,7 @@ 
 	 * @return void
 	 */
 	public function prepareSystemEnv() {
-		register_shutdown_function(array($this,'onShutdown'));
+		register_shutdown_function(array($this, 'onShutdown'));
 		posix_setsid();
 		proc_nice(Daemon::$config->masterpriority->value);
 		if (!Daemon::$config->verbosetty->value) {
@@ -291,7 +291,7 @@ 
 		$this->shutdown = true;
 		$this->waitAll(true);
 		Daemon::$shm_wstate->delete();		
-		file_put_contents(Daemon::$config->pidfile->value,'');
+		file_put_contents(Daemon::$config->pidfile->value, '');
 		exit(0);
 	}