kakserpom / phpdaemon

lib/Request.php

Doc Comments +3 added lines, -1 removed lines

@@ -50,7 +50,8 @@ 
  	/**
 	 * Output some data
 	 * @param string String to out
-	 * @return boolean Success
+	 * @param string $s
+	 * @return boolean|null Success
 	 */
 	public function out($s, $flush = true) {
 	}
@@ -222,6 +223,7 @@ 
  
 	/**
 	 * Adds new callback called before the request finished
+	 * @param Closure $callback
 	 * @return void
 	 */
 	public function registerShutdownFunction($callback) {

Indentation +9 added lines, -9 removed lines

@@ -48,10 +48,10 @@ 
 	}
  	
  	/**
-	 * Output some data
-	 * @param string String to out
-	 * @return boolean Success
-	 */
+ 	 * Output some data
+ 	 * @param string String to out
+ 	 * @return boolean Success
+ 	 */
 	public function out($s, $flush = true) {
 	}
 	
@@ -195,11 +195,11 @@ 
 	}
 	
 		/**
-	 * Get integer value from the given variable
-	 * @param Reference of variable.
-	 * @param array Optional. Possible values.
-	 * @return string Value.
-	 */
+		 * Get integer value from the given variable
+		 * @param Reference of variable.
+		 * @param array Optional. Possible values.
+		 * @return string Value.
+		 */
 	public static function getInteger(&$var, $values = null) {
 		if (is_string($var) && ctype_digit($var)) {
 			$var = (int) $var;

Spacing +1 added lines, -3 removed lines

@@ -412,9 +412,7 @@
  
 		if (Daemon::$compatMode) {
 			return;
-		}
- 
-		++Daemon::$process->counterGC;
+		}++Daemon::$process->counterGC;
  
 		if (Daemon::$compatMode) {
 			return;

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

Doc Comments +6 added lines

@@ -6,6 +6,9 @@ 
 	public $name;
 	public $key;
 
+	/**
+	 * @param string $name
+	 */
 	public function __construct($path, $segsize, $name, $create = false) {
 		$this->path = $path;
 		$this->segsize = $segsize;
@@ -55,6 +58,9 @@ 
 		} while ($r);
 	}
 
+	/**
+	 * @param string $data
+	 */
 	public function write($data, $offset) {
 		$segno = floor($offset / $this->segsize);
 		if (!isset($this->segments[$segno])) {

Spacing +3 added lines, -3 removed lines

@@ -10,17 +10,17 @@
 		$this->path = $path;
 		$this->segsize = $segsize;
 		$this->name = $name;
-		if ($create	&& !touch($this->path)) {
+		if ($create && !touch($this->path)) {
 			Daemon::log('Couldn\'t touch IPC file \'' . $this->path . '\'.');
 			exit(0);
 		}
 
-		if (($this->key = ftok($this->path,'t')) === false) {
+		if (($this->key = ftok($this->path, 't')) === false) {
 			Daemon::log('Couldn\'t ftok() IPC file \'' . $this->path . '\'.');
 			exit(0);
 		}
 		if (!$this->open(0, $create) && $create) {
-			Daemon::log('Couldn\'t open IPC-'.$this->name.'  shared memory segment (key=' . $this->key . ', segsize=' . $this->segsize . ', uid=' . posix_getuid() . ', path = '.$this->path.').');
+			Daemon::log('Couldn\'t open IPC-' . $this->name . '  shared memory segment (key=' . $this->key . ', segsize=' . $this->segsize . ', uid=' . posix_getuid() . ', path = ' . $this->path . ').');
 			exit(0);
 		}
 	}

lib/Thread.php

Doc Comments +12 added lines, -5 removed lines

@@ -153,7 +153,7 @@ 
 
 	/**
 	 * Starts the process
-	 * @return void
+	 * @return null|integer
 	 */
 	public function start($clearstack = true) {
 		$pid = pcntl_fork();
@@ -205,7 +205,7 @@ 
 	/**
 	 * Sends the signal to parent process
 	 * @param integer Signal's number
-	 * @return void
+	 * @return boolean
 	 */
 	private function backsig($sig) {
 		return posix_kill(posix_getppid(), $sig);
@@ -214,7 +214,7 @@ 
 	/**
 	 * Delays the process execution for the given number of seconds
 	 * @param integer Sleep time in seconds
-	 * @return void
+	 * @return boolean
 	 */
 	public function sleep($s) {
 		static $interval = 0.2;
@@ -274,7 +274,7 @@ 
 	/**
 	 * Terminates the process
 	 * @param boolean Kill?
-	 * @return void
+	 * @return boolean
 	 */
 	public function stop($kill = false) {
 		$this->shutdown = true;
@@ -328,6 +328,7 @@ 
 
 	/**
 	 * Waits until children is alive
+	 * @param boolean $check
 	 * @return void
 	 */
 	protected function waitAll($check) {
@@ -346,6 +347,7 @@ 
 	/**
 	 * Sets a title of the current process
 	 * @param string Title
+	 * @param string $title
 	 * @return void
 	 */
 	protected function setproctitle($title) {
@@ -360,7 +362,7 @@ 
 	 * Waits for signals, with a timeout
 	 * @param int Seconds
 	 * @param int Nanoseconds
-	 * @return void
+	 * @return boolean
 	 */
 	protected function sigwait($sec = 0, $nano = 0.3e9) {
 		$siginfo = NULL;
@@ -382,6 +384,11 @@ 
 
 if (!function_exists('pcntl_sigtimedwait')) {
 	// @todo $signals or Thread::$signals?
+
+	/**
+	 * @param integer $sec
+	 * @param double $nano
+	 */
 	function pcntl_sigtimedwait($signals, $siginfo, $sec, $nano) {
 		pcntl_signal_dispatch();
 

Spacing +2 added lines, -2 removed lines

@@ -92,9 +92,9 @@
 			) {
 				continue;
 			}
-			$ev = Event::signal($this->eventBase, $no, array($this,'eventSighandler'), array($no));
+			$ev = Event::signal($this->eventBase, $no, array($this, 'eventSighandler'), array($no));
 			if (!$ev) {
-				$this->log('Cannot event_set for '.$name.' signal');
+				$this->log('Cannot event_set for ' . $name . ' signal');
 			}
 			$ev->add();
 			$this->sigEvents[$no] = $ev;

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

Doc Comments +4 added lines

@@ -48,6 +48,10 @@
 		$obj = new self($cb, $timeout, $id, $priority);
 		return $obj->id;
 	}
+
+	/**
+	 * @param integer $timeout
+	 */
 	public static function setTimeout($id, $timeout = NULL) {
 		if (isset(Timer::$list[$id])) {
 			Timer::$list[$id]->timeout($timeout);

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 			Timer::$list[$id]->cancel();
 		}
 	}
-	public function timeout($timeout = null)	{
+	public function timeout($timeout = null) {
 		if ($timeout !== null) {
 			$this->lastTimeout = $timeout;
 		}
@@ -74,7 +74,7 @@ 
 	public function cancel() {
 		$this->ev->del();
 	}
-	public function finish(){
+	public function finish() {
 		$this->free();
 	}
 	public function __destruct() {

lib/ValveClient.php

Doc Comments +6 added lines

@@ -19,6 +19,9 @@ 
 	
 	public static $zombie = 0;
 
+	/**
+	 * @param string $name
+	 */
 	public function request($addr, $name, $data,  $cb) {
 		$e = explode(':', $addr);
 		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':'.$e[1] : '') . '/', function($conn) use ($cb, $addr, $data, $name) {
@@ -90,6 +93,9 @@ 
 		$this->request('info', null, $cb);
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function request($name, $data = null, $cb = null) {
 		$packet = "\xFF\xFF\xFF\xFF";
 		if ($name === 'ping') {

Indentation +6 added lines, -6 removed lines

@@ -198,11 +198,11 @@ 
 			$info['secure'] = Binary::getByte($st); 
    		}
    		elseif ($type === ValveClient::S2A_INFO_SOURCE) {
-    		$info['srvaddress'] = Binary::getString($st);
-    		$info['hostname'] = Binary::getString($st);
-    		$info['map'] = Binary::getString($st);
-    		$info['gamedir'] = Binary::getString($st);
-    		$info['gamedescr'] = Binary::getString($st);
+			$info['srvaddress'] = Binary::getString($st);
+			$info['hostname'] = Binary::getString($st);
+			$info['map'] = Binary::getString($st);
+			$info['gamedir'] = Binary::getString($st);
+			$info['gamedescr'] = Binary::getString($st);
 			$info['playersnum'] = Binary::getByte($st);
 			$info['playersmax'] = Binary::getByte($st); 
 			$info['proto'] = Binary::getByte($st);
@@ -218,7 +218,7 @@ 
 				$info['mod_size'] = Binary::getDWord($st);
 				$info['mod_serverside'] = Binary::getByte($st);
 				$info['mod_customdll'] = Binary::getByte($st);
-    		}
+			}
 			$info['secure'] = Binary::getByte($st);
 			$info['botsnum'] = Binary::getByte($st);
 		}

Spacing +8 added lines, -8 removed lines

@@ -19,9 +19,9 @@ 
 	
 	public static $zombie = 0;
 
-	public function request($addr, $name, $data,  $cb) {
+	public function request($addr, $name, $data, $cb) {
 		$e = explode(':', $addr);
-		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':'.$e[1] : '') . '/', function($conn) use ($cb, $addr, $data, $name) {
+		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':' . $e[1] : '') . '/', function($conn) use ($cb, $addr, $data, $name) {
 			if (!$conn->connected) {
 				call_user_func($cb, $conn, false);
 				return;
@@ -33,13 +33,13 @@ 
 
 	public function ping($addr, $cb) {
 		$e = explode(':', $addr);
-		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':'.$e[1] : '') . '/ping', function($conn) use ($cb) {
+		$this->getConnection('valve://[udp:' . $e[0] . ']' . (isset($e[1]) ? ':' . $e[1] : '') . '/ping', function($conn) use ($cb) {
 			if (!$conn->connected) {
 				call_user_func($cb, $conn, false);
 				return;
 			}
 			$mt = microtime(true);
-			$conn->request('ping', null, function ($conn, $success) use ($mt, $cb) {
+			$conn->request('ping', null, function($conn, $success) use ($mt, $cb) {
 				call_user_func($cb, $conn, $success ? (microtime(true) - $mt) : false);
 			});
 		});
@@ -50,7 +50,7 @@ 
 	}
 
 	public function requestPlayers($addr, $cb) {
-		$this->request($addr, 'challenge', null, function ($conn, $result) use ($cb) {
+		$this->request($addr, 'challenge', null, function($conn, $result) use ($cb) {
 			if (is_array($result)) {
 				$cb($conn, $result);
 				return;
@@ -77,7 +77,7 @@ 
 	public $timeout = 1;
 
 	public function requestPlayers($cb) {
-		$this->request('challenge', null, function ($conn, $result) use ($cb) {
+		$this->request('challenge', null, function($conn, $result) use ($cb) {
 			if (is_array($result)) {
 				call_user_func($cb, $conn, $result);
 				return;
@@ -159,7 +159,7 @@ 
 		for ($i = 1; $i < $playersn; ++$i) {
 			$n = Binary::getByte($st);
 			$name = Binary::getString($st);
-			$score = Binary::getDWord($st,TRUE);
+			$score = Binary::getDWord($st, TRUE);
 			if (strlen($st) === 0) {
 				break;
 			}
@@ -214,7 +214,7 @@ 
 				$info['mod_website'] = Binary::getString($st);
 				$info['mod_downloadserver'] = Binary::getString($st);
 				$info['mod_unused'] = Binary::getString($st);
-				$info['mod_version'] = Binary::getDWord($st,TRUE);
+				$info['mod_version'] = Binary::getDWord($st, TRUE);
 				$info['mod_size'] = Binary::getDWord($st);
 				$info['mod_serverside'] = Binary::getByte($st);
 				$info['mod_customdll'] = Binary::getByte($st);

Braces +5 added lines, -10 removed lines

@@ -134,18 +134,14 @@ 
 		$type = Binary::getChar($this->buf);
 		if (($type === ValveClient::S2A_INFO) || ($type === ValveClient::S2A_INFO_SOURCE)) {
 			$result = $this->parseInfo($this->buf, $type);
-		}
-		elseif ($type === ValveClient::S2A_PLAYER) {
+		} elseif ($type === ValveClient::S2A_PLAYER) {
 			$result = $this->parsePlayers($this->buf);
-		}
-		elseif ($type === ValveClient::S2A_SERVERQUERY_GETCHALLENGE) {
+		} elseif ($type === ValveClient::S2A_SERVERQUERY_GETCHALLENGE) {
 			$result = binarySubstr($this->buf, 0, 4);
 			$this->buf = binarySubstr($this->buf, 5);
-		}
-		elseif ($type === ValveClient::S2A_PONG) {
+		} elseif ($type === ValveClient::S2A_PONG) {
 			$result = true;
-		}
-		else {
+		} else {
 			$result = null;
 		}
 		$this->onResponse->executeOne($this, $result);
@@ -196,8 +192,7 @@ 
 			$info['serveros'] = Binary::getChar($st); 
 			$info['passworded'] = Binary::getByte($st); 
 			$info['secure'] = Binary::getByte($st); 
-   		}
-   		elseif ($type === ValveClient::S2A_INFO_SOURCE) {
+   		} elseif ($type === ValveClient::S2A_INFO_SOURCE) {
     		$info['srvaddress'] = Binary::getString($st);
     		$info['hostname'] = Binary::getString($st);
     		$info['map'] = Binary::getString($st);

lib/WebSocketProtocol.php

Doc Comments +7 added lines, -1 removed lines

@@ -12,10 +12,16 @@ 
 	const STRING = NULL;
 	const BINARY = NULL;
 	
+	/**
+	 * @param WebSocketServerConnection $connection
+	 */
 	public function __construct($connection) {
 		$this->connection = $connection;
 	}
 
+	/**
+	 * @return integer
+	 */
 	public function getFrameType($type) {
 		if (is_int($type)) {
 			return $type;
@@ -45,7 +51,7 @@ 
     /**
      * Returns handshaked data for reply
 	 * @param string Received data (no use in this class)
-     * @return string Handshaked data
+     * @return boolean Handshaked data
      */
 
     public function getHandshakeReply($data) {

Indentation +11 added lines, -11 removed lines

@@ -23,11 +23,11 @@ 
 		if ($type === null) {
 			$type = 'STRING';
 		}
-	    $frametype = @constant($a = get_class($this) .'::' . $type) ;
-	    if ($frametype === null) {
-	        Daemon::log(__METHOD__ . ' : Undefined frametype "' . $type . '"') ;
-	    }
-	    return $frametype ; 
+		$frametype = @constant($a = get_class($this) .'::' . $type) ;
+		if ($frametype === null) {
+			Daemon::log(__METHOD__ . ' : Undefined frametype "' . $type . '"') ;
+		}
+		return $frametype ; 
 	}
 	
 	public function onHandshake() {
@@ -42,14 +42,14 @@ 
 		$this->connection->buf = "" ;
 	}
 	
-    /**
-     * Returns handshaked data for reply
+	/**
+	 * Returns handshaked data for reply
 	 * @param string Received data (no use in this class)
-     * @return string Handshaked data
-     */
+	 * @return string Handshaked data
+	 */
 
-    public function getHandshakeReply($data) {
+	public function getHandshakeReply($data) {
 		return false;
-    }
+	}
 
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@ 
 		if ($type === null) {
 			$type = 'STRING';
 		}
-	    $frametype = @constant($a = get_class($this) .'::' . $type) ;
+	    $frametype = @constant($a = get_class($this) . '::' . $type);
 	    if ($frametype === null) {
-	        Daemon::log(__METHOD__ . ' : Undefined frametype "' . $type . '"') ;
+	        Daemon::log(__METHOD__ . ' : Undefined frametype "' . $type . '"');
 	    }
-	    return $frametype ; 
+	    return $frametype; 
 	}
 	
 	public function onHandshake() {
@@ -35,11 +35,11 @@ 
 	}
 
 	public function sendFrame($data, $type) {
-		$this->connection->write($this->encodeFrame($data, $type)) ;
+		$this->connection->write($this->encodeFrame($data, $type));
 	}
 
 	public function onRead() {
-		$this->connection->buf = "" ;
+		$this->connection->buf = "";
 	}
 	
     /**

lib/WebSocketProtocolV13.php

Doc Comments +13 added lines

@@ -16,6 +16,9 @@ 
 	public $opcodes;
 	public $outgoingCompression = 0;
 		
+	/**
+	 * @param WebSocketServerConnection $connection
+	 */
 	public function __construct($connection) {
 		$this->connection = $connection;
 		$this->opcodes = array(
@@ -95,6 +98,9 @@ 
 		return $this->encodeFragment($data, $type, $fin, $rsv1, $rsv2, $rsv3);
     }
 
+	/**
+	 * @param string $type
+	 */
 	protected function encodeFragment($data, $type, $fin = 1, $rsv1 = 0, $rsv2 = 0, $rsv3 = 0) {
         $mask =	chr(rand(0, 0xFF)) .
  						chr(rand(0, 0xFF)) . 
@@ -132,6 +138,12 @@ 
 		}
 		return $packet;
 	}
+
+	/**
+	 * @param string $mask
+	 *
+	 * @return string
+	 */
 	public function mask ($data, $mask) {
    		for ($i = 0, $l = strlen($data), $ml = strlen($mask); $i < $l; $i++) {
 	     	$data[$i] = $data[$i] ^ $mask[$i % $ml] ;
@@ -142,6 +154,7 @@ 
 	 * Converts binary string to integer
 	 * @param string Binary string
 	 * @param boolean Optional. Little endian. Default value - false.
+	 * @param string $str
 	 * @return integer Resulting integer
 	 */
 	public function bytes2int($str, $l = FALSE)

Indentation +66 added lines, -66 removed lines

@@ -29,53 +29,53 @@ 
 	}
 
 	public function onHandshake(){
-        if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_KEY'])	|| !isset($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'])) {
+		if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_KEY'])	|| !isset($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'])) {
 			return false;
 		}
 		if ($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'] != '13' && $this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'] != '8') {
-            return false;
-        }
+			return false;
+		}
 
 		return true;
 	}
 
-    /**
-     * Returns handshaked data for reply
+	/**
+	 * Returns handshaked data for reply
 	 * @param string Received data (no use in this class)
-     * @return string Handshaked data
-     */
+	 * @return string Handshaked data
+	 */
 
-    public function getHandshakeReply($data) {
-        if ($this->onHandshake()) {
-	    	if (isset($this->connection->server['HTTP_ORIGIN'])) {
+	public function getHandshakeReply($data) {
+		if ($this->onHandshake()) {
+			if (isset($this->connection->server['HTTP_ORIGIN'])) {
 				$this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] = $this->connection->server['HTTP_ORIGIN'];
 			}
-            if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN']))
+			if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN']))
 			{
-                $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] = '' ;
-            }
-            $reply = "HTTP/1.1 101 Switching Protocols\r\n"
-                . "Upgrade: WebSocket\r\n"
-                . "connection: Upgrade\r\n"
-                . "Date: ".date('r')."\r\n"
-                . "Sec-WebSocket-Origin: " . $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] . "\r\n"
-                . "Sec-WebSocket-Location: ws://" . $this->connection->server['HTTP_HOST'] . $this->connection->server['REQUEST_URI'] . "\r\n"
-                . "Sec-WebSocket-Accept: " . base64_encode(sha1(trim($this->connection->server['HTTP_SEC_WEBSOCKET_KEY']) . "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", true)) . "\r\n";
+				$this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] = '' ;
+			}
+			$reply = "HTTP/1.1 101 Switching Protocols\r\n"
+				. "Upgrade: WebSocket\r\n"
+				. "connection: Upgrade\r\n"
+				. "Date: ".date('r')."\r\n"
+				. "Sec-WebSocket-Origin: " . $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] . "\r\n"
+				. "Sec-WebSocket-Location: ws://" . $this->connection->server['HTTP_HOST'] . $this->connection->server['REQUEST_URI'] . "\r\n"
+				. "Sec-WebSocket-Accept: " . base64_encode(sha1(trim($this->connection->server['HTTP_SEC_WEBSOCKET_KEY']) . "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", true)) . "\r\n";
 
-            if (isset($this->connection->server['HTTP_SEC_WEBSOCKET_PROTOCOL'])) {
-                $reply .= "Sec-WebSocket-Protocol: " . $this->connection->server['HTTP_SEC_WEBSOCKET_PROTOCOL'] . "\r\n";
-            }
+			if (isset($this->connection->server['HTTP_SEC_WEBSOCKET_PROTOCOL'])) {
+				$reply .= "Sec-WebSocket-Protocol: " . $this->connection->server['HTTP_SEC_WEBSOCKET_PROTOCOL'] . "\r\n";
+			}
 
 			if ($this->connection->pool->config->expose->value) {
 				$reply .= 'X-Powered-By: phpDaemon/' . Daemon::$version . "\r\n";
 			}
 
-            $reply .= "\r\n";
-            return $reply ;
-        }
+			$reply .= "\r\n";
+			return $reply ;
+		}
 
 		return false;
-    }
+	}
 
 	/**
 	 * Data encoding, according to related IETF draft
@@ -83,7 +83,7 @@ 
 	 * @see http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10#page-16
 	 */
 
-    protected function encodeFrame($data, $type = 'STRING') {
+	protected function encodeFrame($data, $type = 'STRING') {
 		$fin = 1;
 		$rsv1 = 0;
 		$rsv2 = 0;
@@ -93,40 +93,40 @@ 
 			$rsv1 = 1;
 		}
 		return $this->encodeFragment($data, $type, $fin, $rsv1, $rsv2, $rsv3);
-    }
+	}
 
 	protected function encodeFragment($data, $type, $fin = 1, $rsv1 = 0, $rsv2 = 0, $rsv3 = 0) {
-        $mask =	chr(rand(0, 0xFF)) .
+		$mask =	chr(rand(0, 0xFF)) .
  						chr(rand(0, 0xFF)) . 
 						chr(rand(0, 0xFF)) . 
 						chr(rand(0, 0xFF)) ;
 		$packet = chr(bindec($fin . $rsv1 . $rsv2 . $rsv3 . str_pad(decbin($this->getFrameType($type)), 4, '0', STR_PAD_LEFT)));
-        $dataLength = strlen($data);
+		$dataLength = strlen($data);
 		$isMasked = false;
 		$isMaskedInt = $isMasked ? 128 : 0;
-        if ($dataLength <= 125)
-        {
-            $packet .= chr($dataLength + $isMaskedInt);
-        }
-        elseif ($dataLength <= 65535)
-        {
-            $packet .=	chr(126 + $isMaskedInt) . // 126 + 128
-            			chr($dataLength >> 8) .
-            			chr($dataLength & 0xFF);
-        }
-        else {
-            $packet .=	chr(127 + $isMaskedInt) . // 127 + 128
-             			chr($dataLength >> 56) .
-           				chr($dataLength >> 48) .
-            			chr($dataLength >> 40) .
-             			chr($dataLength >> 32) .
-             			chr($dataLength >> 24) .
-             			chr($dataLength >> 16) .
-               			chr($dataLength >>  8) .
-             			chr($dataLength & 0xFF);
-        }
-        if ($isMasked) { 
-        	$packet .=	$mask . $this->mask($data, $mask);
+		if ($dataLength <= 125)
+		{
+			$packet .= chr($dataLength + $isMaskedInt);
+		}
+		elseif ($dataLength <= 65535)
+		{
+			$packet .=	chr(126 + $isMaskedInt) . // 126 + 128
+						chr($dataLength >> 8) .
+						chr($dataLength & 0xFF);
+		}
+		else {
+			$packet .=	chr(127 + $isMaskedInt) . // 127 + 128
+			 			chr($dataLength >> 56) .
+		   				chr($dataLength >> 48) .
+						chr($dataLength >> 40) .
+			 			chr($dataLength >> 32) .
+			 			chr($dataLength >> 24) .
+			 			chr($dataLength >> 16) .
+			   			chr($dataLength >>  8) .
+			 			chr($dataLength & 0xFF);
+		}
+		if ($isMasked) { 
+			$packet .=	$mask . $this->mask($data, $mask);
 		} else {
  			$packet .= $data;
 		}
@@ -134,8 +134,8 @@ 
 	}
 	public function mask ($data, $mask) {
    		for ($i = 0, $l = strlen($data), $ml = strlen($mask); $i < $l; $i++) {
-	     	$data[$i] = $data[$i] ^ $mask[$i % $ml] ;
-	     }
+		 	$data[$i] = $data[$i] ^ $mask[$i % $ml] ;
+		 }
 		return $data;
 	}
 	/**
@@ -193,7 +193,7 @@ 
 	 * @see http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10#page-16
 	 */
 
-    public function onRead() {
+	public function onRead() {
 		$data = '';
 		while ($this->connection && (($buflen = strlen($this->connection->buf)) >= 1)) {
 			$p = 0; // offset
@@ -204,15 +204,15 @@ 
 			$rsv3 = (bool) $firstBits[3];
 			$opcode = (int) bindec(substr($firstBits, 4, 4));
 			if ($opcode === 0x8) { // CLOSE
-        		$this->connection->finish();
-            	return;
+				$this->connection->finish();
+				return;
 			}
 			$opcodeName = $this->opcodes[$opcode];
 			$second = ord(binarySubstr($this->connection->buf, $p++, 1)); // second byte integer (masked, payload length)
 			$fin =	(bool) ($first >> 7);
-        	$isMasked   = (bool) ($second >> 7);
-        	$dataLength = $second & 0x7f;
-          	if ($dataLength === 0x7e) { // 2 bytes-length
+			$isMasked   = (bool) ($second >> 7);
+			$dataLength = $second & 0x7f;
+		  	if ($dataLength === 0x7e) { // 2 bytes-length
 				if ($buflen < $p + 2) {
 					return; // not enough data yet
 				}
@@ -223,9 +223,9 @@ 
 				if ($buflen < $p + 4) {
 					return; // not enough data yet
 				}
-            	$dataLength = $this->bytes2int(binarySubstr($this->connection->buf, $p, 4));
-            	$p += 4;
-            }
+				$dataLength = $this->bytes2int(binarySubstr($this->connection->buf, $p, 4));
+				$p += 4;
+			}
 			if ($this->connection->pool->maxAllowedPacket <= $dataLength) {
 				// Too big packet
 				$this->connection->finish();
@@ -262,5 +262,5 @@ 
 				}
 			}
 		}
-    }
+	}
 }
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -12,7 +12,7 @@ 
 	const BINARY = 0x2;
 	const CONNCLOSE = 0x8;
 	const PING = 0x9;
-	const PONG = 0xA ;
+	const PONG = 0xA;
 	public $opcodes;
 	public $outgoingCompression = 0;
 		
@@ -28,8 +28,8 @@ 
 		);
 	}
 
-	public function onHandshake(){
-        if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_KEY'])	|| !isset($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'])) {
+	public function onHandshake() {
+        if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_KEY']) || !isset($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'])) {
 			return false;
 		}
 		if ($this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'] != '13' && $this->connection->server['HTTP_SEC_WEBSOCKET_VERSION'] != '8') {
@@ -52,12 +52,12 @@ 
 			}
             if (!isset($this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN']))
 			{
-                $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] = '' ;
+                $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] = '';
             }
             $reply = "HTTP/1.1 101 Switching Protocols\r\n"
                 . "Upgrade: WebSocket\r\n"
                 . "connection: Upgrade\r\n"
-                . "Date: ".date('r')."\r\n"
+                . "Date: " . date('r') . "\r\n"
                 . "Sec-WebSocket-Origin: " . $this->connection->server['HTTP_SEC_WEBSOCKET_ORIGIN'] . "\r\n"
                 . "Sec-WebSocket-Location: ws://" . $this->connection->server['HTTP_HOST'] . $this->connection->server['REQUEST_URI'] . "\r\n"
                 . "Sec-WebSocket-Accept: " . base64_encode(sha1(trim($this->connection->server['HTTP_SEC_WEBSOCKET_KEY']) . "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", true)) . "\r\n";
@@ -71,7 +71,7 @@ 
 			}
 
             $reply .= "\r\n";
-            return $reply ;
+            return $reply;
         }
 
 		return false;
@@ -96,10 +96,10 @@ 
     }
 
 	protected function encodeFragment($data, $type, $fin = 1, $rsv1 = 0, $rsv2 = 0, $rsv3 = 0) {
-        $mask =	chr(rand(0, 0xFF)) .
+        $mask = chr(rand(0, 0xFF)) .
  						chr(rand(0, 0xFF)) . 
 						chr(rand(0, 0xFF)) . 
-						chr(rand(0, 0xFF)) ;
+						chr(rand(0, 0xFF));
 		$packet = chr(bindec($fin . $rsv1 . $rsv2 . $rsv3 . str_pad(decbin($this->getFrameType($type)), 4, '0', STR_PAD_LEFT)));
         $dataLength = strlen($data);
 		$isMasked = false;
@@ -110,31 +110,31 @@ 
         }
         elseif ($dataLength <= 65535)
         {
-            $packet .=	chr(126 + $isMaskedInt) . // 126 + 128
+            $packet .= chr(126 + $isMaskedInt) . // 126 + 128
             			chr($dataLength >> 8) .
             			chr($dataLength & 0xFF);
         }
         else {
-            $packet .=	chr(127 + $isMaskedInt) . // 127 + 128
+            $packet .= chr(127 + $isMaskedInt) . // 127 + 128
              			chr($dataLength >> 56) .
            				chr($dataLength >> 48) .
             			chr($dataLength >> 40) .
              			chr($dataLength >> 32) .
              			chr($dataLength >> 24) .
              			chr($dataLength >> 16) .
-               			chr($dataLength >>  8) .
+               			chr($dataLength >> 8) .
              			chr($dataLength & 0xFF);
         }
         if ($isMasked) { 
-        	$packet .=	$mask . $this->mask($data, $mask);
+        	$packet .= $mask . $this->mask($data, $mask);
 		} else {
  			$packet .= $data;
 		}
 		return $packet;
 	}
-	public function mask ($data, $mask) {
+	public function mask($data, $mask) {
    		for ($i = 0, $l = strlen($data), $ml = strlen($mask); $i < $l; $i++) {
-	     	$data[$i] = $data[$i] ^ $mask[$i % $ml] ;
+	     	$data[$i] = $data[$i] ^ $mask[$i % $ml];
 	     }
 		return $data;
 	}
@@ -153,7 +153,7 @@ 
 		$dec = 0;
 		$len = strlen($str);
 		
-		for($i = 0; $i < $len; ++$i) {
+		for ($i = 0; $i < $len; ++$i) {
 			$dec += ord(binarySubstr($str, $i, 1)) * pow(0x100, $len - $i - 1);
 		}
 		
@@ -172,7 +172,7 @@ 
 
 		if ($len === NULL) {
 			if (strlen($hexstr) % 2) {
-				$hexstr = "0".$hexstr;
+				$hexstr = "0" . $hexstr;
 			}
 		} else {
 			$hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
@@ -181,7 +181,7 @@ 
 		$bytes = strlen($hexstr) / 2;
 		$bin = '';
 		
-		for($i = 0; $i < $bytes; ++$i) {
+		for ($i = 0; $i < $bytes; ++$i) {
 			$bin .= chr(hexdec(substr($hexstr, $i * 2, 2)));
 		}
 		
@@ -209,7 +209,7 @@ 
 			}
 			$opcodeName = $this->opcodes[$opcode];
 			$second = ord(binarySubstr($this->connection->buf, $p++, 1)); // second byte integer (masked, payload length)
-			$fin =	(bool) ($first >> 7);
+			$fin = (bool) ($first >> 7);
         	$isMasked   = (bool) ($second >> 7);
         	$dataLength = $second & 0x7f;
           	if ($dataLength === 0x7e) { // 2 bytes-length

Braces +3 added lines, -6 removed lines

@@ -107,14 +107,12 @@ 
         if ($dataLength <= 125)
         {
             $packet .= chr($dataLength + $isMaskedInt);
-        }
-        elseif ($dataLength <= 65535)
+        } elseif ($dataLength <= 65535)
         {
             $packet .=	chr(126 + $isMaskedInt) . // 126 + 128
             			chr($dataLength >> 8) .
             			chr($dataLength & 0xFF);
-        }
-        else {
+        } else {
             $packet .=	chr(127 + $isMaskedInt) . // 127 + 128
              			chr($dataLength >> 56) .
            				chr($dataLength >> 48) .
@@ -218,8 +216,7 @@ 
 				}
 				$dataLength = $this->bytes2int(binarySubstr($this->connection->buf, $p, 2), false);
 				$p += 2;
-			}
-			elseif ($dataLength === 0x7f) { // 4 bytes-length
+			} elseif ($dataLength === 0x7f) { // 4 bytes-length
 				if ($buflen < $p + 4) {
 					return; // not enough data yet
 				}

lib/WebSocketServerConnection.php

Doc Comments +2 added lines

@@ -151,6 +151,7 @@ 
 
 	/**
 	 * Called when we're going to handshake.
+	 * @param string $data
 	 * @return boolean Handshake status
 	 */
 
@@ -197,6 +198,7 @@ 
 	/**
 	 * Called when new data received.
 	 * @param string New received data.
+	 * @param string $buf
 	 * @return void
 	 */
 

Indentation +20 added lines, -20 removed lines

@@ -41,16 +41,16 @@ 
 			return FALSE;
 		}
 
-        if (!isset($this->protocol))
-        {
-            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client ' . $this->addr) ;
-            return FALSE ;
-        }
+		if (!isset($this->protocol))
+		{
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client ' . $this->addr) ;
+			return FALSE ;
+		}
 
-        $this->protocol->sendFrame($data, $type) ;
-        if ($cb) {
-        	$this->onWriteOnce($cb);
-        }
+		$this->protocol->sendFrame($data, $type) ;
+		if ($cb) {
+			$this->onWriteOnce($cb);
+		}
 		return TRUE;
 	}
 
@@ -124,10 +124,10 @@ 
 			return false;
 		}
 
-        if (!isset($this->protocol)) {
-            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"') ;
-            return FALSE ;
-        }
+		if (!isset($this->protocol)) {
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"') ;
+			return FALSE ;
+		}
 
 		if ($this->protocol->onHandshake() === FALSE) {
 			return FALSE ;
@@ -305,13 +305,13 @@ 
 		}
 		if ($this->state === self::STATE_HANDSHAKED)
 		{
-	        if (!isset($this->protocol))
-    	    {
-        	    Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"');
-            	$this->finish();
-            	return;
-	        }
-	        $this->protocol->onRead();
+			if (!isset($this->protocol))
+			{
+				Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"');
+				$this->finish();
+				return;
+			}
+			$this->protocol->onRead();
 		}
 	}
 }

Spacing +20 added lines, -20 removed lines

@@ -43,11 +43,11 @@ 
 
         if (!isset($this->protocol))
         {
-            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client ' . $this->addr) ;
-            return FALSE ;
+            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client ' . $this->addr);
+            return FALSE;
         }
 
-        $this->protocol->sendFrame($data, $type) ;
+        $this->protocol->sendFrame($data, $type);
         if ($cb) {
         	$this->onWriteOnce($cb);
         }
@@ -93,7 +93,7 @@ 
 	public function onHandshake() {
 		
 		$e = explode('/', $this->server['DOCUMENT_URI']);
-		$routeName = isset($e[1])?$e[1]:'';
+		$routeName = isset($e[1]) ? $e[1] : '';
 
 		if (!isset($this->pool->routes[$routeName])) {
 			if (Daemon::$config->logerrors->value) {
@@ -125,12 +125,12 @@ 
 		}
 
         if (!isset($this->protocol)) {
-            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"') ;
-            return FALSE ;
+            Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"');
+            return FALSE;
         }
 
 		if ($this->protocol->onHandshake() === FALSE) {
-			return FALSE ;
+			return FALSE;
 		}		
 
 		return TRUE;
@@ -157,14 +157,14 @@ 
 	public function handshake($data) {
 
 		if (!$this->onHandshake()) {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot handshake session for client "' . $this->addr . '"') ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot handshake session for client "' . $this->addr . '"');
 			$this->finish();
 			return false;
 		}
 
 		if (!isset($this->protocol)) {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"') ;
-			$this->finish() ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Cannot find session-related websocket protocol for client "' . $this->addr . '"');
+			$this->finish();
 			return false;
 		}
 
@@ -176,17 +176,17 @@ 
 		}
 
 		if (!$handshake) {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake protocol failure for client "' . $this->addr . '"') ;
-			$this->finish() ;
-			return false ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake protocol failure for client "' . $this->addr . '"');
+			$this->finish();
+			return false;
 		}
 		if ($this->write($handshake)) {
-			if (is_callable(array($this->upstream, 'onHandshake')))	{
+			if (is_callable(array($this->upstream, 'onHandshake'))) {
 				$this->upstream->onHandshake();
 			}
 		}
 		else {
-			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake send failure for client "' . $this->addr . '"') ;
+			Daemon::$process->log(get_class($this) . '::' . __METHOD__ . ' : Handshake send failure for client "' . $this->addr . '"');
 			$this->finish();
 			return false;
 		}
@@ -202,7 +202,7 @@ 
 
 	public function stdin($buf) {
 		$this->buf .= $buf;
-		if ($this->state === self::STATE_ROOT)	{
+		if ($this->state === self::STATE_ROOT) {
 			if (strpos($this->buf, "<policy-file-request/>\x00") !== false) {
 				$FP = FlashPolicyServer::getInstance();
 				if ($FP && $FP->policyData) {
@@ -246,14 +246,14 @@ 
 					// ----------------------------------------------------------
 					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) ;
+							$this->protocol = new WebSocketProtocolV13($this);
 						}
 						elseif ($this->server['HTTP_SEC_WEBSOCKET_VERSION'] == '13') { // newest protocol
 							$this->protocol = new WebSocketProtocolV13($this);
 						}
 						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 . '"') ;
+							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;
@@ -263,7 +263,7 @@ 
 						$this->protocol = new WebSocketProtocolVE($this);
 					}
 					else {	// Defaulting to HIXIE (Safari5 and many non-browser clients...)
-						$this->protocol = new WebSocketProtocolV0($this) ;
+						$this->protocol = new WebSocketProtocolV0($this);
 					}
 					// ----------------------------------------------------------
 					// End of protocol discovery
@@ -283,7 +283,7 @@ 
 					$this->server['SCRIPT_NAME'] = $this->server['DOCUMENT_URI'] = isset($u['path']) ? $u['path'] : '/';
 					$this->server['SERVER_PROTOCOL'] = isset($e[2]) ? trim($e[2]) : '';
 
-					list($this->server['REMOTE_ADDR'],$this->server['REMOTE_PORT']) = explode(':', $this->addr);
+					list($this->server['REMOTE_ADDR'], $this->server['REMOTE_PORT']) = explode(':', $this->addr);
 				}
 				else
 				{

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

Doc Comments +5 added lines, -3 removed lines

@@ -17,6 +17,9 @@ 
 		xml_set_character_data_handler($this->parser, 'charXML');
 	}
 
+	/**
+	 * @param string $ns
+	 */
 	public function setDefaultNS($ns) {
 		$this->default_ns = $ns;
 	}
@@ -164,8 +167,7 @@ 
 	 * Add ID Handler
 	 *
 	 * @param integer $id
-	 * @param string  $pointer
-	 * @param string  $obj
+	 * @param Closure $cb
 	 */
 	public function addIdHandler($id, $cb) {
 		if ($cb === null) {
@@ -196,8 +198,8 @@ 
 	 * Add XPath Handler
 	 *
 	 * @param string $xpath
-	 * @param string $pointer
 	 * @param
+	 * @param Closure $cb
 	 */
 	public function addXPathHandler($xpath, $cb, $obj = null) {
 		if (preg_match_all("/\(?{[^\}]+}\)?(\/?)[^\/]+/", $xpath, $regs)) {

Indentation +4 added lines, -4 removed lines

@@ -142,10 +142,10 @@
 
 
 /**
-	 * Get next ID
-	 *
-	 * @return integer
-	 */
+ * Get next ID
+ *
+ * @return integer
+ */
 	public function getId() {
 		$this->lastid++;
 		return $this->lastid;

Spacing +27 added lines, -27 removed lines

@@ -50,24 +50,24 @@ 
 			$this->current_ns[$this->xml_depth] = $attr['XMLNS'];
 		} else {
 			$this->current_ns[$this->xml_depth] = $this->current_ns[$this->xml_depth - 1];
-			if(!$this->current_ns[$this->xml_depth]) $this->current_ns[$this->xml_depth] = $this->default_ns;
+			if (!$this->current_ns[$this->xml_depth]) $this->current_ns[$this->xml_depth] = $this->default_ns;
 		}
 		$ns = $this->current_ns[$this->xml_depth];
-		foreach($attr as $key => $value) {
-			if(strstr($key, ':')) {
+		foreach ($attr as $key => $value) {
+			if (strstr($key, ':')) {
 				$key = explode(':', $key);
 				$key = $key[1];
 				$this->ns_map[$key] = $value;
 			}
 		}
-		if(!strstr($name, ":") === false)
+		if (!strstr($name, ":") === false)
 		{
 			$name = explode(':', $name);
 			$ns = $this->ns_map[$name[0]];
 			$name = $name[1];
 		}
 		$obj = new XMLStream_Object($name, $ns, $attr);
-		if($this->xml_depth > 1) {
+		if ($this->xml_depth > 1) {
 			$this->xmlobj[$this->xml_depth - 1]->subs[] = $obj;
 		}
 		$this->xmlobj[$this->xml_depth] = $obj;
@@ -84,14 +84,14 @@ 
 	public function endXML($parser, $name) {
 		--$this->xml_depth;
 		if ($this->xml_depth == 1) {
-			foreach($this->xpathhandlers as $handler) {
+			foreach ($this->xpathhandlers as $handler) {
 				if (is_array($this->xmlobj) && array_key_exists(2, $this->xmlobj)) {
 					$searchxml = $this->xmlobj[2];
 					$nstag = array_shift($handler[0]);
 					if (($nstag[0] == null or $searchxml->ns == $nstag[0]) and ($nstag[1] == "*" or $nstag[1] == $searchxml->name)) {
-						foreach($handler[0] as $nstag) {
-							if ($searchxml !== null and $searchxml->hasSub($nstag[1], $ns=$nstag[0])) {
-								$searchxml = $searchxml->sub($nstag[1], $ns=$nstag[0]);
+						foreach ($handler[0] as $nstag) {
+							if ($searchxml !== null and $searchxml->hasSub($nstag[1], $ns = $nstag[0])) {
+								$searchxml = $searchxml->sub($nstag[1], $ns = $nstag[0]);
 							} else {
 								$searchxml = null;
 								break;
@@ -106,23 +106,23 @@ 
 					}
 				}
 			}
-			foreach($this->idhandlers as $id => $handler) {
-				if(array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
+			foreach ($this->idhandlers as $id => $handler) {
+				if (array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
 					call_user_func($handler, $this->xmlobj[2]);
 					#id handlers are only used once
 					unset($this->idhandlers[$id]);
 					break;
 				}
 			}
-			if(is_array($this->xmlobj)) {
+			if (is_array($this->xmlobj)) {
 				$this->xmlobj = array_slice($this->xmlobj, 0, 1);
-				if(isset($this->xmlobj[0]) && $this->xmlobj[0] instanceof XMLStream_Object) {
+				if (isset($this->xmlobj[0]) && $this->xmlobj[0] instanceof XMLStream_Object) {
 					$this->xmlobj[0]->subs = null;
 				}
 			}
 			unset($this->xmlobj[2]);
 		}
-		if($this->xml_depth == 0) {
+		if ($this->xml_depth == 0) {
 			$this->event('streamEnd');
 		}
 	}
@@ -135,7 +135,7 @@ 
 	 * @param string   $data
 	 */
 	public function charXML($parser, $data) {
-		if(array_key_exists($this->xml_depth, $this->xmlobj)) {
+		if (array_key_exists($this->xml_depth, $this->xmlobj)) {
 			$this->xmlobj[$this->xml_depth]->data .= $data;
 		}
 	}
@@ -156,7 +156,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function useSSL($use=true) {
+	public function useSSL($use = true) {
 		$this->use_ssl = $use;
 	}
 
@@ -205,7 +205,7 @@ 
 		} else {
 			$ns_tags = array($xpath);
 		}
-		foreach($ns_tags as $ns_tag) {
+		foreach ($ns_tags as $ns_tag) {
 			list($l, $r) = explode("}", $ns_tag);
 			if ($r != null) {
 				$xpart = array(substr($l, 1), $r);
@@ -267,8 +267,8 @@ 
 	public function __construct($name, $ns = '', $attrs = array(), $data = '') {
 		$this->name = strtolower($name);
 		$this->ns   = $ns;
-		if(is_array($attrs) && count($attrs)) {
-			foreach($attrs as $key => $value) {
+		if (is_array($attrs) && count($attrs)) {
+			foreach ($attrs as $key => $value) {
 				$this->attrs[strtolower($key)] = $value;
 			}
 		}
@@ -282,7 +282,7 @@ 
 	 */
 	public function printObj($depth = 0) {
 		$s = str_repeat("\t", $depth) . $this->name . " " . $this->ns . ' ' . $this->data . "\n";
-		foreach($this->subs as $sub) {
+		foreach ($this->subs as $sub) {
 			$s .= $sub->printObj($depth + 1);
 		}
 		return $s;
@@ -295,14 +295,14 @@ 
 	 */
 	public function toString($str = '') {
 		$str .= "<{$this->name} xmlns='{$this->ns}' ";
-		foreach($this->attrs as $key => $value) {
-			if($key != 'xmlns') {
+		foreach ($this->attrs as $key => $value) {
+			if ($key != 'xmlns') {
 				$value = htmlspecialchars($value);
 				$str .= "$key='$value' ";
 			}
 		}
 		$str .= ">";
-		foreach($this->subs as $sub) {
+		foreach ($this->subs as $sub) {
 			$str .= $sub->toString();
 		}
 		$body = htmlspecialchars($this->data);
@@ -317,8 +317,8 @@ 
 	 * @return boolean
 	 */
 	public function hasSub($name, $ns = null) {
-		foreach($this->subs as $sub) {
-			if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true;
+		foreach ($this->subs as $sub) {
+			if (($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true;
 		}
 		return false;
 	}
@@ -332,8 +332,8 @@ 
 	 */
 	public function sub($name, $attrs = null, $ns = null) {
 		#TODO attrs is ignored
-		foreach($this->subs as $sub) {
-			if($sub->name == $name and ($ns == null or $sub->ns == $ns)) {
+		foreach ($this->subs as $sub) {
+			if ($sub->name == $name and ($ns == null or $sub->ns == $ns)) {
 				return $sub;
 			}
 		}

Braces +6 added lines, -2 removed lines

@@ -50,7 +50,9 @@ 
 			$this->current_ns[$this->xml_depth] = $attr['XMLNS'];
 		} else {
 			$this->current_ns[$this->xml_depth] = $this->current_ns[$this->xml_depth - 1];
-			if(!$this->current_ns[$this->xml_depth]) $this->current_ns[$this->xml_depth] = $this->default_ns;
+			if(!$this->current_ns[$this->xml_depth]) {
+				$this->current_ns[$this->xml_depth] = $this->default_ns;
+			}
 		}
 		$ns = $this->current_ns[$this->xml_depth];
 		foreach($attr as $key => $value) {
@@ -318,7 +320,9 @@ 
 	 */
 	public function hasSub($name, $ns = null) {
 		foreach($this->subs as $sub) {
-			if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) return true;
+			if(($name == "*" or $sub->name == $name) and ($ns == null or $sub->ns == $ns)) {
+				return true;
+			}
 		}
 		return false;
 	}