barbushin / php-console

src/PhpConsole/Storage/MongoDB.php

Spacing +3 added lines, -3 removed lines

@@ -22,12 +22,12 @@ 
 
 	public function __construct($server = 'mongodb://localhost:27017', $db = 'phpconsole', $collection = 'phpconsole') {
 		$this->mongoClient = new \MongoClient($server);
-		if(!$this->mongoClient) {
+		if (!$this->mongoClient) {
 			throw new \Exception('Unable to connect to MongoDB server');
 		}
 
 		$this->mongoCollection = $this->mongoClient->selectCollection($db, $collection);
-		if(!$this->mongoCollection) {
+		if (!$this->mongoCollection) {
 			throw new \Exception('Unable to get collection');
 		}
 
@@ -65,7 +65,7 @@ 
 	 */
 	protected function get($key) {
 		$record = $this->mongoCollection->findOne(array('key' => $key));
-		if($record && is_array($record) && array_key_exists('data', $record)) {
+		if ($record && is_array($record) && array_key_exists('data', $record)) {
 			return $record['data'];
 		}
 	}

src/PhpConsole/Storage/ExpiringKeyValue.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 */
 	public function pop($key) {
 		$data = $this->get($key);
-		if($data) {
+		if ($data) {
 			$this->delete($key);
 		}
 		return $data;

src/PhpConsole/Storage/Memcache.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 	public function __construct($host = 'localhost', $port = 11211) {
 		$this->memcache = new \Memcache();
-		if(!$this->memcache->connect($host, $port)) {
+		if (!$this->memcache->connect($host, $port)) {
 			throw new \Exception('Unable to connect to Memcache server');
 		}
 	}

src/PhpConsole/Storage/Session.php

Indentation +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
 	 * @param bool $autoStart Start session if it's not started
 	 */
 	public function __construct($sessionKey = '__PHP_Console_postponed', $autoStart = true) {
-        	if($autoStart && (defined('PHP_SESSION_ACTIVE') ? session_status() != PHP_SESSION_ACTIVE : !session_id()) && !headers_sent()) {
-        		session_start();
+			if($autoStart && (defined('PHP_SESSION_ACTIVE') ? session_status() != PHP_SESSION_ACTIVE : !session_id()) && !headers_sent()) {
+				session_start();
 		}
 		register_shutdown_function('session_write_close'); // force saving session data if session handler is overridden
 		$this->sessionKey = $sessionKey;

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 * @param bool $autoStart Start session if it's not started
 	 */
 	public function __construct($sessionKey = '__PHP_Console_postponed', $autoStart = true) {
-        	if($autoStart && (defined('PHP_SESSION_ACTIVE') ? session_status() != PHP_SESSION_ACTIVE : !session_id()) && !headers_sent()) {
+        	if ($autoStart && (defined('PHP_SESSION_ACTIVE') ? session_status() != PHP_SESSION_ACTIVE : !session_id()) && !headers_sent()) {
         		session_start();
 		}
 		register_shutdown_function('session_write_close'); // force saving session data if session handler is overridden

src/PhpConsole/Storage/File.php

Spacing +7 added lines, -7 removed lines

@@ -23,14 +23,14 @@ 
 	 * @throws \Exception
 	 */
 	public function __construct($filePath, $validatePathNotUnderDocRoot = true) {
-		if(!file_exists($filePath)) {
-			if(file_put_contents($filePath, '') === false) {
+		if (!file_exists($filePath)) {
+			if (file_put_contents($filePath, '') === false) {
 				throw new \Exception('Unable to write file ' . $filePath);
 			}
 		}
 		$this->filePath = realpath($filePath);
 
-		if($validatePathNotUnderDocRoot && $this->isPathUnderDocRoot()) {
+		if ($validatePathNotUnderDocRoot && $this->isPathUnderDocRoot()) {
 			throw new \Exception('Path ' . $this->filePath . ' is under DOCUMENT_ROOT. It\'s insecure!');
 		}
 	}
@@ -41,10 +41,10 @@ 
 
 	protected function initFileHandler() {
 		$this->fileHandler = fopen($this->filePath, 'a+b');
-		if(!$this->fileHandler) {
+		if (!$this->fileHandler) {
 			throw new \Exception('Unable to read/write file ' . $this->filePath);
 		}
-		while(!flock($this->fileHandler, LOCK_EX | LOCK_NB)) {
+		while (!flock($this->fileHandler, LOCK_EX | LOCK_NB)) {
 			usleep(10000);
 		}
 		fseek($this->fileHandler, 0);
@@ -55,7 +55,7 @@ 
 	 * @return array
 	 */
 	protected function getKeysData() {
-		return json_decode(fgets($this->fileHandler), true) ? : array();
+		return json_decode(fgets($this->fileHandler), true) ?: array();
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	}
 
 	protected function closeFileHandler() {
-		if($this->fileHandler) {
+		if ($this->fileHandler) {
 			flock($this->fileHandler, LOCK_UN);
 			fclose($this->fileHandler);
 			$this->fileHandler = null;

src/PhpConsole/Storage/AllKeysList.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	public function pop($key) {
 		$keysData = $this->getKeysData();
-		if(isset($keysData[$key])) {
+		if (isset($keysData[$key])) {
 			$keyData = $keysData[$key]['data'];
 			unset($keysData[$key]);
 			$this->saveKeysData($keysData);
@@ -63,8 +63,8 @@ 
 	 */
 	protected function clearExpiredKeys(array &$keysData) {
 		$expireTime = time() - $this->keyLifetime;
-		foreach($keysData as $key => $item) {
-			if($item['time'] < $expireTime) {
+		foreach ($keysData as $key => $item) {
+			if ($item['time'] < $expireTime) {
 				unset($keysData[$key]);
 			}
 		}

src/PhpConsole/Dispatcher.php

Spacing +14 added lines, -14 removed lines

@@ -64,33 +64,33 @@ 
 		$ignoreByNumber = is_numeric($ignoreTraceCalls) ? $ignoreTraceCalls : 0;
 		$ignoreByClassPrefixes = is_array($ignoreTraceCalls) ? array_merge($ignoreTraceCalls, array(__NAMESPACE__)) : null;
 
-		foreach($trace as $i => $call) {
-			if(!$file && $i == $ignoreTraceCalls && isset($call['file'])) {
+		foreach ($trace as $i => $call) {
+			if (!$file && $i == $ignoreTraceCalls && isset($call['file'])) {
 				$file = $call['file'];
 				$line = $call['line'];
 			}
-			if($ignoreByClassPrefixes && isset($call['class'])) {
-				foreach($ignoreByClassPrefixes as $classPrefix) {
-					if(strpos($call['class'], $classPrefix) !== false) {
+			if ($ignoreByClassPrefixes && isset($call['class'])) {
+				foreach ($ignoreByClassPrefixes as $classPrefix) {
+					if (strpos($call['class'], $classPrefix) !== false) {
 						unset($trace[$i]);
 						continue;
 					}
 				}
 			}
-			if($i < $ignoreByNumber || (isset($call['file']) && $call['file'] == $file && $call['line'] == $line)) {
+			if ($i < $ignoreByNumber || (isset($call['file']) && $call['file'] == $file && $call['line'] == $line)) {
 				unset($trace[$i]);
 			}
 		}
 
 		$traceCalls = array();
-		foreach(array_reverse($trace) as $call) {
+		foreach (array_reverse($trace) as $call) {
 			$args = array();
-			if(isset($call['args'])) {
-				foreach($call['args'] as $arg) {
-					if(is_object($arg)) {
+			if (isset($call['args'])) {
+				foreach ($call['args'] as $arg) {
+					if (is_object($arg)) {
 						$args[] = get_class($arg);
 					}
-					elseif(is_array($arg)) {
+					elseif (is_array($arg)) {
 						$args[] = 'Array[' . count($arg) . ']';
 					}
 					else {
@@ -100,16 +100,16 @@ 
 				}
 			}
 
-			if(strpos($call['function'], '{closure}')) {
+			if (strpos($call['function'], '{closure}')) {
 				$call['function'] = '{closure}';
 			}
 
 			$traceCall = new TraceCall();
 			$traceCall->call = (isset($call['class']) ? $call['class'] . $call['type'] : '') . $call['function'] . '(' . implode(', ', $args) . ')';
-			if(isset($call['file'])) {
+			if (isset($call['file'])) {
 				$traceCall->file = $call['file'];
 			}
-			if(isset($call['line'])) {
+			if (isset($call['line'])) {
 				$traceCall->line = $call['line'];
 			}
 			$traceCalls[] = $traceCall;

Braces +2 added lines, -4 removed lines

@@ -89,11 +89,9 @@
 				foreach($call['args'] as $arg) {
 					if(is_object($arg)) {
 						$args[] = get_class($arg);
-					}
-					elseif(is_array($arg)) {
+					} elseif(is_array($arg)) {
 						$args[] = 'Array[' . count($arg) . ']';
-					}
-					else {
+					} else {
 						$arg = var_export($arg, 1);
 						$args[] = strlen($arg) > 15 ? substr($arg, 0, 15) . '...\'' : $arg;
 					}

src/PhpConsole/Dumper.php

Spacing +27 added lines, -27 removed lines

@@ -61,24 +61,24 @@ 
 		$refQueue = array(),
 		$levelsQueue = array();
 
-		if($rootCall) {
-			$sizeLeft = $this->dumpSizeLimit ? : 999999999;
+		if ($rootCall) {
+			$sizeLeft = $this->dumpSizeLimit ?: 999999999;
 		}
 
-		if(is_object($data)) {
-			if($data instanceof \Closure) {
+		if (is_object($data)) {
+			if ($data instanceof \Closure) {
 				$data = '(callback function)';
 				return;
 			}
-			if($rootCall) {
+			if ($rootCall) {
 				$data = array('' => $data);
 				return $this->dumpVarData($data, $levelLimit + 1);
 			}
 			$objectsHashes[] = spl_object_hash($data);
 			$dataArray = array();
-			foreach((array)$data as $key => $value) {
+			foreach ((array)$data as $key => $value) {
 				$nullPos = strrpos($key, chr(0));
-				if($nullPos) {
+				if ($nullPos) {
 					$dataArray[substr($key, $nullPos + 1)] = $value;
 				}
 				else {
@@ -88,9 +88,9 @@ 
 			$data = $dataArray;
 		}
 
-		if(is_array($data)) {
+		if (is_array($data)) {
 
-			if($this->detectCallbacks && count($data) == 2 && is_callable($data)) {
+			if ($this->detectCallbacks && count($data) == 2 && is_callable($data)) {
 				list($class, $method) = $data;
 				$data = '(callback ' . (is_object($class) ? get_class($class) : $class) . '::' . $method . ')';
 				$sizeLeft -= strlen($data) + 4;
@@ -99,20 +99,20 @@ 
 
 			$i = 0;
 			$dataArray = array();
-			foreach($data as $k => &$v) {
-				if(($this->itemsCountLimit && $i >= $this->itemsCountLimit) || $sizeLeft <= 0) {
+			foreach ($data as $k => &$v) {
+				if (($this->itemsCountLimit && $i >= $this->itemsCountLimit) || $sizeLeft <= 0) {
 					break;
 				}
-				if(is_array($v) || is_object($v)) {
-					if($levelLimit > 1) {
+				if (is_array($v) || is_object($v)) {
+					if ($levelLimit > 1) {
 						$origQueue[] = $v;
-						$refQueue[] =& $v;
+						$refQueue[] = & $v;
 						$levelsQueue[] = $levelLimit;
 					}
-					if(is_object($v) && !$v instanceof \Closure) {
+					if (is_object($v) && !$v instanceof \Closure) {
 						$k .= ':' . get_class($v);
 						$hash = spl_object_hash($v);
-						if(in_array($hash, $objectsHashes)) {
+						if (in_array($hash, $objectsHashes)) {
 							$v = '*RECURSION*';
 						}
 						else {
@@ -129,50 +129,50 @@ 
 					$sizeLeft -= strlen($k) + 4;
 					$this->dumpVarData($v, $levelLimit - 1, false);
 				}
-				$dataArray[$k] =& $v;
+				$dataArray[$k] = & $v;
 				$i++;
 			}
 
-			if($i != count($data)) {
+			if ($i != count($data)) {
 				$dataArray['...'] = '(displayed ' . $i . ' of ' . count($data) . ')';
 			}
 			$data = $dataArray;
 
-			if(!$rootCall) {
+			if (!$rootCall) {
 				return;
 			}
 
 			do {
 				$origData = array_shift($origQueue);
 				$level = array_shift($levelsQueue);
-				$refData =& $refQueue[0];
+				$refData = & $refQueue[0];
 				array_shift($refQueue);
 				$sizeLeft += strlen($refData);
-				if($refData !== '*RECURSION*') {
+				if ($refData !== '*RECURSION*') {
 					$this->dumpVarData($origData, $level - 1, false);
 					$refData = $origData;
 				}
 			}
-			while(count($origQueue) && $sizeLeft >= 0);
+			while (count($origQueue) && $sizeLeft >= 0);
 
-			if($rootCall) {
+			if ($rootCall) {
 				$levelsQueue = $origQueue = $refQueue = $objectsHashes = array();
 			}
 		}
 		// scalar or resource
 		else {
-			if(!is_scalar($data) && $data !== null) {
-				if(is_resource($data)) {
+			if (!is_scalar($data) && $data !== null) {
+				if (is_resource($data)) {
 					$data = '(' . strtolower((string)$data) . ' ' . get_resource_type($data) . ')';
 					$sizeLeft -= strlen($data);
 					return;
 				}
 				$data = var_export($data, true);
 			}
-			if(strlen($data) > $this->itemSizeLimit) {
+			if (strlen($data) > $this->itemSizeLimit) {
 				$data = substr($data, 0, $this->itemSizeLimit - 3) . '...';
 			}
-			if(strlen($data) > $sizeLeft) {
+			if (strlen($data) > $sizeLeft) {
 				$data = substr($data, 0, $sizeLeft - 3) . '...';
 			}
 			$sizeLeft -= strlen($data);

Braces +4 added lines, -8 removed lines

@@ -80,8 +80,7 @@ 
 				$nullPos = strrpos($key, chr(0));
 				if($nullPos) {
 					$dataArray[substr($key, $nullPos + 1)] = $value;
-				}
-				else {
+				} else {
 					$dataArray[$key] = $value;
 				}
 			}
@@ -114,18 +113,15 @@ 
 						$hash = spl_object_hash($v);
 						if(in_array($hash, $objectsHashes)) {
 							$v = '*RECURSION*';
-						}
-						else {
+						} else {
 							$v = '(object)';
 							$objectsHashes[] = $hash;
 						}
-					}
-					else {
+					} else {
 						$v = '(array)';
 					}
 					$sizeLeft -= strlen($k) + strlen($v) + 8;
-				}
-				else {
+				} else {
 					$sizeLeft -= strlen($k) + 4;
 					$this->dumpVarData($v, $levelLimit - 1, false);
 				}

src/PhpConsole/Connector.php

Braces +1 added lines, -2 removed lines

@@ -393,8 +393,7 @@
 			}
 			if($isMbString) {
 				$string = @mb_convert_encoding($string, $toEncoding, $fromEncoding) ? : $string;
-			}
-			else {
+			} else {
 				$string = @iconv($fromEncoding, $toEncoding . '//IGNORE', $string) ? : $string;
 			}
 			if(!$string && $toEncoding == 'UTF-8') {

Spacing +53 added lines, -53 removed lines

@@ -64,7 +64,7 @@ 
 	 * @return static
 	 */
 	public static function getInstance() {
-		if(!self::$instance) {
+		if (!self::$instance) {
 			self::$instance = new static();
 		}
 		return self::$instance;
@@ -77,7 +77,7 @@ 
 	 * @throws \Exception
 	 */
 	public static function setPostponeStorage(Storage $storage) {
-		if(self::$instance) {
+		if (self::$instance) {
 			throw new \Exception(__METHOD__ . ' can be called only before ' . __CLASS__ . '::getInstance()');
 		}
 		self::$postponeStorage = $storage;
@@ -87,7 +87,7 @@ 
 	 * @return Storage
 	 */
 	private function getPostponeStorage() {
-		if(!self::$postponeStorage) {
+		if (!self::$postponeStorage) {
 			self::$postponeStorage = new Storage\Session();
 		}
 		return self::$postponeStorage;
@@ -95,7 +95,7 @@ 
 
 	protected function __construct() {
 		$this->initConnection();
-		$this->setServerEncoding(ini_get('mbstring.internal_encoding') ? : self::CLIENT_ENCODING);
+		$this->setServerEncoding(ini_get('mbstring.internal_encoding') ?: self::CLIENT_ENCODING);
 	}
 
 	private final function __clone() {
@@ -114,14 +114,14 @@ 
 	 * @throws \Exception
 	 */
 	private function initConnection() {
-		if($this->isCliMode()) {
+		if ($this->isCliMode()) {
 			return;
 		}
 
 		$this->initServerCookie();
 		$this->client = $this->initClient();
 
-		if($this->client) {
+		if ($this->client) {
 			ob_start();
 			$this->isActiveClient = true;
 			$this->registerFlushOnShutDown();
@@ -140,14 +140,14 @@ 
 	 * @throws \Exception
 	 */
 	private function initClient() {
-		if(isset($_COOKIE[self::CLIENT_INFO_COOKIE])) {
+		if (isset($_COOKIE[self::CLIENT_INFO_COOKIE])) {
 			$clientData = @json_decode(base64_decode($_COOKIE[self::CLIENT_INFO_COOKIE], true), true);
-			if(!$clientData) {
+			if (!$clientData) {
 				throw new \Exception('Wrong format of response cookie data: ' . $_COOKIE[self::CLIENT_INFO_COOKIE]);
 			}
 
 			$client = new Client($clientData);
-			if(isset($clientData['auth'])) {
+			if (isset($clientData['auth'])) {
 				$client->auth = new ClientAuth($clientData['auth']);
 			}
 			return $client;
@@ -159,9 +159,9 @@ 
 	 * @throws \Exception
 	 */
 	private function initServerCookie() {
-		if(!isset($_COOKIE[self::SERVER_COOKIE]) || $_COOKIE[self::SERVER_COOKIE] != self::SERVER_PROTOCOL) {
+		if (!isset($_COOKIE[self::SERVER_COOKIE]) || $_COOKIE[self::SERVER_COOKIE] != self::SERVER_PROTOCOL) {
 			$isSuccess = setcookie(self::SERVER_COOKIE, self::SERVER_PROTOCOL, null, '/');
-			if(!$isSuccess) {
+			if (!$isSuccess) {
 				throw new \Exception('Unable to set PHP Console server cookie');
 			}
 		}
@@ -195,11 +195,11 @@ 
 	 * @param array $ipMasks Use *(star character) for "any numbers" placeholder array('192.168.*.*', '10.2.12*.*', '127.0.0.1', '2001:0:5ef5:79fb:*:*:*:*')
 	 */
 	public function setAllowedIpMasks(array $ipMasks) {
-		if($this->isActiveClient()) {
-			if(isset($_SERVER['REMOTE_ADDR'])) {
+		if ($this->isActiveClient()) {
+			if (isset($_SERVER['REMOTE_ADDR'])) {
 				$ip = $_SERVER['REMOTE_ADDR'];
-				foreach($ipMasks as $ipMask) {
-					if(preg_match('~^' . str_replace(array('.', '*'), array('\.', '\w+'), $ipMask) . '$~i', $ip)) {
+				foreach ($ipMasks as $ipMask) {
+					if (preg_match('~^' . str_replace(array('.', '*'), array('\.', '\w+'), $ipMask) . '$~i', $ip)) {
 						return;
 					}
 				}
@@ -212,7 +212,7 @@ 
 	 * @return Dumper
 	 */
 	public function getDumper() {
-		if(!$this->dumper) {
+		if (!$this->dumper) {
 			$this->dumper = new Dumper();
 		}
 		return $this->dumper;
@@ -231,7 +231,7 @@ 
 	 * @return Dispatcher\Errors
 	 */
 	public function getErrorsDispatcher() {
-		if(!$this->errorsDispatcher) {
+		if (!$this->errorsDispatcher) {
 			$this->errorsDispatcher = new Dispatcher\Errors($this, $this->getDumper());
 		}
 		return $this->errorsDispatcher;
@@ -250,7 +250,7 @@ 
 	 * @return Dispatcher\Debug
 	 */
 	public function getDebugDispatcher() {
-		if(!$this->debugDispatcher) {
+		if (!$this->debugDispatcher) {
 			$this->debugDispatcher = new Dispatcher\Debug($this, $this->getDumper());
 		}
 		return $this->debugDispatcher;
@@ -269,7 +269,7 @@ 
 	 * @return Dispatcher\Evaluate
 	 */
 	public function getEvalDispatcher() {
-		if(!$this->evalDispatcher) {
+		if (!$this->evalDispatcher) {
 			$this->evalDispatcher = new Dispatcher\Evaluate($this, new EvalProvider(), $this->getDumper());
 		}
 		return $this->evalDispatcher;
@@ -285,32 +285,32 @@ 
 	 * @throws \Exception
 	 */
 	public function startEvalRequestsListener($exitOnEval = true, $flushDebugMessages = true) {
-		if(!$this->auth) {
+		if (!$this->auth) {
 			throw new \Exception('Eval dispatcher is allowed only in password protected mode. See PhpConsole\Connector::getInstance()->setPassword(...)');
 		}
-		if($this->isEvalListenerStarted) {
+		if ($this->isEvalListenerStarted) {
 			throw new \Exception('Eval requests listener already started');
 		}
 		$this->isEvalListenerStarted = true;
 
-		if($this->isActiveClient() && $this->isAuthorized() && isset($_POST[Connector::POST_VAR_NAME]['eval'])) {
+		if ($this->isActiveClient() && $this->isAuthorized() && isset($_POST[Connector::POST_VAR_NAME]['eval'])) {
 			$request = $_POST[Connector::POST_VAR_NAME]['eval'];
-			if(!isset($request['data']) || !isset($request['signature'])) {
+			if (!isset($request['data']) || !isset($request['signature'])) {
 				throw new \Exception('Wrong PHP Console eval request');
 			}
-			if($this->auth->getSignature($request['data']) !== $request['signature']) {
+			if ($this->auth->getSignature($request['data']) !== $request['signature']) {
 				throw new \Exception('Wrong PHP Console eval request signature');
 			}
-			if($flushDebugMessages) {
-				foreach($this->messages as $i => $message) {
-					if($message instanceof DebugMessage) {
+			if ($flushDebugMessages) {
+				foreach ($this->messages as $i => $message) {
+					if ($message instanceof DebugMessage) {
 						unset($this->messages[$i]);
 					}
 				}
 			}
 			$this->convertEncoding($request['data'], $this->serverEncoding, self::CLIENT_ENCODING);
 			$this->getEvalDispatcher()->dispatchCode($request['data']);
-			if($exitOnEval) {
+			if ($exitOnEval) {
 				exit;
 			}
 		}
@@ -323,7 +323,7 @@ 
 	 */
 	public function setSourcesBasePath($sourcesBasePath) {
 		$sourcesBasePath = realpath($sourcesBasePath);
-		if(!$sourcesBasePath) {
+		if (!$sourcesBasePath) {
 			throw new \Exception('Path "' . $sourcesBasePath . '" not found');
 		}
 		$this->sourcesBasePath = $sourcesBasePath;
@@ -338,12 +338,12 @@ 
 	 * @throws \Exception
 	 */
 	public function setPassword($password, $publicKeyByIp = true) {
-		if($this->auth) {
+		if ($this->auth) {
 			throw new \Exception('Password already defined');
 		}
 		$this->convertEncoding($password, self::CLIENT_ENCODING, $this->serverEncoding);
 		$this->auth = new Auth($password, $publicKeyByIp);
-		if($this->client) {
+		if ($this->client) {
 			$this->isAuthorized = $this->client->auth && $this->auth->isValidAuth($this->client->auth);
 		}
 	}
@@ -386,18 +386,18 @@ 
 	 * @throws \Exception
 	 */
 	protected function convertEncoding(&$string, $toEncoding, $fromEncoding) {
-		if($string && is_string($string) && $toEncoding != $fromEncoding) {
+		if ($string && is_string($string) && $toEncoding != $fromEncoding) {
 			static $isMbString;
-			if($isMbString === null) {
+			if ($isMbString === null) {
 				$isMbString = extension_loaded('mbstring');
 			}
-			if($isMbString) {
-				$string = @mb_convert_encoding($string, $toEncoding, $fromEncoding) ? : $string;
+			if ($isMbString) {
+				$string = @mb_convert_encoding($string, $toEncoding, $fromEncoding) ?: $string;
 			}
 			else {
-				$string = @iconv($fromEncoding, $toEncoding . '//IGNORE', $string) ? : $string;
+				$string = @iconv($fromEncoding, $toEncoding . '//IGNORE', $string) ?: $string;
 			}
-			if(!$string && $toEncoding == 'UTF-8') {
+			if (!$string && $toEncoding == 'UTF-8') {
 				$string = utf8_encode($string);
 			}
 		}
@@ -409,7 +409,7 @@ 
 	 * @throws \Exception
 	 */
 	public function setHeadersLimit($bytes) {
-		if($bytes < static::PHP_HEADERS_SIZE) {
+		if ($bytes < static::PHP_HEADERS_SIZE) {
 			throw new \Exception('Headers limit cannot be less then ' . __CLASS__ . '::PHP_HEADERS_SIZE');
 		}
 		$bytes -= static::PHP_HEADERS_SIZE;
@@ -421,7 +421,7 @@ 
 	 * @param $encoding
 	 */
 	public function setServerEncoding($encoding) {
-		if($encoding == 'utf8' || $encoding == 'utf-8') {
+		if ($encoding == 'utf8' || $encoding == 'utf-8') {
 			$encoding = 'UTF-8'; // otherwise mb_convert_encoding() sometime fails with error(thanks to @alexborisov)
 		}
 		$this->serverEncoding = $encoding;
@@ -432,7 +432,7 @@ 
 	 * @param Message $message
 	 */
 	public function sendMessage(Message $message) {
-		if($this->isActiveClient()) {
+		if ($this->isActiveClient()) {
 			$this->messages[] = $message;
 		}
 	}
@@ -450,7 +450,7 @@ 
 	 */
 	public function onShutDown() {
 		$this->registeredShutDowns--;
-		if(!$this->registeredShutDowns) {
+		if (!$this->registeredShutDowns) {
 			$this->proceedResponsePackage();
 		}
 	}
@@ -475,19 +475,19 @@ 
 	 * @throws \Exception
 	 */
 	private function proceedResponsePackage() {
-		if($this->isActiveClient()) {
+		if ($this->isActiveClient()) {
 			$response = new Response();
 			$response->isSslOnlyMode = $this->isSslOnlyMode;
 
-			if(isset($_POST[self::POST_VAR_NAME]['getBackData'])) {
+			if (isset($_POST[self::POST_VAR_NAME]['getBackData'])) {
 				$response->getBackData = $_POST[self::POST_VAR_NAME]['getBackData'];
 			}
 
-			if(!$this->isSslOnlyMode || $this->isSsl()) {
-				if($this->auth) {
+			if (!$this->isSslOnlyMode || $this->isSsl()) {
+				if ($this->auth) {
 					$response->auth = $this->auth->getServerAuthStatus($this->client->auth);
 				}
-				if(!$this->auth || $this->isAuthorized()) {
+				if (!$this->auth || $this->isAuthorized()) {
 					$response->isLocal = isset($_SERVER['REMOTE_ADDR']) && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1' || $_SERVER['REMOTE_ADDR'] == '::1');
 					$response->docRoot = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : null;
 					$response->sourcesBasePath = $this->sourcesBasePath;
@@ -498,7 +498,7 @@ 
 
 			$responseData = $this->serializeResponse($response);
 
-			if(strlen($responseData) > $this->headersLimit || !$this->setHeaderData($responseData, self::HEADER_NAME, false)) {
+			if (strlen($responseData) > $this->headersLimit || !$this->setHeaderData($responseData, self::HEADER_NAME, false)) {
 				$this->getPostponeStorage()->push($this->postponeResponseId, $responseData);
 			}
 		}
@@ -515,8 +515,8 @@ 
 	}
 
 	private function setHeaderData($responseData, $headerName, $throwException = true) {
-		if(headers_sent($file, $line)) {
-			if($throwException) {
+		if (headers_sent($file, $line)) {
+			if ($throwException) {
 				throw new \Exception('Unable to process response data, headers already sent in ' . $file . ':' . $line . '. Try to use ob_start() and don\'t use flush().');
 			}
 			return false;
@@ -526,14 +526,14 @@ 
 	}
 
 	protected function objectToArray(&$var) {
-		if(is_object($var)) {
+		if (is_object($var)) {
 			$var = get_object_vars($var);
 			array_walk_recursive($var, array($this, 'objectToArray'));
 		}
 	}
 
 	protected function serializeResponse(DataObject $response) {
-		if($this->serverEncoding != self::CLIENT_ENCODING) {
+		if ($this->serverEncoding != self::CLIENT_ENCODING) {
 			$this->objectToArray($response);
 			$this->convertArrayEncoding($response, self::CLIENT_ENCODING, $this->serverEncoding);
 		}
@@ -544,7 +544,7 @@ 
 	 * Check if there is postponed response request and dispatch it
 	 */
 	private function listenGetPostponedResponse() {
-		if(isset($_POST[self::POST_VAR_NAME]['getPostponedResponse'])) {
+		if (isset($_POST[self::POST_VAR_NAME]['getPostponedResponse'])) {
 			header('Content-Type: application/json; charset=' . self::CLIENT_ENCODING);
 			echo $this->getPostponeStorage()->pop($_POST[self::POST_VAR_NAME]['getPostponedResponse']);
 			$this->disable();
@@ -556,7 +556,7 @@ 
 abstract class DataObject {
 
 	public function __construct(array $properties = array()) {
-		foreach($properties as $property => $value) {
+		foreach ($properties as $property => $value) {
 			$this->$property = $value;
 		}
 	}