barbushin / php-console

src/PhpConsole/Connector.php

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';
 					$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;
 		}
 	}