kakserpom / phpdaemon

lib/MongoClientAsync.php

Braces +4 added lines, -10 removed lines

@@ -176,9 +176,7 @@ 
 			
 				if ($k === 'sort') {
 					$o['orderby'] = $v;
-				}
-				elseif ($k === 'parse_oplog') {}
-				else {
+				} elseif ($k === 'parse_oplog') {} else {
 					$o[$k] = $v;
 				}
 			}
@@ -277,9 +275,7 @@ 
 		
 				if ($k === 'sort') {
 					$o['orderby'] = $v;
-				}
-				elseif ($k === 'parse_oplog') {}
-				else {
+				} elseif ($k === 'parse_oplog') {} else {
 					$o[$k] = $v;
 				}
 			}
@@ -340,8 +336,7 @@ 
 
 		if (is_string($p['where'])) {
 			$query['where'] = new MongoCode($p['where']);
-		}
-		elseif (
+		} elseif (
 			is_object($p['where']) 
 			|| sizeof($p['where'])
 		) {
@@ -481,8 +476,7 @@ 
 		
 		if (is_string($p['where'])) {
 			$query['where'] = new MongoCode($p['where']);
-		}
-		elseif (
+		} elseif (
 			is_object($p['where']) 
 			|| sizeof($p['where'])
 		) {

lib/RedisClientConnection.php

Braces +3 added lines, -6 removed lines

@@ -51,21 +51,18 @@
 						$this->result = array((int) binarySubstr($l, 1));
 					}
 					goto start;
-				}
-				elseif (($char == '+') || ($char == '-')) { // inline string
+				} elseif (($char == '+') || ($char == '-')) { // inline string
 					$this->resultLength = 1;
 					$this->resultSize = 1;
 					$this->error = ($char == '-');
 					$this->result = array(binarySubstr($l, 1));
 					goto start;
-				}
-				elseif ($char == '*') { // defines number of elements of incoming array
+				} elseif ($char == '*') { // defines number of elements of incoming array
 					$this->resultLength = (int) substr($l, 1);
 					$this->resultSize = 0;
 					$this->result = array();
 					goto start;
-				}
-				elseif ($char == '$') { // defines size of the data block
+				} elseif ($char == '$') { // defines size of the data block
 					$this->valueLength = (int) substr($l, 1);
 					$this->state = self::STATE_BINARY; // binary data block
 					break; // stop reading line-by-line

lib/Connection.php

Braces +3 added lines, -6 removed lines

@@ -162,8 +162,7 @@ 
 			socket_set_option($fd, SOL_SOCKET, SO_SNDTIMEO, array('sec' => $this->timeout, 'usec' => 0));
 			socket_set_option($fd, SOL_SOCKET, SO_RCVTIMEO, array('sec' => $this->timeout, 'usec' => 0));
 			@socket_connect($fd, $e[1], 0);
-		} 
-		elseif (stripos($addr, 'raw:') === 0) {
+		} elseif (stripos($addr, 'raw:') === 0) {
 			$this->type = 'raw';
 			// Raw-socket
 			$this->addr = $addr;
@@ -200,8 +199,7 @@ 
 			socket_set_option($fd, SOL_SOCKET, SO_RCVTIMEO, array('sec' => $this->timeout, 'usec' => 0));
 			socket_set_nonblock($fd);
 			@socket_connect($fd, $host, 0);
-		}
-		elseif (stripos($addr, 'udp:') === 0) {
+		} elseif (stripos($addr, 'udp:') === 0) {
 			$this->type = 'udp';
 			// UDP-socket
 			$this->addr = $addr;
@@ -308,8 +306,7 @@ 
 			if (!$this->bevConnectEnabled) {
 				@socket_connect($fd, $host, $port);
 				socket_getsockname($fd, $this->locAddr, $this->locPort);
-			}
-			else {
+			} else {
 				$this->bevConnect = true;
 			}
 		}

lib/IOStream.php

Braces +1 added lines, -2 removed lines

@@ -401,8 +401,7 @@
 	public function onStateEvent($bev, $events) {
 		if ($events & EventBufferEvent::CONNECTED) {
 			$this->onWriteEvent($bev);
-		}
-  		elseif ($events & (EventBufferEvent::ERROR | EventBufferEvent::EOF)) {
+		} elseif ($events & (EventBufferEvent::ERROR | EventBufferEvent::EOF)) {
 			try {
 				$this->close();
 				if ($this->finished) {

lib/FlashPolicyServer.php

Braces +1 added lines, -2 removed lines

@@ -60,8 +60,7 @@
 				$this->write("<error/>\x00");
 			}
 			$this->finish();
-		}
-		else {
+		} else {
 			$this->finish();
 		}
 	}

lib/Daemon_Bootstrap.php

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/AppInstance.php

Braces +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
 				}
 			} elseif ($v instanceof Daemon_ConfigSection) {
 			// @todo
-			}	else {
+			} else {
 				$current = $this->config->{$k};
 			  if (is_scalar($v))	{
 					$this->config->{$k} = new Daemon_ConfigEntry($v);

lib/Request.php

Braces +3 added lines, -6 removed lines

@@ -83,8 +83,7 @@ 
 				$ret = $this->run(); 
 				if (($ret === Request::STATE_FINISHED) || ($ret === null)) {
 					$this->finish();
-				}
-				elseif ($ret === Request::STATE_WAITING) {
+				} elseif ($ret === Request::STATE_WAITING) {
 					$this->state = $ret;
 				}
 			} catch (RequestSleepException $e) {
@@ -110,8 +109,7 @@ 
 		handleStatus:
 		if ($this->state === Request::STATE_FINISHED) {		
 			$this->free();
-		}
-		elseif ($this->state === REQUEST::STATE_WAITING) {
+		} elseif ($this->state === REQUEST::STATE_WAITING) {
 			$this->ev->add($this->sleepTime);
 		}
 	}
@@ -271,8 +269,7 @@ 
  
 		if (!$set) {
 			throw new RequestSleepException;
-		}
-		else {
+		} else {
 			$this->ev->del();
 			$this->ev->add($this->sleepTime);
 		}

lib/FileWatcher.php

Braces +2 added lines, -4 removed lines

@@ -66,8 +66,7 @@ 
 		foreach ($this->files[$path] as $k => $subscriber) {
 			if (is_callable($subscriber) || is_array($subscriber)) {
 				call_user_func($subscriber, $path);
-			}
-			elseif (!Daemon::$process->IPCManager->importFile($subscriber, $path)) {
+			} elseif (!Daemon::$process->IPCManager->importFile($subscriber, $path)) {
 				$this->rmWatch($path, $subscriber);
 			}
 		}
@@ -85,8 +84,7 @@ 
 				}
 				$this->onFileChanged($path);
 			}
-		}
-		else {
+		} else {
 		 	static $hash = array();
 	
 			foreach (array_keys($this->files) as $path) {