kakserpom / phpdaemon

lib/BoundUDPSocket.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		do {
 			$l = @socket_recvfrom($this->fd, $buf, 10240, MSG_DONTWAIT, $host, $port);
 			if ($l) {
-				$key = '['.$host . ']:' . $port;
+				$key = '[' . $host . ']:' . $port;
 				if (!isset($this->portsMap[$key])) {
 
 					if ($this->pool->allowedClients !== null) {

lib/HTTPServer.php

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	/**
 	 * Called when the worker is ready to go.
 	 * @return void
-	*/
+	 */
 	public function onReady() {
 		parent::onReady();
 		$this->WS = WebSocketServer::getInstance();

lib/SocksServer.php

Braces +5 added lines, -10 removed lines

@@ -82,8 +82,7 @@ 
 				// No auth
 				$m = "\x00";
 				$this->state = self::STATE_AUTHORIZED;
-			} 
-			elseif (strpos($methods, "\x02") !== FALSE) {
+			} elseif (strpos($methods, "\x02") !== FALSE) {
 				// Username/Password authentication
 				$m = "\x02";
 				$this->state = self::STATE_HANDSHAKED;
@@ -100,8 +99,7 @@ 
 			} else {
 				goto start;
 			}
-		}
-		elseif ($this->state === self::STATE_HANDSHAKED) {
+		} elseif ($this->state === self::STATE_HANDSHAKED) {
 			// Handshaked
 			if ($l < 3) {
 				// Not enough data yet
@@ -151,8 +149,7 @@ 
 			} else {
 				goto start;
 			}
-		} 
-		elseif ($this->state === self::STATE_AUTHORIZED) {
+		} elseif ($this->state === self::STATE_AUTHORIZED) {
 			// Ready for query
 			if ($l < 4) {
 				// Not enough data yet
@@ -173,14 +170,12 @@ 
 			if ($atype === "\x01") {
 				$address = inet_ntop(binarySubstr($this->buf, $pl, 4)); 
 				$pl += 4;
-			}
-			elseif ($atype === "\x03") {
+			} elseif ($atype === "\x03") {
 				$len = ord(binarySubstr($this->buf, $pl, 1));
 				++$pl;
 				$address = binarySubstr($this->buf, $pl, $len);
 				$pl += $len;
-			}
-			elseif ($atype === "\x04") {
+			} elseif ($atype === "\x04") {
 				$address = inet_ntop(binarySubstr($this->buf, $pl, 16)); 
 				$pl += 16;
 			} else {

lib/RedisClientConnection.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * Called when new data received
 	 * @param string New data
 	 * @return void
-	*/
+	 */
 	public function stdin($buf) {
 		$this->buf .= $buf;
 		start:

Spacing +7 added lines, -7 removed lines

@@ -9,15 +9,15 @@
 
 class RedisClientConnection extends NetworkClientConnection {
 
-	public $result = null;      	// current result (array)
+	public $result = null; // current result (array)
 	public $resultLength = 0;
-	public $resultSize = 0;			// number of received array items in result
+	public $resultSize = 0; // number of received array items in result
 	public $value = '';
-	public $valueLength = 0;        // length of incoming value
-	public $valueSize = 0;         // size of received part of the value
-	public $error;                 // error message
-	public $key;                   // current incoming key
-	public $EOL = "\r\n";			// EOL for gets() and writeln()
+	public $valueLength = 0; // length of incoming value
+	public $valueSize = 0; // size of received part of the value
+	public $error; // error message
+	public $key; // current incoming key
+	public $EOL = "\r\n"; // EOL for gets() and writeln()
 	const STATE_BINARY = 1;
 
 	/**

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

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 
 	public function __call($name, $args) {
 		$onResponse = null;		
-		if (($e = end($args)) && (is_array($e) || is_object($e)) &&	is_callable($e)) {
-			$onResponse= array_pop($args);
+		if (($e = end($args)) && (is_array($e) || is_object($e)) && is_callable($e)) {
+			$onResponse = array_pop($args);
 		}
 		reset($args);
 		$name = strtoupper($name);

lib/Connection.php

Spacing +4 added lines, -4 removed lines

@@ -172,7 +172,7 @@ 
 			if (@inet_pton($host) === false) { // dirty condition check
 				DNSClient::getInstance()->resolve($host, function($result) use ($host) {
 					if ($result === false) {
-						Daemon::log(get_class($this).'->connectTo (raw) : enable to resolve hostname: '.$host);
+						Daemon::log(get_class($this) . '->connectTo (raw) : enable to resolve hostname: ' . $host);
 						$this->onFailureEvent(null);
 						return;
 					}
@@ -184,7 +184,7 @@ 
 					} else {
 						$real = $result;
 					}
-					$this->connectTo('raw:'. $real);
+					$this->connectTo('raw:' . $real);
 				});
 				return;
 			}
@@ -210,7 +210,7 @@ 
 			if ($pton === false) { // dirty condition check
 				DNSClient::getInstance()->resolve($host, function($result) use ($host) {
 					if ($result === false) {
-						Daemon::log(get_class($this).'->connectTo (udp) : enable to resolve hostname: '.$host);
+						Daemon::log(get_class($this) . '->connectTo (udp) : enable to resolve hostname: ' . $host);
 						$this->onStateEvent($this->bev, EventBufferEvent::ERROR);
 						return;
 					}
@@ -256,7 +256,7 @@ 
 			if ($pton === false) { // dirty condition check
 				DNSClient::getInstance()->resolve($this->host, function($result) use ($host) {
 					if ($result === false) {
-						Daemon::log(get_class($this).'->connectTo (tcp) : enable to resolve hostname: '.$host);
+						Daemon::log(get_class($this) . '->connectTo (tcp) : enable to resolve hostname: ' . $host);
 						$this->onStateEvent($this->bev, EventBufferEvent::ERROR);
 						return;
 					}

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

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
  */
 class FlashPolicyServer extends NetworkServer {
 
-	public $policyData;          // Cached policy-file.
+	public $policyData; // Cached policy-file.
 	/**
 	 * Setting default config options
 	 * Overriden from ConnectionPool::getConfigDefaults
@@ -17,7 +17,7 @@ 
 	protected function getConfigDefaults() {
 		return array(
 			// @todo add description strings
-			'file'                  =>  getcwd().'/conf/crossdomain.xml',
+			'file'                  =>  getcwd() . '/conf/crossdomain.xml',
 			'listen'				=> '0.0.0.0',
 			'port' 			        => 843,
 		);

Braces +1 added lines, -2 removed lines

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

lib/FileWatcher.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 		if (!isset($this->files[$path])) {
 			$this->files[$path] = array();
 			if ($this->inotify) {
-				$this->descriptors[inotify_add_watch($this->inotify, $path,$flags?:IN_MODIFY)] = $path;
+				$this->descriptors[inotify_add_watch($this->inotify, $path, $flags ?: IN_MODIFY)] = $path;
 			}
 		}
 		$this->files[$path][] = $subscriber;
@@ -44,7 +44,7 @@ 
 	
 		$path = realpath($path);
 	
-		if (!isset($this->files[$path])) {return false;}
+		if (!isset($this->files[$path])) {return false; }
 		if (($k = array_search($subscriber, $this->files[$path], true)) !== false) {
 			unset($this->files[$path][$k]);
 		}

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) {

lib/PriorityQueueCallbacks.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 			return 0;
 		}
 		return $pri1 < $pri2 ? -1 : 1; 
-    } 
+	} 
 	public function executeOne() {
 		if ($this->isEmpty()) {
 			return false;

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	public function dequeue() {
 		return $this->extract();
 	}
-	public function compare($pri1, $pri2)  { 
+	public function compare($pri1, $pri2) { 
 		if ($pri1 === $pri2) {
 			return 0;
 		}