pradosoft / prado

framework/Web/Services/TFeedService.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 				{
 					$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);
 				}

Braces +11 added lines, -14 removed lines

@@ -77,11 +77,11 @@ 
 		{
 			if(is_array($config))
 			{
-				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+				foreach($config as $id => $feed) {
+									$this->_feeds[$id] = $feed;
+				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -122,11 +122,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,22 +132,21 @@ 
 					$feed = Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
-				}
-				else
+				} else
 					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
 			// init feed properties
-			foreach($properties as $name => $value)
-				$feed->setSubproperty($name, $value);
+			foreach($properties as $name => $value) {
+							$feed->setSubproperty($name, $value);
+			}
 			$feed->init($feedConfig);
 
 			$content = $feed->getFeedContent();
 			//$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/TRpcApiProvider.php

Braces +3 added lines, -2 removed lines

@@ -63,8 +63,9 @@
 	{
 		$this->rpcServer = $rpcServer;
 
-		foreach($this->registerMethods() as $_methodName => $_methodDetails)
-			$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
+		foreach($this->registerMethods() as $_methodName => $_methodDetails) {
+					$this->rpcServer->addRpcMethod($_methodName, $_methodDetails);
+		}
 	}
 
 	/**

framework/Web/Services/TSoapService.php

Spacing +2 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
 			{
 				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;
@@ -256,7 +256,7 @@ 
 		if($serverClass === null)
 			$serverClass = self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className = ($pos = strrpos($serverClass, '.')) !== false?substr($serverClass, $pos + 1):$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))
 			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
 		$server = new $className;

Braces +7 added lines, -10 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)
 			{
@@ -261,8 +258,9 @@ 
 			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
 		$server = new $className;
 		$server->setID($this->_serverID);
-		foreach($properties as $name => $value)
-			$server->setSubproperty($name, $value);
+		foreach($properties as $name => $value) {
+					$server->setSubproperty($name, $value);
+		}
 		return $server;
 	}
 
@@ -284,8 +282,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

Braces +8 added lines, -10 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());
@@ -172,8 +170,10 @@ 
 			$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
+			foreach(preg_split('/\s*,\s*/', $this->_classMap) as $className) {
+							$options['classmap'][$className] = $className;
+			}
+			//complex type uses the class name in the wsdl
 		}
 		return $options;
 	}
@@ -200,13 +200,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);
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 		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->setClass($providerClass, $this);
@@ -190,7 +190,7 @@ 
 		if($this->_wsdlUri === '')
 		{
 			$provider = $this->getProvider();
-			$providerClass = ($pos = strrpos($provider, '.')) !== false?substr($provider, $pos + 1):$provider;
+			$providerClass = ($pos = strrpos($provider, '.')) !== false ?substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
 			if($this->getApplication()->getMode() === TApplicationMode::Performance && ($cache = $this->getApplication()->getCache()) !== null)
 			{

framework/Web/Services/TJsonService.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 					$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

Braces +12 added lines, -16 removed lines

@@ -84,11 +84,11 @@ 
 		{
 			if(is_array($config))
 			{
-				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+				foreach($config['json'] as $id => $json) {
+									$this->_services[$id] = $json;
+				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
@@ -119,14 +119,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 +133,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);
 	}
 
@@ -152,8 +147,9 @@ 
 	protected function createJsonResponse($service, $properties, $config)
 	{
 		// init service properties
-		foreach($properties as $name => $value)
-			$service->setSubproperty($name, $value);
+		foreach($properties as $name => $value) {
+					$service->setSubproperty($name, $value);
+		}
 		$service->init($config);
 
 		//send content if not null

framework/Web/Javascripts/TJavaScriptLiteral.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 	public function __toString()
 	{
-		return (string)$this->_s;
+		return (string) $this->_s;
 	}
 
 	public function toJavaScriptLiteral()

framework/Web/Javascripts/TJavaScript.php

Braces +9 added lines, -10 removed lines

@@ -34,8 +34,9 @@ 
 	public static function renderScriptFiles($files)
 	{
 		$str = '';
-		foreach($files as $file)
-			$str .= self::renderScriptFile($file);
+		foreach($files as $file) {
+					$str .= self::renderScriptFile($file);
+		}
 		return $str;
 	}
 
@@ -160,8 +161,7 @@ 
 					}
 				}
 				return '{' . $results . '}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
@@ -174,8 +174,7 @@ 
 				}
 				return '[' . $results . ']';
 			}
-		}
-		elseif(is_int($value))
+		} elseif(is_int($value))
 			return "$value";
 		elseif(is_float($value))
 		{
@@ -195,8 +194,7 @@ 
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
-		}
-		elseif(is_object($value))
+		} elseif(is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
@@ -234,8 +232,9 @@ 
 			$value = iconv($sourceEncoding, 'UTF-8', $value);
 		elseif (is_array($value))
 		{
-			foreach($value as &$element)
-				self::convertToUtf8($element, $sourceEncoding);
+			foreach($value as &$element) {
+							self::convertToUtf8($element, $sourceEncoding);
+			}
 		}
 	}
 

Spacing +5 added lines, -5 removed lines

@@ -144,7 +144,7 @@ 
 		if(is_string($value))
 			return self::quoteString($value);
 		elseif(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		elseif(is_array($value))
 		{
 			$results = '';
@@ -197,7 +197,7 @@ 
 			}
 		}
 		elseif(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
 				return self::encode(get_object_vars($value), $toMap);
@@ -214,7 +214,7 @@ 
 	 */
 	public static function jsonEncode($value, $options = 0)
 	{
-		if (($g = Prado::getApplication()->getGlobalization(false)) !== null &&
+		if(($g = Prado::getApplication()->getGlobalization(false)) !== null &&
 			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
@@ -232,7 +232,7 @@ 
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
 			$value = iconv($sourceEncoding, 'UTF-8', $value);
-		elseif (is_array($value))
+		elseif(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
@@ -256,7 +256,7 @@ 
 
 	private static function checkJsonError()
 	{
-		switch ($err = json_last_error())
+		switch($err = json_last_error())
 		{
 			case JSON_ERROR_NONE:
 				return;

framework/Web/THttpUtility.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 class THttpUtility
 {
-	private static $_encodeTable = ['<' => '&lt;','>' => '&gt;','"' => '&quot;'];
-	private static $_decodeTable = ['&lt;' => '<','&gt;' => '>','&quot;' => '"'];
-	private static $_stripTable = ['&lt;' => '','&gt;' => '','&quot;' => ''];
+	private static $_encodeTable = ['<' => '&lt;', '>' => '&gt;', '"' => '&quot;'];
+	private static $_decodeTable = ['&lt;' => '<', '&gt;' => '>', '&quot;' => '"'];
+	private static $_stripTable = ['&lt;' => '', '&gt;' => '', '&quot;' => ''];
 
 	/**
 	 * HTML-encodes a string.

framework/Web/UI/TClientSideOptions.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
+		if($this->_options)
 			return $this->_options->itemAt($name);
 		else
 			return null;
@@ -73,7 +73,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (!$this->_options)
+		if(!$this->_options)
 			$this->_options = new TMap;
 		return $this->_options;
 	}