pradosoft / prado

framework/Web/Services/TJsonResponse.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
  */
 abstract class TJsonResponse extends \Prado\TApplicationComponent
 {
-	private $_id = '';
+	private $_id='';
 
 	/**
 	 * Initializes the feed.
@@ -49,7 +49,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**

framework/Web/Services/TRpcService.php

Spacing +24 added lines, -24 removed lines

@@ -63,17 +63,17 @@ 
 	/**
 	 * const string base api provider class which every API must extend
 	 */
-	const BASE_API_PROVIDER = 'TRpcApiProvider';
+	const BASE_API_PROVIDER='TRpcApiProvider';
 
 	/**
 	 * const string base RPC server implementation
 	 */
-	const BASE_RPC_SERVER = 'TRpcServer';
+	const BASE_RPC_SERVER='TRpcServer';
 
 	/**
 	 * @var array containing mimetype to protocol handler mappings
 	 */
-	protected $protocolHandlers = [
+	protected $protocolHandlers=[
 		'application/json' => 'TJsonRpcProtocol',
 		'text/xml' => 'TXmlRpcProtocol'
 	];
@@ -81,7 +81,7 @@ 
 	/**
 	 * @var array containing API provider and their configured properties
 	 */
-	protected $apiProviders = [];
+	protected $apiProviders=[];
 
 	// methods
 
@@ -92,27 +92,27 @@ 
 	 */
 	public function createApiProvider(TRpcProtocol $protocolHandler, $providerId)
 	{
-		$_properties = $this->apiProviders[$providerId];
+		$_properties=$this->apiProviders[$providerId];
 
-		if(($_providerClass = $_properties->remove('class')) === null)
+		if(($_providerClass=$_properties->remove('class'))===null)
 			throw new TConfigurationException('rpcservice_apiprovider_required');
 
 		Prado::using($_providerClass);
 
-		$_providerClassName = ($_pos = strrpos($_providerClass, '.')) !== false ? substr($_providerClass, $_pos + 1) : $_providerClass;
+		$_providerClassName=($_pos=strrpos($_providerClass, '.'))!==false ? substr($_providerClass, $_pos + 1) : $_providerClass;
 		if(!is_subclass_of($_providerClassName, self::BASE_API_PROVIDER))
 			throw new TConfigurationException('rpcservice_apiprovider_invalid');
 
-		if(($_rpcServerClass = $_properties->remove('server')) === null)
-			$_rpcServerClass = self::BASE_RPC_SERVER;
+		if(($_rpcServerClass=$_properties->remove('server'))===null)
+			$_rpcServerClass=self::BASE_RPC_SERVER;
 
 		Prado::using($_rpcServerClass);
 
-		$_rpcServerClassName = ($_pos = strrpos($_rpcServerClass, '.')) !== false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
-		if($_rpcServerClassName !== self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
+		$_rpcServerClassName=($_pos=strrpos($_rpcServerClass, '.'))!==false ? substr($_rpcServerClass, $_pos + 1) : $_rpcServerClass;
+		if($_rpcServerClassName!==self::BASE_RPC_SERVER && !is_subclass_of($_rpcServerClassName, self::BASE_RPC_SERVER))
 			throw new TConfigurationException('rpcservice_rpcserver_invalid');
 
-		$_apiProvider = new $_providerClassName(new $_rpcServerClassName($protocolHandler));
+		$_apiProvider=new $_providerClassName(new $_rpcServerClassName($protocolHandler));
 		$_apiProvider->setId($providerId);
 
 		foreach($_properties as $_key => $_value)
@@ -138,15 +138,15 @@ 
 	{
 		foreach($xml->getElementsByTagName('rpcapi') as $_apiProviderXml)
 		{
-			$_properties = $_apiProviderXml->getAttributes();
+			$_properties=$_apiProviderXml->getAttributes();
 
-			if(($_id = $_properties->remove('id')) === null || $_id == "")
+			if(($_id=$_properties->remove('id'))===null || $_id=="")
 				throw new TConfigurationException('rpcservice_apiproviderid_required');
 
 			if(isset($this->apiProviders[$_id]))
 				throw new TConfigurationException('rpcservice_apiproviderid_duplicated');
 
-			$this->apiProviders[$_id] = $_properties;
+			$this->apiProviders[$_id]=$_properties;
 		}
 	}
 
@@ -155,26 +155,26 @@ 
 	 */
 	public function run()
 	{
-		$_request = $this->getRequest();
+		$_request=$this->getRequest();
 
-		if(($_providerId = $_request->getServiceParameter()) == "")
+		if(($_providerId=$_request->getServiceParameter())=="")
 			throw new THttpException(400, 'RPC API-Provider id required');
 		
-		if(($_method = $_request->getRequestType()) != 'POST')
-			throw new THttpException(405, 'Invalid request method "' . $_method . '"!'); // TODO Exception muss "Allow POST" Header setzen
+		if(($_method=$_request->getRequestType())!='POST')
+			throw new THttpException(405, 'Invalid request method "'.$_method.'"!'); // TODO Exception muss "Allow POST" Header setzen
 
-		if(($_mimeType = $_request->getContentType()) === null)
+		if(($_mimeType=$_request->getContentType())===null)
 			throw new THttpException(406, 'Content-Type is missing!'); // TODO Exception muss gültige Content-Type werte zurück geben
 
 		if(!in_array($_mimeType, array_keys($this->protocolHandlers)))
 			throw new THttpException(406, 'Unsupported Content-Type!'); // TODO see previous
 
-		$_protocolHandlerClass = $this->protocolHandlers[$_mimeType];
-		$_protocolHandler = new $_protocolHandlerClass;
+		$_protocolHandlerClass=$this->protocolHandlers[$_mimeType];
+		$_protocolHandler=new $_protocolHandlerClass;
 
-		if(($_result = $this->createApiProvider($_protocolHandler, $_providerId)->processRequest()) !== null)
+		if(($_result=$this->createApiProvider($_protocolHandler, $_providerId)->processRequest())!==null)
 		{
-			$_response = $this->getResponse();
+			$_response=$this->getResponse();
 			$_protocolHandler->createResponseHeaders($_response);
 			$_response->write($_result);
 		}

framework/Web/Services/TFeedService.php

Spacing +16 added lines, -16 removed lines

@@ -64,7 +64,7 @@ 
  */
 class TFeedService extends \Prado\TService
 {
-	private $_feeds = [];
+	private $_feeds=[];
 
 	/**
 	 * Initializes this module.
@@ -73,20 +73,20 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(is_array($config))
 			{
 				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+					$this->_feeds[$id]=$feed;
 			}
 		}
 		else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
-				if(($id = $feed->getAttributes()->remove('id')) !== null)
-					$this->_feeds[$id] = $feed;
+				if(($id=$feed->getAttributes()->remove('id'))!==null)
+					$this->_feeds[$id]=$feed;
 				else
 					throw new TConfigurationException('feedservice_id_required');
 			}
@@ -107,19 +107,19 @@ 
 	 */
 	public function run()
 	{
-		$id = $this->getRequest()->getServiceParameter();
+		$id=$this->getRequest()->getServiceParameter();
 		if(isset($this->_feeds[$id]))
 		{
-			$feedConfig = $this->_feeds[$id];
-			$properties = [];
-			$feed = null;
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			$feedConfig=$this->_feeds[$id];
+			$properties=[];
+			$feed=null;
+			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($feedConfig['class']))
 				{
-					$feed = Prado::createComponent($feedConfig['class']);
+					$feed=Prado::createComponent($feedConfig['class']);
 					if($service instanceof IFeedContentProvider)
-						$properties = isset($feedConfig['properties'])?$feedConfig['properties']:[];
+						$properties=isset($feedConfig['properties']) ? $feedConfig['properties'] : [];
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
@@ -128,10 +128,10 @@ 
 			}
 			else
 			{
-				$properties = $feedConfig->getAttributes();
-				if(($class = $properties->remove('class')) !== null)
+				$properties=$feedConfig->getAttributes();
+				if(($class=$properties->remove('class'))!==null)
 				{
-					$feed = Prado::createComponent($class);
+					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
@@ -144,7 +144,7 @@ 
 				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 
-			$content = $feed->getFeedContent();
+			$content=$feed->getFeedContent();
 			//$this->getResponse()->setContentType('application/rss+xml');
 			$this->getResponse()->setContentType($feed->getContentType());
 			$this->getResponse()->write($content);

Braces +5 added lines, -10 removed lines

@@ -80,8 +80,7 @@ 
 				foreach($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -122,11 +121,9 @@ 
 						$properties = isset($feedConfig['properties'])?$feedConfig['properties']:[];
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required', $id);
-			}
-			else
+			} else
 			{
 				$properties = $feedConfig->getAttributes();
 				if(($class = $properties->remove('class')) !== null)
@@ -134,8 +131,7 @@ 
 					$feed = Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
-				}
-				else
+				} else
 					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
@@ -148,8 +144,7 @@ 
 			//$this->getResponse()->setContentType('application/rss+xml');
 			$this->getResponse()->setContentType($feed->getContentType());
 			$this->getResponse()->write($content);
-		}
-		else
+		} else
 			throw new THttpException(404, 'feedservice_feed_unknown', $id);
 	}
 }
\ No newline at end of file

framework/Web/Services/TJsonRpcProtocol.php

Spacing +15 added lines, -15 removed lines

@@ -27,7 +27,7 @@ 
 class TJsonRpcProtocol extends TRpcProtocol
 {
 	protected $_id;
-	protected $_specificationVersion = 1.0;
+	protected $_specificationVersion=1.0;
 
 	/**
 	 * Handles the RPC request
@@ -38,33 +38,33 @@ 
 	{
 		try
 		{
-			$_request = $this->decode($requestPayload);
+			$_request=$this->decode($requestPayload);
 
 			if(isset($_request['jsonrpc']))
 			{
-				$this->_specificationVersion = $_request['jsonrpc'];
+				$this->_specificationVersion=$_request['jsonrpc'];
 				if($this->_specificationVersion > 2.0)
 					throw new TRpcException('Unsupported specification version', '-32600');
 			}
 
 			if(isset($_request['id']))
-				$this->_id = $_request['id'];
+				$this->_id=$_request['id'];
 
 			if(!isset($_request['method']))
 					throw new TRpcException('Missing request method', '-32600');
 
 			if(!isset($_request['params']))
-				$parameters = [];
+				$parameters=[];
 			else
-				$parameters = $_request['params'];
+				$parameters=$_request['params'];
 
 			if(!is_array($parameters))
-				$parameters = [$parameters];
+				$parameters=[$parameters];
 
 			// a request without an id is a notification that doesn't need a response
-			if($this->_id !== null)
+			if($this->_id!==null)
 			{
-				if($this->_specificationVersion == 2.0)
+				if($this->_specificationVersion==2.0)
 				{
 					return $this->encode([
 						'jsonrpc' => '2.0',
@@ -101,7 +101,7 @@ 
 	 */
 	public function createErrorResponse(TRpcException $exception)
 	{
-		if($this->_specificationVersion == 2.0)
+		if($this->_specificationVersion==2.0)
 		{
 			return $this->encode([
 				'id' => $this->_id,
@@ -141,7 +141,7 @@ 
 	 */
 	public function decode($data)
 	{
-		$s = json_decode($data, true);
+		$s=json_decode($data, true);
 		self::checkJsonError();
 		return $s;
 	}
@@ -153,15 +153,15 @@ 
 	 */
 	public function encode($data)
 	{
-		$s = json_encode($data);
+		$s=json_encode($data);
 		self::checkJsonError();
 		return $s;
 	}
 
 	private static function checkJsonError()
 	{
-		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
+		$errnum=json_last_error();
+		if($errnum!=JSON_ERROR_NONE)
 			throw new \Exception("JSON error: $msg", $err);
 	}
 
@@ -175,7 +175,7 @@ 
 	public function callApiMethod($methodName, $parameters)
 	{
 		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "' . $methodName . '" not found', '-32601');
+			throw new TRpcException('Method "'.$methodName.'" not found', '-32601');
 
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}

framework/Web/Services/TSoapService.php

Spacing +31 added lines, -31 removed lines

@@ -96,10 +96,10 @@ 
  */
 class TSoapService extends \Prado\TService
 {
-	const DEFAULT_SOAP_SERVER = 'Prado\Web\Services\TSoapServer';
-	private $_servers = [];
+	const DEFAULT_SOAP_SERVER='Prado\Web\Services\TSoapServer';
+	private $_servers=[];
 	private $_configFile;
-	private $_wsdlRequest = false;
+	private $_wsdlRequest=false;
 	private $_serverID;
 
 	/**
@@ -119,11 +119,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_configFile !== null)
+		if($this->_configFile!==null)
 		{
 			if(is_file($this->_configFile))
 			{
-				$dom = new TXmlDocument;
+				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
 			}
@@ -144,15 +144,15 @@ 
 	 */
 	protected function resolveRequest()
 	{
-		$serverID = $this->getRequest()->getServiceParameter();
-		if(($pos = strrpos($serverID, '.wsdl')) === strlen($serverID) - 5)
+		$serverID=$this->getRequest()->getServiceParameter();
+		if(($pos=strrpos($serverID, '.wsdl'))===strlen($serverID) - 5)
 		{
-			$serverID = substr($serverID, 0, $pos);
-			$this->_wsdlRequest = true;
+			$serverID=substr($serverID, 0, $pos);
+			$this->_wsdlRequest=true;
 		}
 		else
-			$this->_wsdlRequest = false;
-		$this->_serverID = $serverID;
+			$this->_wsdlRequest=false;
+		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
 			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
 	}
@@ -164,16 +164,16 @@ 
 	 */
 	private function loadConfig($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(is_array($config))
 			{
 				foreach($config['soap'] as $id => $server)
 				{
-					$properties = isset($server['properties'])?$server['properties']:[];
+					$properties=isset($server['properties']) ? $server['properties'] : [];
 					if(isset($this->_servers[$id]))
 						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
-					$this->_servers[$id] = $properties;
+					$this->_servers[$id]=$properties;
 				}
 			}
 		}
@@ -181,12 +181,12 @@ 
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
-				$properties = $serverXML->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				$properties=$serverXML->getAttributes();
+				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('soapservice_serverid_required');
 				if(isset($this->_servers[$id]))
 					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
-				$this->_servers[$id] = $properties;
+				$this->_servers[$id]=$properties;
 			}
 		}
 	}
@@ -206,7 +206,7 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt())) === null)
+		if(($this->_configFile=Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt()))===null)
 			throw new TConfigurationException('soapservice_configfile_invalid', $value);
 	}
 
@@ -218,7 +218,7 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($serverID, $getParams = null, $encodeAmpersand = true, $encodeGetItems = true)
+	public function constructUrl($serverID, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
 		return $this->getRequest()->constructUrl($this->getID(), $serverID, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
@@ -247,19 +247,19 @@ 
 	 */
 	protected function createServer()
 	{
-		$properties = $this->_servers[$this->_serverID];
-		$serverClass = null;
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP && isset($config['class']))
-			$serverClass = $config['class'];
-		elseif($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML)
-			$serverClass = $properties->remove('class');
-		if($serverClass === null)
-			$serverClass = self::DEFAULT_SOAP_SERVER;
+		$properties=$this->_servers[$this->_serverID];
+		$serverClass=null;
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP && isset($config['class']))
+			$serverClass=$config['class'];
+		elseif($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_XML)
+			$serverClass=$properties->remove('class');
+		if($serverClass===null)
+			$serverClass=self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className = ($pos = strrpos($serverClass, '.')) !== false?substr($serverClass, $pos + 1):$serverClass;
-		if($className !== self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
+		$className=($pos=strrpos($serverClass, '.'))!==false ?substr($serverClass, $pos + 1) : $serverClass;
+		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
 			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
-		$server = new $className;
+		$server=new $className;
 		$server->setID($this->_serverID);
 		foreach($properties as $name => $value)
 			$server->setSubproperty($name, $value);
@@ -275,7 +275,7 @@ 
 	public function run()
 	{
 		Prado::trace("Running SOAP service", 'Prado\Web\Services\TSoapService');
-		$server = $this->createServer();
+		$server=$this->createServer();
 		$this->getResponse()->setContentType('text/xml');
 		$this->getResponse()->setCharset($server->getEncoding());
 		if($this->getIsWsdlRequest())

Braces +4 added lines, -8 removed lines

@@ -126,8 +126,7 @@ 
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
-			}
-			else
+			} else
 				throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -149,8 +148,7 @@ 
 		{
 			$serverID = substr($serverID, 0, $pos);
 			$this->_wsdlRequest = true;
-		}
-		else
+		} else
 			$this->_wsdlRequest = false;
 		$this->_serverID = $serverID;
 		if(!isset($this->_servers[$serverID]))
@@ -176,8 +174,7 @@ 
 					$this->_servers[$id] = $properties;
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
@@ -284,8 +281,7 @@ 
 			Prado::trace("Generating WSDL", 'Prado\Web\Services\TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
-		}
-		else
+		} else
 		{
 			// provide SOAP service
 			Prado::trace("Handling SOAP request", 'Prado\Web\Services\TSoapService');

framework/Web/Services/TSoapServer.php

Spacing +55 added lines, -55 removed lines

@@ -31,18 +31,18 @@ 
  */
 class TSoapServer extends \Prado\TApplicationComponent
 {
-	const WSDL_CACHE_PREFIX = 'wsdl.';
+	const WSDL_CACHE_PREFIX='wsdl.';
 
 	private $_id;
 	private $_provider;
 
-	private $_version = '';
-	private $_actor = '';
-	private $_encoding = '';
-	private $_uri = '';
+	private $_version='';
+	private $_actor='';
+	private $_encoding='';
+	private $_uri='';
 	private $_classMap;
-	private $_persistent = false;
-	private $_wsdlUri = '';
+	private $_persistent=false;
+	private $_wsdlUri='';
 
 	private $_requestedMethod;
 
@@ -62,9 +62,9 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id, '.wsdl') === strlen($this->_id) - 5)
+		if(strrpos($this->_id, '.wsdl')===strlen($this->_id) - 5)
 			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
-		$this->_id = $id;
+		$this->_id=$id;
 	}
 
 	/**
@@ -72,25 +72,25 @@ 
 	 */
 	public function run()
 	{
-		if(($provider = $this->getProvider()) !== null)
+		if(($provider=$this->getProvider())!==null)
 		{
 			Prado::using($provider);
-			$providerClass = ($pos = strrpos($provider, '.')) !== false?substr($provider, $pos + 1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ?substr($provider, $pos + 1) : $provider;
 			$this->guessMethodCallRequested($providerClass);
-			$server = $this->createServer();
+			$server=$this->createServer();
 			$server->setClass($providerClass, $this);
 			if($this->_persistent)
 				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
 		}
 		else
-			$server = $this->createServer();
+			$server=$this->createServer();
 		try
 		{
 			$server->handle();
 		}
-		catch (\Exception $e)
+		catch(\Exception $e)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
+			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
 			else
 				$this->fault($e->getMessage());
@@ -105,9 +105,9 @@ 
 	 * @param string actors
 	 * @param string message name
 	 */
-	public function fault($title, $details = '', $code = 'SERVER', $actor = '', $name = '')
+	public function fault($title, $details='', $code='SERVER', $actor='', $name='')
 	{
-		Prado::trace('SOAP-Fault ' . $code . ' ' . $title . ' : ' . $details, 'Prado\Web\Services\TSoapService');
+		Prado::trace('SOAP-Fault '.$code.' '.$title.' : '.$details, 'Prado\Web\Services\TSoapService');
 		$this->_server->fault($code, $title, $actor, $details, $name);
 	}
 
@@ -118,14 +118,14 @@ 
 	 */
 	protected function guessMethodCallRequested($class)
 	{
-		$namespace = $class . 'wsdl';
-		$message = file_get_contents("php://input");
-		$matches = [];
-		if(preg_match('/xmlns:([^=]+)="urn:' . $namespace . '"/', $message, $matches))
+		$namespace=$class.'wsdl';
+		$message=file_get_contents("php://input");
+		$matches=[];
+		if(preg_match('/xmlns:([^=]+)="urn:'.$namespace.'"/', $message, $matches))
 		{
-			if(preg_match('/<' . $matches[1] . ':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
+			if(preg_match('/<'.$matches[1].':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
 			{
-				$this->_requestedMethod = $method[1];
+				$this->_requestedMethod=$method[1];
 			}
 		}
 	}
@@ -145,11 +145,11 @@ 
 	 */
 	protected function createServer()
 	{
-		if($this->_server === null)
+		if($this->_server===null)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
+			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				ini_set("soap.wsdl_cache_enabled", 0);
-			$this->_server = new \SoapServer($this->getWsdlUri(), $this->getOptions());
+			$this->_server=new \SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
 		return $this->_server;
 	}
@@ -159,21 +159,21 @@ 
 	 */
 	protected function getOptions()
 	{
-		$options = [];
-		if($this->_version === '1.1')
-			$options['soap_version'] = SOAP_1_1;
-		elseif($this->_version === '1.2')
-			$options['soap_version'] = SOAP_1_2;
+		$options=[];
+		if($this->_version==='1.1')
+			$options['soap_version']=SOAP_1_1;
+		elseif($this->_version==='1.2')
+			$options['soap_version']=SOAP_1_2;
 		if(!empty($this->_actor))
-			$options['actor'] = $this->_actor;
+			$options['actor']=$this->_actor;
 		if(!empty($this->_encoding))
-			$options['encoding'] = $this->_encoding;
+			$options['encoding']=$this->_encoding;
 		if(!empty($this->_uri))
-			$options['uri'] = $this->_uri;
+			$options['uri']=$this->_uri;
 		if(is_string($this->_classMap))
 		{
 			foreach(preg_split('/\s*,\s*/', $this->_classMap) as $className)
-				$options['classmap'][$className] = $className; //complex type uses the class name in the wsdl
+				$options['classmap'][$className]=$className; //complex type uses the class name in the wsdl
 		}
 		return $options;
 	}
@@ -187,18 +187,18 @@ 
 	 */
 	public function getWsdl()
 	{
-		if($this->_wsdlUri === '')
+		if($this->_wsdlUri==='')
 		{
-			$provider = $this->getProvider();
-			$providerClass = ($pos = strrpos($provider, '.')) !== false?substr($provider, $pos + 1):$provider;
+			$provider=$this->getProvider();
+			$providerClass=($pos=strrpos($provider, '.'))!==false ?substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
-			if($this->getApplication()->getMode() === TApplicationMode::Performance && ($cache = $this->getApplication()->getCache()) !== null)
+			if($this->getApplication()->getMode()===TApplicationMode::Performance && ($cache=$this->getApplication()->getCache())!==null)
 			{
-				$wsdl = $cache->get(self::WSDL_CACHE_PREFIX . $providerClass);
+				$wsdl=$cache->get(self::WSDL_CACHE_PREFIX.$providerClass);
 				if(is_string($wsdl))
 					return $wsdl;
-				$wsdl = WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
-				$cache->set(self::WSDL_CACHE_PREFIX . $providerClass, $wsdl);
+				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
+				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass, $wsdl);
 				return $wsdl;
 			}
 			else
@@ -215,8 +215,8 @@ 
 	 */
 	public function getWsdlUri()
 	{
-		if($this->_wsdlUri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID() . '.wsdl', false);
+		if($this->_wsdlUri==='')
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl', false);
 		else
 			return $this->_wsdlUri;
 	}
@@ -226,7 +226,7 @@ 
 	 */
 	public function setWsdlUri($value)
 	{
-		$this->_wsdlUri = $value;
+		$this->_wsdlUri=$value;
 	}
 
 	/**
@@ -234,8 +234,8 @@ 
 	 */
 	public function getUri()
 	{
-		if($this->_uri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID(), false);
+		if($this->_uri==='')
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(), false);
 		else
 			return $this->_uri;
 	}
@@ -245,7 +245,7 @@ 
 	 */
 	public function setUri($uri)
 	{
-		$this->_uri = $uri;
+		$this->_uri=$uri;
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	 */
 	public function setProvider($provider)
 	{
-		$this->_provider = $provider;
+		$this->_provider=$provider;
 	}
 
 	/**
@@ -278,8 +278,8 @@ 
 	 */
 	public function setVersion($value)
 	{
-		if($value === '1.1' || $value === '1.2' || $value === '')
-			$this->_version = $value;
+		if($value==='1.1' || $value==='1.2' || $value==='')
+			$this->_version=$value;
 		else
 			throw new TInvalidDataValueException('soapserver_version_invalid', $value);
 	}
@@ -297,7 +297,7 @@ 
 	 */
 	public function setActor($value)
 	{
-		$this->_actor = $value;
+		$this->_actor=$value;
 	}
 
 	/**
@@ -313,7 +313,7 @@ 
 	 */
 	public function setEncoding($value)
 	{
-		$this->_encoding = $value;
+		$this->_encoding=$value;
 	}
 
 	/**
@@ -329,7 +329,7 @@ 
 	 */
 	public function setSessionPersistent($value)
 	{
-		$this->_persistent = TPropertyValue::ensureBoolean($value);
+		$this->_persistent=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -345,6 +345,6 @@ 
 	 */
 	public function setClassMaps($classes)
 	{
-		$this->_classMap = $classes;
+		$this->_classMap=$classes;
 	}
 }
\ No newline at end of file

Braces +4 added lines, -8 removed lines

@@ -81,14 +81,12 @@ 
 			$server->setClass($providerClass, $this);
 			if($this->_persistent)
 				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
-		}
-		else
+		} else
 			$server = $this->createServer();
 		try
 		{
 			$server->handle();
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			if($this->getApplication()->getMode() === TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -200,13 +198,11 @@ 
 				$wsdl = WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 				$cache->set(self::WSDL_CACHE_PREFIX . $providerClass, $wsdl);
 				return $wsdl;
-			}
-			else
+			} else
 			{
 				return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 			}
-		}
-		else
+		} else
 			return file_get_contents($this->_wsdlUri);
 	}
 

framework/Web/Services/TPageConfiguration.php

Spacing +91 added lines, -91 removed lines

@@ -36,23 +36,23 @@ 
 	/**
 	 * @var array list of application configurations
 	 */
-	private $_appConfigs = [];
+	private $_appConfigs=[];
 	/**
 	 * @var array list of page initial property values
 	 */
-	private $_properties = [];
+	private $_properties=[];
 	/**
 	 * @var TAuthorizationRuleCollection list of authorization rules
 	 */
-	private $_rules = [];
+	private $_rules=[];
 	/**
 	 * @var array list of included configurations
 	 */
-	private $_includes = [];
+	private $_includes=[];
 	/**
 	 * @var string the currently request page in the format of Path.To.PageName
 	 */
-	private $_pagePath = '';
+	private $_pagePath='';
 
 	/**
 	 * Constructor.
@@ -60,7 +60,7 @@ 
 	 */
 	public function __construct($pagePath)
 	{
-		$this->_pagePath = $pagePath;
+		$this->_pagePath=$pagePath;
 	}
 
 	/**
@@ -107,24 +107,24 @@ 
 	 */
 	public function loadFromFiles($basePath)
 	{
-		$paths = explode('.', $this->_pagePath);
-		$page = array_pop($paths);
-		$path = $basePath;
-		$configPagePath = '';
-		$fileName = Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
+		$paths=explode('.', $this->_pagePath);
+		$page=array_pop($paths);
+		$path=$basePath;
+		$configPagePath='';
+		$fileName=Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
 		foreach($paths as $p)
 		{
-			$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
-			$path .= DIRECTORY_SEPARATOR . $p;
-			if($configPagePath === '')
-				$configPagePath = $p;
+			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
+			$path.=DIRECTORY_SEPARATOR.$p;
+			if($configPagePath==='')
+				$configPagePath=$p;
 			else
-				$configPagePath .= '.' . $p;
+				$configPagePath.='.'.$p;
 		}
-		$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
-		$this->_rules = new TAuthorizationRuleCollection($this->_rules);
+		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
+		$this->_rules=new TAuthorizationRuleCollection($this->_rules);
 	}
 
 	/**
@@ -138,14 +138,14 @@ 
 		if(empty($fname) || !is_file($fname))
 			return;
 
-		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
-			$fcontent = include $fname;
+			$fcontent=include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
 		}
 		else
 		{
-			$dom = new TXmlDocument;
+			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
 				$this->loadFromXml($dom, dirname($fname), $configPagePath);
 			else
@@ -175,9 +175,9 @@ 
 
 	public function loadApplicationConfigurationFromPhp($config, $configPath)
 	{
-		$appConfig = new TApplicationConfiguration;
+		$appConfig=new TApplicationConfiguration;
 		$appConfig->loadFromPhp($config, $configPath);
-		$this->_appConfigs[] = $appConfig;
+		$this->_appConfigs[]=$appConfig;
 	}
 
 	/**
@@ -187,9 +187,9 @@ 
 	 */
 	public function loadApplicationConfigurationFromXml($dom, $configPath)
 	{
-		$appConfig = new TApplicationConfiguration;
+		$appConfig=new TApplicationConfiguration;
 		$appConfig->loadFromXml($dom, $configPath);
-		$this->_appConfigs[] = $appConfig;
+		$this->_appConfigs[]=$appConfig;
 	}
 
 	public function loadPageConfigurationFromPhp($config, $configPath, $configPagePath)
@@ -197,32 +197,32 @@ 
 		// authorization
 		if(isset($config['authorization']) && is_array($config['authorization']))
 		{
-			$rules = [];
+			$rules=[];
 			foreach($config['authorization'] as $authorization)
 			{
-				$patterns = isset($authorization['pages'])?$authorization['pages']:'';
-				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
-					$ruleApplies = true;
+				$patterns=isset($authorization['pages']) ? $authorization['pages'] : '';
+				$ruleApplies=false;
+				if(empty($patterns) || trim($patterns)==='*') // null or empty string
+					$ruleApplies=true;
 				else
 				{
 					foreach(explode(',', $patterns) as $pattern)
 					{
-						if(($pattern = trim($pattern)) !== '')
+						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
-								$pattern = $configPagePath . '.' . $pattern;
-							if(strcasecmp($pattern, $this->_pagePath) === 0)
+							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
+								$pattern=$configPagePath.'.'.$pattern;
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
-								$ruleApplies = true;
+								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1]==='*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
-									$ruleApplies = true;
+									$ruleApplies=true;
 									break;
 								}
 							}
@@ -231,40 +231,40 @@ 
 				}
 				if($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
-					$rules[] = new TAuthorizationRule($action, $users, $roles, $verb, $ips);
+					$action=isset($authorization['action']) ? $authorization['action'] : '';
+					$users=isset($authorization['users']) ? $authorization['users'] : '';
+					$roles=isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb=isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips=isset($authorization['ips']) ? $authorization['ips'] : '';
+					$rules[]=new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
-			$this->_rules = array_merge($rules, $this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 		// pages
 		if(isset($config['pages']) && is_array($config['pages']))
 		{
 			if(isset($config['pages']['properties']))
 			{
-				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
+				$this->_properties=array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
 			foreach($config['pages'] as $id => $page)
 			{
-				$properties = [];
+				$properties=[];
 				if(isset($page['properties']))
 				{
-					$properties = $page['properties'];
+					$properties=$page['properties'];
 					unset($page['properties']);
 				}
-				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
-					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
-					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				$matching=false;
+				$id=($configPagePath==='') ? $id : $configPagePath.'.'.$id;
+				if(strcasecmp($id, $this->_pagePath)===0)
+					$matching=true;
+				elseif($id[strlen($id) - 1]==='*') // try wildcard matching
+					$matching=strncasecmp($this->_pagePath, $id, strlen($id) - 1)===0;
 				if($matching)
-					$this->_properties = array_merge($this->_properties, $properties);
+					$this->_properties=array_merge($this->_properties, $properties);
 			}
 		}
 
@@ -273,14 +273,14 @@ 
 		{
 			foreach($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
+				$when=isset($include['when']) ?true:false;
 				if(!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
-				$filePath = $include['file'];
+				$filePath=$include['file'];
 				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+					$this->_includes[$filePath]=[$configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')'];
 				else
-					$this->_includes[$filePath] = [$configPagePath,$when];
+					$this->_includes[$filePath]=[$configPagePath, $when];
 			}
 		}
 	}
@@ -294,34 +294,34 @@ 
 	public function loadPageConfigurationFromXml($dom, $configPath, $configPagePath)
 	{
 		// authorization
-		if(($authorizationNode = $dom->getElementByTagName('authorization')) !== null)
+		if(($authorizationNode=$dom->getElementByTagName('authorization'))!==null)
 		{
-			$rules = [];
+			$rules=[];
 			foreach($authorizationNode->getElements() as $node)
 			{
-				$patterns = $node->getAttribute('pages');
-				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
-					$ruleApplies = true;
+				$patterns=$node->getAttribute('pages');
+				$ruleApplies=false;
+				if(empty($patterns) || trim($patterns)==='*') // null or empty string
+					$ruleApplies=true;
 				else
 				{
 					foreach(explode(',', $patterns) as $pattern)
 					{
-						if(($pattern = trim($pattern)) !== '')
+						if(($pattern=trim($pattern))!=='')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
-								$pattern = $configPagePath . '.' . $pattern;
-							if(strcasecmp($pattern, $this->_pagePath) === 0)
+							if($configPagePath!=='')  // prepend the pattern with ConfigPagePath
+								$pattern=$configPagePath.'.'.$pattern;
+							if(strcasecmp($pattern, $this->_pagePath)===0)
 							{
-								$ruleApplies = true;
+								$ruleApplies=true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1]==='*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
+								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1)===0)
 								{
-									$ruleApplies = true;
+									$ruleApplies=true;
 									break;
 								}
 							}
@@ -329,44 +329,44 @@ 
 					}
 				}
 				if($ruleApplies)
-					$rules[] = new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
+					$rules[]=new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
 			}
-			$this->_rules = array_merge($rules, $this->_rules);
+			$this->_rules=array_merge($rules, $this->_rules);
 		}
 
 		// pages
-		if(($pagesNode = $dom->getElementByTagName('pages')) !== null)
+		if(($pagesNode=$dom->getElementByTagName('pages'))!==null)
 		{
-			$this->_properties = array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
+			$this->_properties=array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
 			// at the page folder
 			foreach($pagesNode->getElementsByTagName('page') as $node)
 			{
-				$properties = $node->getAttributes();
-				$id = $properties->remove('id');
+				$properties=$node->getAttributes();
+				$id=$properties->remove('id');
 				if(empty($id))
 					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
-				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
-					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
-					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
+				$matching=false;
+				$id=($configPagePath==='') ? $id : $configPagePath.'.'.$id;
+				if(strcasecmp($id, $this->_pagePath)===0)
+					$matching=true;
+				elseif($id[strlen($id) - 1]==='*') // try wildcard matching
+					$matching=strncasecmp($this->_pagePath, $id, strlen($id) - 1)===0;
 				if($matching)
-					$this->_properties = array_merge($this->_properties, $properties->toArray());
+					$this->_properties=array_merge($this->_properties, $properties->toArray());
 			}
 		}
 
 		// external configurations
 		foreach($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when = $node->getAttribute('when')) === null)
-				$when = true;
-			if(($filePath = $node->getAttribute('file')) === null)
+			if(($when=$node->getAttribute('when'))===null)
+				$when=true;
+			if(($filePath=$node->getAttribute('file'))===null)
 				throw new TConfigurationException('pageserviceconf_includefile_required');
 			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+				$this->_includes[$filePath]=[$configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')'];
 			else
-				$this->_includes[$filePath] = [$configPagePath,$when];
+				$this->_includes[$filePath]=[$configPagePath, $when];
 		}
 	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
 			if($dom->loadFromFile($fname))

framework/Web/Services/TJsonService.php

Spacing +15 added lines, -15 removed lines

@@ -62,7 +62,7 @@ 
 	/**
 	 * @var array registered services
 	 */
-	private $_services = [];
+	private $_services=[];
 
 	/**
 	 * Initializes this module.
@@ -80,20 +80,20 @@ 
 	 */
 	protected function loadJsonServices($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(is_array($config))
 			{
 				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+					$this->_services[$id]=$json;
 			}
 		}
 		else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
-				if(($id = $json->getAttribute('id')) !== null)
-					$this->_services[$id] = $json;
+				if(($id=$json->getAttribute('id'))!==null)
+					$this->_services[$id]=$json;
 				else
 					throw new TConfigurationException('jsonservice_id_required');
 			}
@@ -106,18 +106,18 @@ 
 	 */
 	public function run()
 	{
-		$id = $this->getRequest()->getServiceParameter();
+		$id=$this->getRequest()->getServiceParameter();
 		if(isset($this->_services[$id]))
 		{
-			$serviceConfig = $this->_services[$id];
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			$serviceConfig=$this->_services[$id];
+			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($serviceConfig['class']))
 				{
-					$service = Prado::createComponent($serviceConfig['class']);
+					$service=Prado::createComponent($serviceConfig['class']);
 					if($service instanceof TJsonResponse)
 					{
-						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:[];
+						$properties=isset($serviceConfig['properties']) ? $serviceConfig['properties'] : [];
 						$this->createJsonResponse($service, $properties, $serviceConfig);
 					}
 					else
@@ -128,10 +128,10 @@ 
 			}
 			else
 			{
-				$properties = $serviceConfig->getAttributes();
-				if(($class = $properties->remove('class')) !== null)
+				$properties=$serviceConfig->getAttributes();
+				if(($class=$properties->remove('class'))!==null)
 				{
-					$service = Prado::createComponent($class);
+					$service=Prado::createComponent($class);
 					if($service instanceof TJsonResponse)
 						$this->createJsonResponse($service, $properties, $serviceConfig);
 					else
@@ -157,9 +157,9 @@ 
 		$service->init($config);
 
 		//send content if not null
-		if(($content = $service->getJsonContent()) !== null)
+		if(($content=$service->getJsonContent())!==null)
 		{
-			$response = $this->getResponse();
+			$response=$this->getResponse();
 			$response->setContentType('application/json');
 			$response->setCharset('UTF-8');
 			//send content

Braces +6 added lines, -12 removed lines

@@ -87,8 +87,7 @@ 
 				foreach($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
@@ -119,14 +118,11 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:[];
 						$this->createJsonResponse($service, $properties, $serviceConfig);
-					}
-					else
+					} else
 						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required', $id);
-			}
-			else
+			} else
 			{
 				$properties = $serviceConfig->getAttributes();
 				if(($class = $properties->remove('class')) !== null)
@@ -136,12 +132,10 @@ 
 						$this->createJsonResponse($service, $properties, $serviceConfig);
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
-		}
-		else
+		} else
 			throw new THttpException(404, 'jsonservice_provider_unknown', $id);
 	}
 

framework/Web/THttpCookie.php

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * @var string domain of the cookie
 	 */
-	private $_domain = '';
+	private $_domain='';
 	/**
 	 * @var string name of the cookie
 	 */
@@ -36,23 +36,23 @@ 
 	/**
 	 * @var string value of the cookie
 	 */
-	private $_value = '';
+	private $_value='';
 	/**
 	 * @var integer expire of the cookie
 	 */
-	private $_expire = 0;
+	private $_expire=0;
 	/**
 	 * @var string path of the cookie
 	 */
-	private $_path = '/';
+	private $_path='/';
 	/**
 	 * @var boolean whether cookie should be sent via secure connection
 	 */
-	private $_secure = false;
+	private $_secure=false;
 	/**
 	 * @var boolean if true the cookie value will be unavailable to JavaScript
 	 */
-	private $_httpOnly = false;
+	private $_httpOnly=false;
 
 	/**
 	 * Constructor.
@@ -61,8 +61,8 @@ 
 	 */
 	public function __construct($name, $value)
 	{
-		$this->_name = $name;
-		$this->_value = $value;
+		$this->_name=$name;
+		$this->_value=$value;
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setDomain($value)
 	{
-		$this->_domain = $value;
+		$this->_domain=$value;
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setExpire($value)
 	{
-		$this->_expire = TPropertyValue::ensureInteger($value);
+		$this->_expire=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function setHttpOnly($value)
 	{
-		$this->_httpOnly = TPropertyValue::ensureBoolean($value);
+		$this->_httpOnly=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_name = $value;
+		$this->_name=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value = $value;
+		$this->_value=$value;
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	public function setPath($value)
 	{
-		$this->_path = $value;
+		$this->_path=$value;
 	}
 
 	/**
@@ -174,6 +174,6 @@ 
 	 */
 	public function setSecure($value)
 	{
-		$this->_secure = TPropertyValue::ensureBoolean($value);
+		$this->_secure=TPropertyValue::ensureBoolean($value);
 	}
 }
\ No newline at end of file