kakserpom / phpdaemon

lib/Thread.php

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
 
 		if ($pid === -1) {
 			throw new Exception('Could not fork');
-		} 
-		elseif ($pid === 0) { // we are the child
+		} elseif ($pid === 0) { // we are the child
 			$thread = $this;
 			$thread->pid = posix_getpid();
 			if (!$thread->delayedSigReg) {
@@ -187,8 +186,7 @@ 
 	protected function sighandler($signo) {
 		if (is_callable($c = array($this, strtolower(self::$signals[$signo])))) {
 			call_user_func($c);
-		}
-		elseif (is_callable($c = array($this, 'sigunknown'))) {
+		} elseif (is_callable($c = array($this, 'sigunknown'))) {
 			call_user_func($c, $signo);
 		}
 	}

lib/HTTPServerConnection.php

Braces +5 added lines, -10 removed lines

@@ -116,12 +116,10 @@ 
 					if (isset($e[1])) {
 						$currentHeader = 'HTTP_' . strtoupper(strtr($e[0], HTTPRequest::$htr));
 						$req->attrs->server[$currentHeader] = $e[1];
-					}
-					elseif ($e[0][0] === "\t" || $e[0][0] === "\x20")
+					} elseif ($e[0][0] === "\t" || $e[0][0] === "\x20")
 					{ // multiline header continued
 						$req->attrs->server[$currentHeader] .= $e[0];
-					}
-					else
+					} else
 					{ // whatever client speaks is not HTTP anymore
 						$this->finish();
 						return;
@@ -168,8 +166,7 @@ 
 					}
 					$this->state = self::STATE_CONTENT;
 				}
-			}
-			else {
+			} else {
 				$this->bufHead = $buf;
 				goto start;
 			}
@@ -197,11 +194,9 @@ 
 					$char = $this->pool->variablesOrder[$i];
 					if ($char == 'G') {
 						$req->attrs->request += $req->attrs->get;
-					}
-					elseif ($char == 'P') {
+					} elseif ($char == 'P') {
 						$req->attrs->request += $req->attrs->post;
-					}
-					elseif ($char == 'C') {
+					} elseif ($char == 'C') {
 						$req->attrs->request += $req->attrs->cookie;
 					}
 				}

lib/FastCGIServerConnection.php

Braces +9 added lines, -13 removed lines

@@ -112,9 +112,11 @@ 
 		$this->state = self::STATE_ROOT;
 
 		
-		if (0) Daemon::log('[DEBUG] FastCGI-record ' . $this->header['ttype'] . '). Request ID: ' . $rid 
+		if (0) {
+			Daemon::log('[DEBUG] FastCGI-record ' . $this->header['ttype'] . '). Request ID: ' . $rid 
 				. '. Content length: ' . $this->header['conlen'] . ' (' . strlen($this->content) . ') Padding length: ' . $this->header['padlen'] 
 				. ' (' . strlen($pad) . ')');
+		}
 		
 
 		if ($type == self::FCGI_BEGIN_REQUEST) {
@@ -142,8 +144,7 @@ 
 			$req->queueId = $rid;
 			$req->conn = $this;
 			$this->requests[$rid] = $req;
-		}
-		elseif (isset($this->requests[$rid])) {
+		} elseif (isset($this->requests[$rid])) {
 			$req = $this->requests[$rid];
 		} else {
 			Daemon::log('Unexpected FastCGI-record #' . $this->header['type'] . ' (' . $this->header['ttype'] . '). Request ID: ' . $rid . '.');
@@ -152,8 +153,7 @@ 
 
 		if ($type === self::FCGI_ABORT_REQUEST) {
 			$req->abort();
-		}
-		elseif ($type === self::FCGI_PARAMS) {
+		} elseif ($type === self::FCGI_PARAMS) {
 			if ($this->content === '') {
 				if (!isset($req->attrs->server['REQUEST_TIME'])) {
 					$req->attrs->server['REQUEST_TIME'] = time();
@@ -213,8 +213,7 @@ 
 					$p += $namelen + $vlen;
 				}
 			}
-		}
-		elseif ($type === self::FCGI_STDIN) {
+		} elseif ($type === self::FCGI_STDIN) {
 			if ($this->content === '') {
 				$req->attrs->stdin_done = true;
 			}
@@ -234,11 +233,9 @@ 
 
 					if ($char == 'G') {
 						$req->attrs->request += $req->attrs->get;
-					}
-					elseif ($char == 'P') {
+					} elseif ($char == 'P') {
 						$req->attrs->request += $req->attrs->post;
-					}
-					elseif ($char == 'C') {
+					} elseif ($char == 'C') {
 						$req->attrs->request += $req->attrs->cookie;
 					}
 				}
@@ -349,8 +346,7 @@ 
 
 		if ($protoStatus === -1) {
 			$this->close();
-		}
-		elseif (!$this->pool->config->keepalive->value) {
+		} elseif (!$this->pool->config->keepalive->value) {
 			$this->finish();
 		}
 	}	

lib/MySQLClientConnection.php

Braces +7 added lines, -14 removed lines

@@ -36,11 +36,9 @@ 
 	public function onConnected($cb) {
 		if ($this->state == self::STATE_AUTH_ERR) {
 			call_user_func($cb, $this, FALSE);
-		}
-		elseif ($this->state === self::STATE_HANDSHAKED) {
+		} elseif ($this->state === self::STATE_HANDSHAKED) {
 			call_user_func($cb, $this, TRUE);
-		}
-		else {
+		} else {
 			if (!$this->onConnected) {
 				$this->onConnected = new StackCallbacks;
 			}
@@ -401,8 +399,7 @@ 
 				$this->onError();
 				$this->errno = 0;
 				$this->errmsg = '';
-			}
-			elseif ($fieldCount === 0x00) {
+			} elseif ($fieldCount === 0x00) {
 				// OK Packet Empty
 				if ($this->state === self::STATE_AUTH_SENT) {
 					$this->state = self::STATE_HANDSHAKED;
@@ -428,13 +425,11 @@ 
 
 				$this->message = binarySubstr($this->buf, $p, $packet[0] + 4 - $p);
 				$this->onResultDone();
-			}
-			elseif ($fieldCount === 0xFE) { 
+			} elseif ($fieldCount === 0xFE) { 
 				// EOF Packet		
 				if ($this->instate === self::INSTATE_ROW) {
 					$this->onResultDone();
-				}
-				else {
+				} else {
 					++$this->instate;
 				}
 			} else {
@@ -445,8 +440,7 @@ 
 					// Result Set Header Packet
 					$extra = $this->parseEncodedBinary($this->buf, $p);
 					$this->instate = self::INSTATE_FIELD;
-				}
-				elseif ($this->instate === self::INSTATE_FIELD) {
+				} elseif ($this->instate === self::INSTATE_FIELD) {
 					// Field Packet
 					$field = array(
 						'catalog'    => $this->parseEncodedString($this->buf, $p),
@@ -478,8 +472,7 @@ 
 					++$p;
 
 					$this->resultFields[] = $field;
-				}
-				elseif ($this->instate === self::INSTATE_ROW) {
+				} elseif ($this->instate === self::INSTATE_ROW) {
 					// Row Packet
 					$row = array();
 

lib/MongoClientAsyncConnection.php

Braces +1 added lines, -2 removed lines

@@ -136,8 +136,7 @@
 						unset($this->pool->cursors[$cur]);
 					}
 				}
-			} 
-			elseif (isset($this->pool->cursors[$cur])) {
+			} elseif (isset($this->pool->cursors[$cur])) {
 				call_user_func($this->pool->cursors[$cur]->callback, $this->pool->cursors[$cur]);
 			}
 			

lib/LockServer.php

Braces +6 added lines, -12 removed lines

@@ -99,8 +99,7 @@ 
 		foreach ($this->locks as $name => $status) {
 			if ($status === 1) {
 				$this->done($name, 'FAILED');
-			}
-			elseif ($status === 2) {
+			} elseif ($status === 2) {
 				unset($this->pool->lockConnState[$name][$this->connId]);
 			}
 		}
@@ -121,20 +120,15 @@ 
 
 			if ($e[0] === 'acquire') {
 				$this->writeln($this->acquireLock($e[1]) . ' ' . $e[1]);
-			}
-			elseif ($e[0] === 'acquireWait') {
+			} elseif ($e[0] === 'acquireWait') {
 				$this->writeln($this->acquireLock($e[1], TRUE) . ' ' . $e[1]);
-			}
-			elseif ($e[0] === 'done') {
+			} elseif ($e[0] === 'done') {
 				$this->done($e[1], 'DONE'); 
-			}
-			elseif ($e[0] === 'failed') {
+			} elseif ($e[0] === 'failed') {
 				$this->done($e[1], 'FAILED');
-			}
-			elseif ($e[0] === 'quit') {
+			} elseif ($e[0] === 'quit') {
 				$this->finish();
-			}
-			elseif ($e[0] !== '') {
+			} elseif ($e[0] !== '') {
 				$this->writeln('PROTOCOL_ERROR');
 			}
 			if($this->pool->config->protologging->value) {

lib/WebSocketServerConnection.php

Braces +7 added lines, -14 removed lines

@@ -184,8 +184,7 @@ 
 			if (is_callable(array($this->upstream, 'onHandshake')))	{
 				$this->upstream->onHandshake();
 			}
-		}
-		else {
+		} else {
 			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake send failure for client "' . $this->addr . '"') ;
 			$this->finish();
 			return false;
@@ -247,29 +246,24 @@ 
 					if (isset($this->server['HTTP_SEC_WEBSOCKET_VERSION'])) { // HYBI
 						if ($this->server['HTTP_SEC_WEBSOCKET_VERSION'] == '8') { // Version 8 (FF7, Chrome14)
 							$this->protocol = new WebSocketProtocolV13($this) ;
-						}
-						elseif ($this->server['HTTP_SEC_WEBSOCKET_VERSION'] == '13') { // newest protocol
+						} elseif ($this->server['HTTP_SEC_WEBSOCKET_VERSION'] == '13') { // newest protocol
 							$this->protocol = new WebSocketProtocolV13($this);
-						}
-						else
+						} else
 						{
 							Daemon::$process->log(get_class($this) . '::' . __METHOD__ . " : Websocket protocol version " . $this->server['HTTP_SEC_WEBSOCKET_VERSION'] . ' is not yet supported for client "' . $this->addr . '"') ;
 
 							$this->finish();
 							return;
 						}
-					}
-					elseif (!isset($this->server['HTTP_SEC_WEBSOCKET_KEY1']) || !isset($this->server['HTTP_SEC_WEBSOCKET_KEY2'])) {
+					} elseif (!isset($this->server['HTTP_SEC_WEBSOCKET_KEY1']) || !isset($this->server['HTTP_SEC_WEBSOCKET_KEY2'])) {
 						$this->protocol = new WebSocketProtocolVE($this);
-					}
-					else {	// Defaulting to HIXIE (Safari5 and many non-browser clients...)
+					} else {	// Defaulting to HIXIE (Safari5 and many non-browser clients...)
 						$this->protocol = new WebSocketProtocolV0($this) ;
 					}
 					// ----------------------------------------------------------
 					// End of protocol discovery
 					// ----------------------------------------------------------
-				} 
-				elseif (!$this->firstline)
+				} elseif (!$this->firstline)
 				{
 					$this->firstline = true;     
 					$e = explode(' ', $l);
@@ -284,8 +278,7 @@ 
 					$this->server['SERVER_PROTOCOL'] = isset($e[2]) ? trim($e[2]) : '';
 
 					list($this->server['REMOTE_ADDR'],$this->server['REMOTE_PORT']) = explode(':', $this->addr);
-				}
-				else
+				} else
 				{
 					$e = explode(': ', $l);
 					

lib/LockClient.php

Braces +2 added lines, -4 removed lines

@@ -113,13 +113,11 @@
 				if (isset($this->pool->jobs[$e[1]])) {
 					call_user_func($this->pool->jobs[$e[1]][0], $e[0], $e[1], $this->pool);
 				}
-			}
-			elseif ($e[0] === 'DONE') {
+			} elseif ($e[0] === 'DONE') {
 				if (isset($this->pool->jobs[$e[1]][1])) {
 					call_user_func($this->pool->jobs[$e[1]][1], $e[0], $e[1], $this->pool);
 				}
-			}
-			elseif ($e[0] === 'FAILED') {
+			} elseif ($e[0] === 'FAILED') {
 				if (isset($this->pool->jobs[$e[1]][2])) {
 					call_user_func($this->pool->jobs[$e[1]][2], $e[0], $e[1], $this->pool);
 				}

lib/IPCManager.php

Braces +7 added lines, -14 removed lines

@@ -69,8 +69,7 @@ 
 					}
 					if (!isset($worker->instancesCount[$name])) {
 						$worker->instancesCount[$name] = 1;
-					}
-					else {
+					} else {
 						++$worker->instancesCount[$name];
 					}
 					$worker->sendPacket(array('op' => 'spawnInstance', 'appfullname' => $name));
@@ -160,22 +159,19 @@ 
 			$this->workerId = $p['workerId'];
 			$this->pool->workers[$this->workerId] = $this;
 			$this->pool->appInstance->updatedWorkers();
-		}
-		elseif ($p['op'] === 'broadcastCall') {
+		} elseif ($p['op'] === 'broadcastCall') {
 			$p['op'] = 'call';
 			foreach ($this->pool->workers as $worker) {
 				$worker->sendPacket($p);
 			}
-		}
-		elseif ($p['op'] === 'directCall') {
+		} elseif ($p['op'] === 'directCall') {
 			$p['op'] = 'call';
 			if (!isset($this->pool->workers[$p['workerId']])) {
 				Daemon::$process->log('directCall(). not sent.');
 				return;
 			}
 			$this->pool->workers[$p['workerId']]->sendPacket($p);
-		}
-		elseif ($p['op'] === 'singleCall') {
+		} elseif ($p['op'] === 'singleCall') {
 			$p['op'] = 'call';
 			$sent = false;
 			foreach ($this->pool->workers as $worker) {
@@ -186,8 +182,7 @@ 
 			if (!$sent) {
 				Daemon::$process->log('singleCall(). not sent.');
 			}
-		}
-		elseif ($p['op'] === 'addIncludedFiles') {
+		} elseif ($p['op'] === 'addIncludedFiles') {
 			foreach ($p['files'] as $file) {
 				Daemon::$process->fileWatcher->addWatch($file, $this->workerId);
 			}
@@ -253,8 +248,7 @@ 
 			}
 			list($app, $name) = explode(':', $fullname, 2);
 			Daemon::$appResolver->appInstantiate($app,$name);
-		}
-		elseif ($p['op'] === 'importFile') {
+		} elseif ($p['op'] === 'importFile') {
 			if (!Daemon::$config->autoreimport->value) {
 				Daemon::$process->sigusr2(); // graceful restart
 				return;
@@ -273,8 +267,7 @@ 
 				
 				$event->finish();
 			}, 5);
-		}
-		elseif ($p['op'] === 'call') {
+		} elseif ($p['op'] === 'call') {
 			if (strpos($p['appfullname'],':') === false) {
 				$p['appfullname'] .= ':';
 			}