kakserpom / phpdaemon

lib/AppResolver.php

Braces +1 added lines, -3 removed lines

@@ -116,9 +116,7 @@
 	public function getRequest($req, $upstream, $defaultApp = NULL) {
 		if (isset($req->attrs->server['APPNAME'])) {
 			$appName = $req->attrs->server['APPNAME'];
-		}
-		elseif (($appName = $this->getRequestRoute($req, $upstream)) !== NULL) {}
-		else {
+		} elseif (($appName = $this->getRequestRoute($req, $upstream)) !== NULL) {} else {
 			$appName = $defaultApp;
 		}
 		if (strpos($appName,'-') === false) {

lib/AsyncStream.php

Braces +5 added lines, -10 removed lines

@@ -65,8 +65,7 @@ 
 						$readFD = FALSE;
 					}
 				}
-			}
-			elseif (
+			} elseif (
 				($u['scheme'] === 'tcp') 
 				|| ($u['scheme'] === 'tcpstream')
 			) {
@@ -83,8 +82,7 @@ 
 						$readFD = FALSE;
 					}
 				}
-			}
-			elseif ($u['scheme'] === 'udp') {
+			} elseif ($u['scheme'] === 'udp') {
 				if (!$this->useSockets) {
 					$readFD = stream_socket_client($readFD, $errno, $errstr, 1);
 				} else {
@@ -95,8 +93,7 @@ 
 						$readFD = FALSE;
 					}
 				}
-			}
-			elseif ($u['scheme'] === 'file') {
+			} elseif ($u['scheme'] === 'file') {
 				$this->filePath = substr($url, 7);
 				$readFD = @fopen($this->filePath, 'r');
 				$this->fileMode = TRUE;
@@ -435,8 +432,7 @@ 
 			)
 		) {
 			$this->onEofEvent();
-		}
-		elseif (
+		} elseif (
 			!$this->EOF 
 			&& $this->noEvents
 		) {
@@ -461,8 +457,7 @@ 
 			}
 
 			$this->eof();
-		}
-		elseif ($this->onRead !== NULL) {
+		} elseif ($this->onRead !== NULL) {
 			call_user_func($this->onRead, $this);
 		}
 	}

lib/Binary.php

Braces +4 added lines, -8 removed lines

@@ -134,12 +134,10 @@ 
 		$r = '';
  		if (strlen($p) < $s) {
  			echo("getLV error: buf length (".strlen($p)."): ".Debug::exportBytes($p).", must be >= string length (".$s.")\n");
- 		}
- 		elseif ($nul) {
+ 		} elseif ($nul) {
   			if ($p{$s-1} != "\x00") {
   				echo("getLV error: Wrong end of NUL-string (".Debug::exportBytes($p{$s-1})."), len ".$s."\n");
-  			}
-  			else {
+  			} else {
   				$d = $s-1;
   				if ($d < 0) {
   					$d = 0;
@@ -147,8 +145,7 @@ 
   				$r = binarySubstr($p, 0, $d);
   				$p = binarySubstr($p, $s);
   			}
- 		}
- 		else {
+ 		} else {
  			$r = binarySubstr($p, 0, $s);
  			$p = binarySubstr($p, $s);
  		}
@@ -161,8 +158,7 @@ 
  			if (strlen($hexstr) % 2) {
  				$hexstr = "0".$hexstr;
  			}
- 		}
- 		else {
+ 		} else {
  			$hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
  		}
  		$bytes = strlen($hexstr)/2;

lib/GameMonitor.php

Braces +3 added lines, -1 removed lines

@@ -63,11 +63,13 @@
 			$set['players'] = $job->results['players'];
 			$set['latency'] = $job->results['latency'];
 			$set['atime'] = time();
-			if (0) Daemon::log('Updated server ('.round(memory_get_usage(true)/1024/1024, 5).'): '.$server['address']. ' latency = '.round($set['latency'] * 1000, 2).' ==== '
+			if (0) {
+				Daemon::log('Updated server ('.round(memory_get_usage(true)/1024/1024, 5).'): '.$server['address']. ' latency = '.round($set['latency'] * 1000, 2).' ==== '
 				 . (isset($server['atime']) ?
 				  round($set['atime'] - $server['atime']) . ' secs. from last update.'
 				  : ' =---= '.json_encode($server))
 			);
+			}
 			try {
 				$app->servers->upsert(array('_id' => $server['_id']), array('$set' => $set));
 			} catch (MongoException $e) {

lib/Daemon_IPCThread.php

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

Braces +3 added lines, -6 removed lines

@@ -58,8 +58,7 @@ 
 
             if ($c === "\x20") {
                 ++$spaces;
-            }
-            elseif (ctype_digit($c)) {
+            } elseif (ctype_digit($c)) {
                 $digits .= $c;
             }
         }
@@ -138,8 +137,7 @@ 
                 $this->connection->buf = binarySubstr($this->connection->buf, 2 + $len) ;
                   
                 $this->connection->onFrame($decodedData, $frametype);
-            }
-            else {
+            } else {
             	if (($p = strpos($this->connection->buf, "\xFF")) !== FALSE) {
                     if ($this->connection->pool->maxAllowedPacket <= $p - 1) {                   {
                         // Too big packet
@@ -151,8 +149,7 @@ 
                     $this->connection->buf = binarySubstr($this->connection->buf, $p + 1) ;                    
                     $this->connection->onFrame($decodedData, $frametype);
                     
-                }
-                else {
+                } else {
                     if ($this->connection->pool->maxAllowedPacket <= strlen($this->connection->buf))
                     {
                         // Too big packet

lib/NetworkClientConnection.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		}
 		if ($this->busy) {
 			$this->pool->servConnFree[$this->url]->detach($this);
-		}
-		else {
+		} else {
 			$this->pool->servConnFree[$this->url]->attach($this);
 			$this->release();
 		}

lib/ConnectionPool.php

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

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);
 		}