kakserpom / phpdaemon

lib/IOStream.php

Doc Comments +6 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Set the size of data to read at each reading
 	 * @param integer Size
-	 * @return object This
+	 * @return IOStream This
 	 */
 	public function setReadPacketSize($n) {
 		$this->readPacketSize = $n;
@@ -231,6 +231,7 @@ 
 	/**
 	 * Send data to the connection. Note that it just writes to buffer that flushes at every baseloop
 	 * @param string Data to send.
+	 * @param string $s
 	 * @return boolean Success.
 	 */
 	public function send($s) {
@@ -248,7 +249,7 @@ 
 
 	/**
 	 * Finish the session. You shouldn't care about pending buffers, it will be flushed properly.
-	 * @return void
+	 * @return null|boolean
 	 */
 	public function finish() {
 		if ($this->finished) {
@@ -277,6 +278,7 @@ 
 	 * Called when new data received
 	 * @todo +on & -> protected?
 	 * @param string New received data
+	 * @param string $buf
 	 * @return void
 	 */
 	public function stdin($buf) {}
@@ -396,6 +398,7 @@ 
 	 * @param resource Bufferevent
 	 * @param int Events
 	 * @param mixed Attached variable
+	 * @param EventBufferEvent|null $bev
 	 * @return void
 	 */
 	public function onStateEvent($bev, $events) {
@@ -423,6 +426,7 @@ 
 	/**
 	 * Read data from the connection's buffer
 	 * @param integer Max. number of bytes to read
+	 * @param integer $n
 	 * @return string Readed data
 	 */
 	public function read($n) {

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 	/**
 	 * IOStream constructor
- 	 * @param resource File descriptor.
+	 * @param resource File descriptor.
 	 * @param object AppInstance
 	 * @return void
 	 */

Spacing +5 added lines, -5 removed lines

@@ -12,7 +12,7 @@ 
 	public $buf = '';
 	public $EOL = "\n";
 
-	public $readPacketSize  = 8192;
+	public $readPacketSize = 8192;
 	public $bev;
 	public $fd;
 	public $finished = false;
@@ -20,11 +20,11 @@ 
 	public $readLocked = false;
 	public $sending = true;
 	public $reading = false;
-	protected $lowMark  = 1;         // initial value of the minimal amout of bytes in buffer
-	protected $highMark = 0xFFFF;  	// initial value of the maximum amout of bytes in buffer
+	protected $lowMark  = 1; // initial value of the minimal amout of bytes in buffer
+	protected $highMark = 0xFFFF; // initial value of the maximum amout of bytes in buffer
 	public $priority;
 	public $inited = false;
-	public $state = 0;             // stream state of the connection (application protocol level)
+	public $state = 0; // stream state of the connection (application protocol level)
 	const STATE_ROOT = 0;
 	public $onWriteOnce;
 	public $timeout = null;
@@ -205,7 +205,7 @@ 
 	 */
 	public function write($data) {
 		if (!$this->alive) {
-			Daemon::log('Attempt to write to dead IOStream ('.get_class($this).')');
+			Daemon::log('Attempt to write to dead IOStream (' . get_class($this) . ')');
 			return false;
 		}
 		if (!isset($this->bev)) {

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

Doc Comments +7 added lines

@@ -175,6 +175,10 @@ 
 		Timer::setTimeout($this->keepaliveTimer);
 	}
 
+	/**
+	 * @param null|string $from
+	 * @param string $cmd
+	 */
 	public function command($from, $cmd) {
 		if ($from === null) {
 			$from = $this->pool->config->servername->value;
@@ -326,6 +330,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $msg
+	 */
 	public function msgFromBNC($msg) {
 		if ($this->usermask === null) {
 			return;

Indentation +1 added lines, -1 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -57,11 +57,11 @@ 
 
 	public function getConnection($url) {
 		$pool = $this;
-		$this->client->getConnection($url, function ($conn) use ($pool, $url) {
+		$this->client->getConnection($url, function($conn) use ($pool, $url) {
 			$pool->conn = $conn;
 			$conn->attachedClients = new ObjectStorage;
 			if ($conn->connected) {
-				Daemon::log('IRC bot connected at '.$url);
+				Daemon::log('IRC bot connected at ' . $url);
 				$conn->join($pool->config->defaultchannels->value);
 				$conn->bind('motd', function($conn) {
 					//Daemon::log($conn->motd);
@@ -84,7 +84,7 @@ 
 					$conn->attachedClients->each('commandArr', $from['orig'], $cmd, $args);
 				});
 				$conn->bind('privateMsg', function($conn, $msg) {
-					Daemon::log('IRCBouncer: got private message \''.$msg['body'].'\' from \''.$msg['from']['orig'].'\'');
+					Daemon::log('IRCBouncer: got private message \'' . $msg['body'] . '\' from \'' . $msg['from']['orig'] . '\'');
 				});
 				$conn->bind('msg', function($conn, $msg) use ($pool) {
 					$msg['ts'] = microtime(true);
@@ -101,7 +101,7 @@ 
 				});
 			}
 			else {
-				Daemon::log('IRCBouncer: unable to connect ('.$url.')');
+				Daemon::log('IRCBouncer: unable to connect (' . $url . ')');
 			}
 		});
 	}
@@ -171,7 +171,7 @@ 
 
 	public function ping() {
 		$this->lastPingTS = microtime(true);
-		$this->writeln('PING :'.$this->usermask);
+		$this->writeln('PING :' . $this->usermask);
 		Timer::setTimeout($this->keepaliveTimer);
 	}
 
@@ -192,7 +192,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging && !in_array($cmd, array('PONG'))) {
-			Daemon::log('=>=>=>=> '.json_encode($line));
+			Daemon::log('=>=>=>=> ' . json_encode($line));
 		}
 	}
 
@@ -201,7 +201,7 @@ 
 			$from = $this->pool->config->servername->value;
 		}
 		if (is_string($args)) {
-			Daemon::log(get_class($this).'->commandArr: args is string');
+			Daemon::log(get_class($this) . '->commandArr: args is string');
 			return;
 		}
 		$cmd = IRC::getCodeByCommand($cmd);
@@ -216,7 +216,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging && !in_array($cmd, array('PONG'))) {
-			Daemon::log('=>=>=>=> '.json_encode($line));
+			Daemon::log('=>=>=>=> ' . json_encode($line));
 		}
 	}
 
@@ -234,7 +234,7 @@ 
 		} else {
 			return;
 		}
-		$this->msgFromBNC('Attached to '.$this->attachedServer->url);
+		$this->msgFromBNC('Attached to ' . $this->attachedServer->url);
 		$this->usermask = $this->attachedServer->nick . '!' . $this->attachedServer->user . '@' . $this->pool->config->servername->value;
 		$this->command(null, 'RPL_WELCOME', $this->attachedServer->nick, 'Welcome to phpDaemon bouncer -- ' . $this->pool->config->servername->value);
 		foreach ($this->attachedServer->channels as $chan) {
@@ -306,7 +306,7 @@ 
 					}
 
 				} else {
-					$this->msgFromBNC('Unknown command: '.$msg);
+					$this->msgFromBNC('Unknown command: ' . $msg);
 				}
 				return;
 			}
@@ -322,7 +322,7 @@ 
 			$this->attachedServer->commandArr($cmd, $args);
 		}
 		if ($this->protologging) {
-			Daemon::$process->log('<=<=<=< '.$cmd.': '.json_encode($args));
+			Daemon::$process->log('<=<=<=< ' . $cmd . ': ' . json_encode($args));
 		}
 	}
 
@@ -330,7 +330,7 @@ 
 		if ($this->usermask === null) {
 			return;
 		}
-		$this->command('$!@' . $this->pool->config->servername->value, 'PRIVMSG' , $this->usermask, $msg);
+		$this->command('$!@' . $this->pool->config->servername->value, 'PRIVMSG', $this->usermask, $msg);
 	}
 
 	/**
@@ -368,7 +368,7 @@ 
 
 			if (ctype_digit($cmd)) {
 				$code = (int) $cmd;
-				$cmd = isset(IRC::$codes[$code]) ? IRC::$codes[$code] : 'UNKNOWN-'.$code;
+				$cmd = isset(IRC::$codes[$code]) ? IRC::$codes[$code] : 'UNKNOWN-' . $code;
 			}
 			$this->onCommand($cmd, $args);
 		}

Braces +10 added lines, -20 removed lines

@@ -74,8 +74,7 @@ 
 				$conn->bind('command', function($conn, $from, $cmd, $args) use ($pool) {
 					if ($cmd === 'PONG') {
 						return;
-					}
-					elseif ($cmd === 'PING') {
+					} elseif ($cmd === 'PING') {
 						return;
 					}
 					if ($from['orig'] === $conn->servername) {
@@ -99,8 +98,7 @@ 
 					}
 					$pool->getConnection($url);
 				});
-			}
-			else {
+			} else {
 				Daemon::log('IRCBouncer: unable to connect ('.$url.')');
 			}
 		});
@@ -264,42 +262,34 @@ 
 			list ($nick) = $args;
 			$this->attachTo();
 			return;
-		}
-		elseif ($cmd === 'QUIT') {
+		} elseif ($cmd === 'QUIT') {
 			$this->finish();
 			return;
-		}
-		elseif ($cmd === 'PING') {
+		} elseif ($cmd === 'PING') {
 			$this->writeln(isset($args[0]) ? 'PONG :' . $args[0] : 'PONG');
 			return;
-		}
-		elseif ($cmd === 'PONG') {
+		} elseif ($cmd === 'PONG') {
 			if ($this->lastPingTS) {
 				$this->latency = microtime(true) - $this->lastPingTS;
 				$this->lastPingTS = null;
 				$this->event('lantency');
 			}
 			return;
-		}
-		elseif ($cmd === 'NICK') {
+		} elseif ($cmd === 'NICK') {
 			return;
-		}
-		elseif ($cmd === 'PRIVMSG') {
+		} elseif ($cmd === 'PRIVMSG') {
 			list ($target, $msg) = $args;
 			if ($target === '$') {
 				if (preg_match('~^\s*(NICK\s+\S+|DETACH|ATTACH|BYE)\s*$~i', $msg, $m)) {
 					$clientCmd = strtoupper($m[1]);
 					if ($clientCmd === 'NICK') {
 
-					}
-					elseif ($clientCmd === 'DETACH') {
+					} elseif ($clientCmd === 'DETACH') {
 						$this->detach();
 						$this->msgFromBNC('Detached.');
-					}
-					elseif ($clientCmd === 'ATTACH') {
+					} elseif ($clientCmd === 'ATTACH') {
 						$this->attachTo();
-					}
-					elseif ($clientCmd === 'BYE') {
+					} elseif ($clientCmd === 'BYE') {
 						$this->detach();
 						$this->msgFromBNC('Bye-bye.');
 						$this->finish();

lib/IRCClient.php

Doc Comments +17 added lines

@@ -59,6 +59,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $cmd
+	 */
 	public function command($cmd) {
 		if (ctype_digit($cmd)) {
 			$cmd = IRC::getCommandByCode((int) $cmd);
@@ -134,6 +137,10 @@ 
 		$this->writeln('PING :'.$this->servername);
 	}
 
+	/**
+	 * @param string $to
+	 * @param string $msg
+	 */
 	public function message($to, $msg) {
 		$this->command('PRIVMSG', $to, $msg);
 	}
@@ -172,6 +179,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $mode
+	 */
 	public function addMode($channel, $target, $mode) {
 		if ($channel) {
 			$this->channel($channel)->addMode($target, $mode);
@@ -182,6 +192,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $mode
+	 */
 	public function removeMode($channel, $target, $mode) {
 		if ($channel) {
 			$this->channel($channel)->removeMode($target, $mode);
@@ -421,6 +434,10 @@ 
 	public $self;
 	public $type;
 	public $topic;
+
+	/**
+	 * @param IRCClientConnection $irc
+	 */
 	public function __construct($irc, $name) {
 		$this->irc = $irc;
 		$this->name = $name;

Indentation +1 added lines, -1 removed lines

@@ -357,7 +357,7 @@
 	 * Called when new data received
 	 * @param string New data
 	 * @return void
-	*/
+	 */
 	public function stdin($buf) {
 		$this->buf .= $buf;
 		while (($line = $this->gets()) !== false) {

Spacing +12 added lines, -12 removed lines

@@ -28,9 +28,9 @@ 
 }
 
 class IRCClientConnection extends NetworkClientConnection {
-	public $user 			= 'Guest';     // Username
-	public $password 		= '';         // Password
-	public $EOL				= "\r\n";
+	public $user = 'Guest'; // Username
+	public $password = ''; // Password
+	public $EOL = "\r\n";
 	public $nick;
 	public $realname;
 	public $eventHandlers = array();
@@ -49,13 +49,13 @@ 
 	 */
 	public function onReady() {
 		if ($this->pool->identd) {
-			$this->pool->identd->registerPair($this->locPort, $this->port, 'UNIX : '.$this->user);
+			$this->pool->identd->registerPair($this->locPort, $this->port, 'UNIX : ' . $this->user);
 		}
 		list($this->nick, $this->realname) = explode('/', $this->path . '/John Doe');
 		$this->command('USER', $this->user, 0, '*', $this->realname);
 		$this->command('NICK', $this->nick);
 		if (strlen($this->password)) {
-			$this->message('NickServ', 'IDENTIFY '.$this->password);
+			$this->message('NickServ', 'IDENTIFY ' . $this->password);
 		}
 	}
 
@@ -76,7 +76,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging) {
-			Daemon::log('->->->-> '.$line);
+			Daemon::log('->->->-> ' . $line);
 		}
 	}
 
@@ -99,7 +99,7 @@ 
 		}
 		$this->writeln($line);
 		if ($this->pool->protologging && !in_array($cmd, array('PONG'))) {
-			Daemon::log('->->->-> '.$line);
+			Daemon::log('->->->-> ' . $line);
 		}
 	}
 
@@ -131,7 +131,7 @@ 
 
 	public function ping() {
 		$this->lastPingTS = microtime(true);
-		$this->writeln('PING :'.$this->servername);
+		$this->writeln('PING :' . $this->servername);
 	}
 
 	public function message($to, $msg) {
@@ -215,7 +215,7 @@ 
 			return;
 		}
 		elseif ($cmd === 'RPL_ENDOFMOTD') {
-			$this->motd .= "\r\n";// . $args[1];
+			$this->motd .= "\r\n"; // . $args[1];
 			$this->event('motd', $this->motd);
 			return;
 		}
@@ -339,7 +339,7 @@ 
 			}
 		}
 		elseif ($cmd === 'PING') {
-			$this->writeln(isset($args[0]) ? 'PONG :'.$args[0] : 'PONG');
+			$this->writeln(isset($args[0]) ? 'PONG :' . $args[0] : 'PONG');
 		}
 		elseif ($cmd === 'PONG') {
 			if ($this->lastPingTS) {
@@ -349,7 +349,7 @@ 
 			return;
 		}
 		if ($this->pool->protologging) {
-			Daemon::$process->log('<-<-<-< '.$cmd.': '.json_encode($args). ' ('.json_encode($from['orig']).') (' . json_encode($this->lastLine) . ')');
+			Daemon::$process->log('<-<-<-< ' . $cmd . ': ' . json_encode($args) . ' (' . json_encode($from['orig']) . ') (' . json_encode($this->lastLine) . ')');
 		}
 	}
 
@@ -626,7 +626,7 @@ 
 		$this->channel->detach($this);
 	}
 	public function chanMessage($msg) {
-		$this->channel->message($this->nick.': '.$msg);
+		$this->channel->message($this->nick . ': ' . $msg);
 	}
 }
 

Braces +26 added lines, -52 removed lines

@@ -68,8 +68,7 @@ 
 			$arg = func_get_arg($i);
 			if (($i + 1 === $s) && (strpos($arg, "\x20") !== false)) {
 				$line .= ' :';
-			}
-			else {
+			} else {
 				$line .= ' ';
 			}
 			$line .= $arg;
@@ -91,8 +90,7 @@ 
 		for ($i = 0, $s = sizeof($args); $i < $s; ++$i) {
 			if (($i + 1 === $s) && (strpos($args[$i], "\x20") !== false)) {
 				$line .= ' :';
-			}
-			else {
+			} else {
 				$line .= ' ';
 			}
 			$line .= $args[$i];
@@ -198,41 +196,33 @@ 
 				$this->onConnected->executeAll($this);
 				$this->onConnected = null;
 			}
-		}
-		elseif ($cmd === 'NOTICE') {
+		} elseif ($cmd === 'NOTICE') {
 			list ($target, $text) = $args;
 			$log = true;
 			$this->event('notice', $target, $text);
-		}
-		elseif ($cmd == 'RPL_YOURHOST') {
-		}
-		elseif ($cmd === 'RPL_MOTDSTART') {
+		} elseif ($cmd == 'RPL_YOURHOST') {
+		} elseif ($cmd === 'RPL_MOTDSTART') {
 			$this->motd = $args[1];
 			return;
-		}
-		elseif ($cmd === 'RPL_MOTD') {
+		} elseif ($cmd === 'RPL_MOTD') {
 			$this->motd .= "\r\n" . $args[1];
 			return;
-		}
-		elseif ($cmd === 'RPL_ENDOFMOTD') {
+		} elseif ($cmd === 'RPL_ENDOFMOTD') {
 			$this->motd .= "\r\n";// . $args[1];
 			$this->event('motd', $this->motd);
 			return;
-		}
-		elseif ($cmd === 'JOIN') {
+		} elseif ($cmd === 'JOIN') {
 			list ($channel) = $args;
 			$chan = $this->channel($channel);
 			IRCClientChannelParticipant::instance($chan, $from['nick'])->setUsermask($from);
-		}
-		elseif ($cmd === 'NICK') {
+		} elseif ($cmd === 'NICK') {
 			list ($newNick) = $args;
 			foreach ($this->channels as $channel) {
 				if (isset($channel->nicknames[$from['nick']])) {
 					$channel->nicknames[$from['nick']]->setNick($newNick);
 				}
 			}
-		}
-		elseif ($cmd === 'QUIT') {
+		} elseif ($cmd === 'QUIT') {
 			$args[] = null;
 			list ($msg) = $args;
 			foreach ($this->channels as $channel) {
@@ -240,15 +230,13 @@ 
 					$channel->nicknames[$from['nick']]->destroy();
 				}
 			}
-		}
-		elseif ($cmd === 'PART') {
+		} elseif ($cmd === 'PART') {
 			$args[] = null;
 			list ($channel, $msg) = $args;
 			if ($chan = $this->channelIfExists($channel)) {
 				$chan->onPart($from, $msg);
 			}
-		}
-		elseif ($cmd === 'RPL_NAMREPLY') {
+		} elseif ($cmd === 'RPL_NAMREPLY') {
 			$bufName = 'RPL_NAMREPLY';
 			list($myNick, $chanType, $channelName) = $args;
 			$this->channel($channelName)->setChanType($chanType);
@@ -259,8 +247,7 @@ 
 				$this->buffers[$bufName][$channelName] = new SplStack;
 			}
 			$this->buffers[$bufName][$channelName]->push($args);
-		}
-		elseif ($cmd === 'RPL_ENDOFNAMES') {
+		} elseif ($cmd === 'RPL_ENDOFNAMES') {
 			$bufName = 'RPL_NAMREPLY';
 			list($nick, $channelName, $text) = $args;
 			if (!isset($this->buffers[$bufName][$channelName])) {
@@ -283,8 +270,7 @@ 
 				}
 
 			}
-		}
-		elseif ($cmd === 'RPL_WHOREPLY') {
+		} elseif ($cmd === 'RPL_WHOREPLY') {
 			if (sizeof($args) < 7) {
 
 			}
@@ -295,17 +281,14 @@ 
 				->setUsermask($nick . '!' . $user . '@' . $server)
 				->setFlag($mode);
 			}
-		}
-		elseif ($cmd === 'RPL_TOPIC') {
+		} elseif ($cmd === 'RPL_TOPIC') {
 			list($myNick, $channelName, $text) = $args;
 			if ($channel = $this->channelIfExists($channelName)) {
 				$channel->setTopic($text);
 			}	
-		}
-		elseif ($cmd === 'RPL_ENDOFWHO') {
+		} elseif ($cmd === 'RPL_ENDOFWHO') {
 			list($myNick, $channelName, $text) = $args;
-		}
-		elseif ($cmd === 'MODE') {
+		} elseif ($cmd === 'MODE') {
 			if (sizeof($args) === 3) {
 				list ($channel, $mode, $target) = $args;
 			} else {
@@ -317,14 +300,11 @@ 
 			} elseif ($mode[0] === '-') {
 				$this->removeMode($channel, $target, binarySubstr($mode, 1));
 			}
-		}
-		elseif ($cmd === 'RPL_CREATED') {
+		} elseif ($cmd === 'RPL_CREATED') {
 			list($to, $this->created) = $args;
-		}
-		elseif ($cmd === 'RPL_MYINFO') {
+		} elseif ($cmd === 'RPL_MYINFO') {
 			list($to, $this->servername, $this->serverver, $this->availUserModes, $this->availChanModes) = $args;
-		}
-		elseif ($cmd === 'PRIVMSG') {
+		} elseif ($cmd === 'PRIVMSG') {
 			list ($target, $body) = $args;
 			$msg = array(
 				'from' => $from,
@@ -337,11 +317,9 @@ 
 			if (!$msg['private']) {
 				$this->channel($target)->event('msg', $msg);
 			}
-		}
-		elseif ($cmd === 'PING') {
+		} elseif ($cmd === 'PING') {
 			$this->writeln(isset($args[0]) ? 'PONG :'.$args[0] : 'PONG');
-		}
-		elseif ($cmd === 'PONG') {
+		} elseif ($cmd === 'PONG') {
 			if ($this->lastPingTS) {
 				$this->latency = microtime(true) - $this->lastPingTS;
 				$this->lastPingTS = null;
@@ -544,11 +522,9 @@ 
 		$this->flag = $flag;
 		if ($flag === '@') {
 			$this->mode = 'o';
-		}
-		elseif ($flag === '%') {
+		} elseif ($flag === '%') {
 			$this->mode = 'h';
-		}
-		elseif ($flag === '+') {
+		} elseif ($flag === '+') {
 			$this->mode = 'v';
 		}
 		return $this;
@@ -562,11 +538,9 @@ 
 	public function onModeUpdate() {
 		if (strpos($this->mode, 'o') !== false) {
 			$this->flag = '@';
-		}
-		elseif (strpos($this->mode, 'h') !== false) {
+		} elseif (strpos($this->mode, 'h') !== false) {
 			$this->flag = '%';
-		}
-		elseif (strpos($this->mode, 'v') !== false) {
+		} elseif (strpos($this->mode, 'v') !== false) {
 			$this->flag = '+';
 		} else {
 			$this->flag = '';

lib/LockServer.php

Doc Comments +1 added lines

@@ -66,6 +66,7 @@
 	 * Called when client sends done- or failed-event.	
 	 * @param string Name of job.
 	 * @param string Result.
+	 * @param string $result
 	 * @return string Result.
 	 */
 	public function done($name, $result) {

Spacing +5 added lines, -5 removed lines

@@ -8,8 +8,8 @@ 
  */
 class LockServer extends NetworkServer {
 	
-	public $lockState = array();      // Jobs
-	public $lockConnState = array();  // Array of connection's state
+	public $lockState = array(); // Jobs
+	public $lockConnState = array(); // Array of connection's state
 
 	/**
 	 * Setting default config options
@@ -32,8 +32,8 @@ 
 
 }
 class LockServerConnection extends Connection {
-	public $server = FALSE;   // Is this S2S-session?
-	public $locks = array();  // State of locks.
+	public $server = FALSE; // Is this S2S-session?
+	public $locks = array(); // State of locks.
 
 	/**
 	 * Called when client is trying to acquire lock.	
@@ -137,7 +137,7 @@ 
 			elseif ($e[0] !== '') {
 				$this->writeln('PROTOCOL_ERROR');
 			}
-			if($this->pool->config->protologging->value) {
+			if ($this->pool->config->protologging->value) {
 				Daemon::log('Lock client --> Lock server: ' . Debug::exportBytes(implode(' ', $e)) . "\n");
 			}
 		}

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

Doc Comments +3 added lines

@@ -81,6 +81,9 @@
 	 * @param integer Opcode (see constants above)
 	 * @param string Data
 	 * @param boolean Is an answer expected?
+	 * @param string $key
+	 * @param integer $opcode
+	 * @param string $data
 	 * @return integer Request ID
 	 * @throws MongoClientAsyncConnectionFinished
 	 */

Indentation +3 added lines, -3 removed lines

@@ -859,9 +859,9 @@
 		if (strpos($col, '.') === false) {
 			$col = $this->dbname . '.' . $col;
 		} else {
-            $collName = explode('.', $col);
-            $this->dbname = $collName[0];
-        }
+			$collName = explode('.', $col);
+			$this->dbname = $collName[0];
+		}
 
 		if (isset($this->collections[$col])) {
 			return $this->collections[$col];

Spacing +9 added lines, -9 removed lines

@@ -10,10 +10,10 @@ 
 	
 	public $requests    = array(); // Pending requests
 	public $cursors     = array(); // Active cursors
-	public $lastReqId   = 0;       // ID of the last request
+	public $lastReqId   = 0; // ID of the last request
 	public $collections = array(); // Objects of MongoClientAsyncCollection
-	public $dbname      = '';      // Current database
-	public $lastRequestConnection;    // Holds last used MongoClientAsyncConnection object.
+	public $dbname      = ''; // Current database
+	public $lastRequestConnection; // Holds last used MongoClientAsyncConnection object.
 
 	/* Codes of operations */
 	const OP_REPLY        = 1; 
@@ -25,7 +25,7 @@ 
 	const OP_DELETE       = 2006;
 	const OP_KILL_CURSORS = 2007;
 
-	public $cache;                 // object of MemcacheClient
+	public $cache; // object of MemcacheClient
 
 	/**
 	 * Setting default config options
@@ -86,7 +86,7 @@ 
 	 */
 	public function request($key, $opcode, $data, $reply = false) {
 		$reqId = ++$this->lastReqId;
-		$cb = function ($conn) use ($opcode, $data, $reply, $reqId) {
+		$cb = function($conn) use ($opcode, $data, $reply, $reqId) {
 			if (!$conn->connected) {
 				throw new MongoClientConnectionAsyncFinished;
 			}
@@ -217,7 +217,7 @@ 
 	public function findOne($p, $callback, $key = '') {
 		if (isset($p['cachekey'])) {
 			$db = $this;
-			$this->cache->get($p['cachekey'], function($r) use ($db,  $p,  $callback,  $key) {
+			$this->cache->get($p['cachekey'], function($r) use ($db, $p, $callback, $key) {
 				if ($r->result !== NULL) {
 					call_user_func($callback, bson_decode($r->result));
 				} else {
@@ -615,7 +615,7 @@ 
 		}
 		
 		if (strpos($p['col'], '.') === false) {
-			$p['col'] = $this->dbname.'.'.$p['col'];
+			$p['col'] = $this->dbname . '.' . $p['col'];
 		}
 		
 		$e = explode('.', $p['col']);
@@ -630,7 +630,7 @@ 
 		);
 		
 		if (isset($p[$k = 'cond'])) {
-			$query['group'][$k]= $p[$k];
+			$query['group'][$k] = $p[$k];
 		}
 		
 		if (isset($p[$k = 'finalize'])) {
@@ -725,7 +725,7 @@ 
 	 * @param string Optional. Distribution key.
 	 * @return object MongoId
 	 */
-	public function insert($col, $doc = array(), $cb = NULL,  $key = '') {
+	public function insert($col, $doc = array(), $cb = NULL, $key = '') {
 		if (strpos($col, '.') === false) {
 			$col = $this->dbname . '.' . $col;
 		}

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

Doc Comments +3 added lines

@@ -10,6 +10,7 @@ 
 	 * Contructor of MongoClientAsyncCollection
 	 * @param string Name of collection
 	 * @param object Pool
+	 * @param MongoClientAsync $pool
 	 * @return void
 	 */
 	public function __construct($name, $pool) {
@@ -143,6 +144,8 @@ 
      * @param string Code
      * @param mixed Callback called when response received
      * @param string Optional. Distribution key
+     * @param string $code
+     * @param Closure $cb
      * @return void
      */
     public function evaluate($code, $cb, $key = '')

Indentation +33 added lines, -33 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 class MongoClientAsyncCollection {
-    /**
-     * @var MongoClient
-     */
+	/**
+	 * @var MongoClient
+	 */
 	public $pool;
 	public $name; // Name of collection.
 
@@ -36,7 +36,7 @@ 
 	 * @param array Hash of properties (offset,   opts,  where,  col,  fields,  sort,  hint,  explain,  snapshot,  orderby,  parse_oplog)
 	 * @param string Optional. Distribution key.
 	 * @return void
- 	*/
+	 */
 	public function findOne($cb, $p = array(), $key = '') {
 		$p['col'] = $this->name;
 
@@ -138,34 +138,34 @@ 
 		return $this->pool->remove($this->name, $cond, $cb, $key);
 	}
 
-    /**
-     * Evaluates a code on the server side
-     * @param string Code
-     * @param mixed Callback called when response received
-     * @param string Optional. Distribution key
-     * @return void
-     */
-    public function evaluate($code, $cb, $key = '')
-    {
-        $this->pool->evaluate($code, $cb, $key);
-    }
+	/**
+	 * Evaluates a code on the server side
+	 * @param string Code
+	 * @param mixed Callback called when response received
+	 * @param string Optional. Distribution key
+	 * @return void
+	 */
+	public function evaluate($code, $cb, $key = '')
+	{
+		$this->pool->evaluate($code, $cb, $key);
+	}
 
-    /**
-     * Generation autoincrement
-     * @param Closure $cb called when response received
-     * @param string $key Optional. Distribution key
-     * @return void
-     */
-    public function autoincrement($cb, $key = '')
-    {
-        $this->evaluate(
-            'function () { '
-                . 'return db.autoincrement.findAndModify({ '
-                . 'query: {"_id":"' . $this->name . '"}, update: {$inc:{"id":1}}, new: true, upsert: true }); }',
-            function ($res) use ($cb) {
-                call_user_func($cb, $res);
-            },
-            $key
-        );
-    }
+	/**
+	 * Generation autoincrement
+	 * @param Closure $cb called when response received
+	 * @param string $key Optional. Distribution key
+	 * @return void
+	 */
+	public function autoincrement($cb, $key = '')
+	{
+		$this->evaluate(
+			'function () { '
+				. 'return db.autoincrement.findAndModify({ '
+				. 'query: {"_id":"' . $this->name . '"}, update: {$inc:{"id":1}}, new: true, upsert: true }); }',
+			function ($res) use ($cb) {
+				call_user_func($cb, $res);
+			},
+			$key
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
             'function () { '
                 . 'return db.autoincrement.findAndModify({ '
                 . 'query: {"_id":"' . $this->name . '"}, update: {$inc:{"id":1}}, new: true, upsert: true }); }',
-            function ($res) use ($cb) {
+            function($res) use ($cb) {
                 call_user_func($cb, $res);
             },
             $key

lib/MongoClientAsyncCursor.php

Doc Comments +4 added lines, -2 removed lines

@@ -14,7 +14,9 @@ 
 	 * Constructor
 	 * @param string Cursor's ID
 	 * @param string Collection's name
-	 * @param object Network connection (MongoClientConnection), 
+	 * @param object Network connection (MongoClientConnection),
+	 * @param string $id
+	 * @param MongoClientAsyncConnection $conn 
 	 * @return void
 	 */
 	public function __construct($id, $col, $conn) {
@@ -26,7 +28,7 @@ 
 	/**
 	 * Asks for more objects
 	 * @param integer Number of objects
-	 * @return void
+	 * @return boolean
 	 */
 	public function getMore($number = 0) {
 		//if ($this->tailable && $this->await) {return true;}

Spacing +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 class MongoClientAsyncCursor {
-	public $id;                 // Cursor's ID.
-	public $col;                // Collection's name.
-	public $items = array();    // Array of objects
-	public $item;               // Current object
-	public $conn;     	        // Network connection
-	public $finished = false;   // Is this cursor finished?
-	public $failure = false;    // Is this query failured?
-	public $await = false;      // awaitCapable?
-	public $destroyed = false;  // Is this cursor destroyed?
+	public $id; // Cursor's ID.
+	public $col; // Collection's name.
+	public $items = array(); // Array of objects
+	public $item; // Current object
+	public $conn; // Network connection
+	public $finished = false; // Is this cursor finished?
+	public $failure = false; // Is this query failured?
+	public $await = false; // awaitCapable?
+	public $destroyed = false; // Is this cursor destroyed?
 
 	/**
 	 * Constructor

lib/MySQLClientConnection.php

Doc Comments +6 added lines

@@ -59,6 +59,7 @@ 
 	 * Converts binary string to integer
 	 * @param string Binary string
 	 * @param boolean Optional. Little endian. Default value - true.
+	 * @param string $str
 	 * @return integer Resulting integer
 	 */
 	public function bytes2int($str, $l = TRUE)
@@ -82,6 +83,7 @@ 
 	 * @param integer Length
 	 * @param integer Integer
 	 * @param boolean Optional. Little endian. Default value - true.
+	 * @param integer $len
 	 * @return string Resulting binary string
 	 */
 	function int2bytes($len, $int = 0, $l = TRUE) {
@@ -108,6 +110,7 @@ 
 	/**
 	 * Sends a packet
 	 * @param string Data
+	 * @param string $packet
 	 * @return boolean Success
 	 */
 	public function sendPacket($packet) { 
@@ -118,6 +121,7 @@ 
 	/**
 	 * Builds length-encoded binary string
 	 * @param string String
+	 * @param string $s
 	 * @return string Resulting binary string
 	 */
 	public function buildLenEncodedBinary($s) {
@@ -209,6 +213,7 @@ 
 	 * Generates auth. token
 	 * @param string Scramble string
 	 * @param string Password
+	 * @param string $password
 	 * @return string Result
 	 */
 	public function getAuthToken($scramble, $password) {
@@ -261,6 +266,7 @@ 
 	 * Sends SQL-query
 	 * @param string Query
 	 * @param callback Optional. Callback called when response received.
+	 * @param string $q
 	 * @return boolean Success
 	 */
 	public function query($q, $callback = NULL) {

Spacing +25 added lines, -25 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 class MySQLClientConnection extends NetworkClientConnection {
 
-	public $url;                        // Connection's URL.
-	public $seq           = 0;          // Pointer of packet sequence.
-	public $clientFlags   = 239237;     // Flags of this MySQL client.
-	public $maxPacketSize = 0x1000000;  // Maximum packet size.
-	public $charsetNumber = 0x21;       // Charset number.
-	public $path        = ''; 	        // Default database name.
-	public $user          = 'root';     // Username
-	public $password      = '';         // Password
-	public $state        = 0;          // Connection's state. 0 - start, 1 - got initial packet, 2 - auth. packet sent, 3 - auth. error, 4 - handshaked OK
+	public $url; // Connection's URL.
+	public $seq           = 0; // Pointer of packet sequence.
+	public $clientFlags   = 239237; // Flags of this MySQL client.
+	public $maxPacketSize = 0x1000000; // Maximum packet size.
+	public $charsetNumber = 0x21; // Charset number.
+	public $path = ''; // Default database name.
+	public $user          = 'root'; // Username
+	public $password      = ''; // Password
+	public $state        = 0; // Connection's state. 0 - start, 1 - got initial packet, 2 - auth. packet sent, 3 - auth. error, 4 - handshaked OK
 	const STATE_GOT_INIT = 1;
 	const STATE_AUTH_SENT = 2;
 	const STATE_AUTH_ERR = 3;
 	const STATE_HANDSHAKED = 4;
-	public $instate       = 0;          // State of pointer of incoming data. 0 - Result Set Header Packet, 1 - Field Packet, 2 - Row Packet
+	public $instate       = 0; // State of pointer of incoming data. 0 - Result Set Header Packet, 1 - Field Packet, 2 - Row Packet
 	const INSTATE_HEADER = 0;
 	const INSTATE_FIELD = 1;
 	const INSTATE_ROW = 2;
-	public $resultRows    = array();    // Resulting rows
-	public $resultFields  = array();    // Resulting fields
-	public $context;                    // Property holds a reference to user's object
-	public $insertId;                   // INSERT_ID()
-	public $affectedRows;               // Affected rows number
+	public $resultRows    = array(); // Resulting rows
+	public $resultFields  = array(); // Resulting fields
+	public $context; // Property holds a reference to user's object
+	public $insertId; // INSERT_ID()
+	public $affectedRows; // Affected rows number
 	public $protover = 0;
 	public $timeout = 120;
 	public $errno = 0;
@@ -70,7 +70,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);
 		}
 		
@@ -89,7 +89,7 @@ 
 
 		if ($len === NULL) {
 			if (strlen($hexstr) % 2) {
-				$hexstr = "0".$hexstr;
+				$hexstr = "0" . $hexstr;
 			}
 		} else {
 			$hexstr = str_repeat('0', $len * 2 - strlen($hexstr)) . $hexstr;
@@ -98,7 +98,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)));
 		}
 		
@@ -112,7 +112,7 @@ 
 	 */
 	public function sendPacket($packet) { 
 		//Daemon::log('Client --> Server: ' . Debug::exportBytes($packet) . "\n\n");
-		return $this->write($this->int2bytes(3, strlen($packet)) . chr($this->seq++) . $packet);;
+		return $this->write($this->int2bytes(3, strlen($packet)) . chr($this->seq++) . $packet); ;
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 		}
 		
 		$o = $p;
-		$p =+ 8;
+		$p = + 8;
 		
 		return $this->bytes2int(binarySubstr($s, $o, 8));
 	}
@@ -189,7 +189,7 @@ 
 	 * @param integer Reference to pointer
 	 * @return integer Result
 	 */
-	public function parseEncodedString(&$s,&$p) {
+	public function parseEncodedString(&$s, &$p) {
 		$l = $this->parseEncodedBinary($s, $p);
 
 		if (
@@ -295,7 +295,7 @@ 
 		
 		$this->onResponse->push($callback);
 		$this->seq = 0;
-		$this->sendPacket(chr($cmd).$q);
+		$this->sendPacket(chr($cmd) . $q);
 		
 		return TRUE;
 	}
@@ -395,7 +395,7 @@ 
 				
 				$this->errno = $u[1];
 				$state = binarySubstr($this->buf, $p, 6);
-				$p =+ 6;
+				$p = + 6;
 
 				$this->errmsg = binarySubstr($this->buf, $p, $packet[0] + 4 - $p);
 				$this->onError();
@@ -421,7 +421,7 @@ 
 				
 				$this->serverStatus = $u[1];
 
-				$u = unpack('v',binarySubstr($this->buf, $p, 2));
+				$u = unpack('v', binarySubstr($this->buf, $p, 2));
 				$p += 2;
 				
 				$this->warnCount = $u[1];
@@ -483,7 +483,7 @@ 
 					// Row Packet
 					$row = array();
 
-					for ($i = 0,$nf = sizeof($this->resultFields); $i < $nf; ++$i) {
+					for ($i = 0, $nf = sizeof($this->resultFields); $i < $nf; ++$i) {
 						$row[$this->resultFields[$i]['name']] = $this->parseEncodedString($this->buf, $p);
 					}
 		

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

Doc Comments +4 added lines, -1 removed lines

@@ -62,7 +62,7 @@ 
 	 * @param string Address
 	 * @param callback onConnected
 	 * @param integer Optional. Priority.
-	 * @return mixed Success|Connection.
+	 * @return boolean Success|Connection.
 	 */
 	public function getConnection($url = null, $cb = null, $pri = 0) {
 		if (!is_string($url) && $url !== null && $cb === null) { // if called getConnection(function....)
@@ -135,6 +135,7 @@ 
 	/**
 	 * Returns available connection from the pool by key
 	 * @param string Key
+	 * @param Closure $cb
 	 * @return boolean Success.
 	 */
 	public function getConnectionByKey($key, $cb = null) {
@@ -161,6 +162,7 @@ 
 	 * @param string Server
 	 * @param string Request
 	 * @param mixed Callback called when the request complete
+	 * @param string $data
 	 * @return boolean Success.
 	 */
 	public function requestByServer($server, $data, $onResponse = null) {
@@ -189,6 +191,7 @@ 
 	 * @param string Key
 	 * @param string Request
 	 * @param mixed Callback called when the request complete
+	 * @param string $data
 	 * @return boolean Success
 	 */
 	public function requestByKey($key, $data, $onResponse = null) {

Spacing +7 added lines, -7 removed lines

@@ -9,11 +9,11 @@ 
  */
 class NetworkClient extends ConnectionPool {
 	
-	public $servers = array();      // Array of servers 
-	public $dtags_enabled = false;   // Enables tags for distribution
-	public $servConn = array();      // Active connections
+	public $servers = array(); // Array of servers 
+	public $dtags_enabled = false; // Enables tags for distribution
+	public $servConn = array(); // Active connections
 	public $servConnFree = array();
-	public $prefix = '';             // Prefix for all keys
+	public $prefix = ''; // Prefix for all keys
 	public $maxConnPerServ = 32;
 	public $acquireOnGet = false;
 	public $noSAF = false;
@@ -37,7 +37,7 @@ 
 	public function applyConfig() {
 		parent::applyConfig();
 		if (isset($this->config->servers)) {
-			$servers = array_filter(array_map('trim',explode(',', $this->config->servers->value)), 'strlen');
+			$servers = array_filter(array_map('trim', explode(',', $this->config->servers->value)), 'strlen');
 			$this->servers = array();
 			foreach ($servers as $s) {
 				$this->addServer($s);
@@ -169,7 +169,7 @@ 
 			srand();
 			$server = array_rand($this->servers);
 		}
-		$this->getConnection($server, function ($conn) use ($data, $onResponse) {
+		$this->getConnection($server, function($conn) use ($data, $onResponse) {
 			if (!$conn->connected) {
 				return;
 			}
@@ -192,7 +192,7 @@ 
 	 * @return boolean Success
 	 */
 	public function requestByKey($key, $data, $onResponse = null) {
-		 $this->getConnectionByKey($key, function ($conn) use ($data, $onResponse) {
+		 $this->getConnectionByKey($key, function($conn) use ($data, $onResponse) {
 		 	if (!$conn->connected) {
 				return;
 			}

Braces +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
 				if ($this->acquireOnGet) {
 					$free->detach($conn);			
 				}
-			}
-			elseif ($storage->count() >= $this->maxConnPerServ) {
+			} elseif ($storage->count() >= $this->maxConnPerServ) {
 				if (!isset($this->pending[$url])) {
 					$this->pending[$url] = new PriorityQueueCallbacks;
 				}