pradosoft / prado

framework/Data/SqlMap/TSqlMapConfig.php

Doc Comments +1 added lines

@@ -77,6 +77,7 @@
 
 	/**
 	 * Saves the current SqlMap manager to cache.
+	 * @param TSqlMapManager $manager
 	 * @return boolean true if SqlMap manager was cached, false otherwise.
 	 */
 	protected function cacheSqlMapManager($manager)

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
-		}
-		elseif($this->getConnectionID() !== '') {
+		} elseif($this->getConnectionID() !== '') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;

Spacing +24 added lines, -24 removed lines

@@ -31,19 +31,19 @@ 
 {
 	private $_configFile;
 	private $_sqlmap;
-	private $_enableCache = false;
+	private $_enableCache=false;
 
 	/**
 	 * File extension of external configuration file
 	 */
-	const CONFIG_FILE_EXT = '.xml';
+	const CONFIG_FILE_EXT='.xml';
 
 	/**
 	 * @return string module ID + configuration file path.
 	 */
 	private function getCacheKey()
 	{
-		return $this->getID() . $this->getConfigFile();
+		return $this->getID().$this->getConfigFile();
 	}
 
 	/**
@@ -51,8 +51,8 @@ 
 	 */
 	public function clearCache()
 	{
-		$cache = $this->getApplication()->getCache();
-		if($cache !== null) {
+		$cache=$this->getApplication()->getCache();
+		if($cache!==null) {
 			$cache->delete($this->getCacheKey());
 		}
 	}
@@ -66,16 +66,16 @@ 
 	 * @since 3.1.7
 	 */
 	public function getSqlMapManager() {
-		if(($manager = $this->loadCachedSqlMapManager()) === null)
+		if(($manager=$this->loadCachedSqlMapManager())===null)
 		{
-			$manager = new TSqlMapManager($this->getDbConnection());
-			if(strlen($file = $this->getConfigFile()) > 0)
+			$manager=new TSqlMapManager($this->getDbConnection());
+			if(strlen($file=$this->getConfigFile()) > 0)
 			{
 				$manager->configureXml($file);
 				$this->cacheSqlMapManager($manager);
 			}
 		}
-		elseif($this->getConnectionID() !== '') {
+		elseif($this->getConnectionID()!=='') {
 			$manager->setDbConnection($this->getDbConnection());
 		}
 		return $manager;
@@ -89,11 +89,11 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null) {
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					$dependencies = $manager->getCacheDependencies();
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null) {
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					$dependencies=$manager->getCacheDependencies();
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
 		}
@@ -108,10 +108,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TSqlMapManager)
 					return $manager;
 			}
@@ -135,14 +135,14 @@ 
 	public function setConfigFile($value)
 	{
 		if(is_file($value))
-			$this->_configFile = $value;
+			$this->_configFile=$value;
 		else
 		{
-			$file = Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
-			if($file === null || !is_file($file))
+			$file=Prado::getPathOfNamespace($value, self::CONFIG_FILE_EXT);
+			if($file===null || !is_file($file))
 				throw new TConfigurationException('sqlmap_configfile_invalid', $value);
 			else
-				$this->_configFile = $file;
+				$this->_configFile=$file;
 		}
 	}
 
@@ -152,7 +152,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -177,8 +177,8 @@ 
 	 */
 	public function getClient()
 	{
-		if($this->_sqlmap === null)
-			$this->_sqlmap = $this->createSqlMapGateway();
+		if($this->_sqlmap===null)
+			$this->_sqlmap=$this->createSqlMapGateway();
 		return $this->_sqlmap;
 	}
 }

framework/Data/TDataSourceConfig.php

Doc Comments +1 added lines

@@ -149,6 +149,7 @@
 	/**
 	 * Finds the database connection instance from the Application modules.
 	 * @param string Database connection module ID.
+	 * @param string $id
 	 * @return TDbConnection database connection.
 	 * @throws TConfigurationException when module is not of TDbConnection or TDataSourceConfig.
 	 */

Spacing +14 added lines, -14 removed lines

@@ -50,9 +50,9 @@ 
  */
 class TDataSourceConfig extends \Prado\TModule
 {
-	private $_connID = '';
+	private $_connID='';
 	private $_conn;
-	private $_connClass = 'System.Data.TDbConnection';
+	private $_connClass='System.Data.TDbConnection';
 
 	/**
 	 * Initalize the database connection properties from attributes in <database> tag.
@@ -60,20 +60,20 @@ 
 	 */
 	public function init($xml)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(isset($xml['database']) && is_array($xml['database']))
 			{
-				$db = $this->getDbConnection();
+				$db=$this->getDbConnection();
 				foreach($xml['database'] as $name => $value)
 					$db->setSubProperty($name, $value);
 			}
 		}
 		else
 		{
-			if($prop = $xml->getElementByTagName('database'))
+			if($prop=$xml->getElementByTagName('database'))
 			{
-				$db = $this->getDbConnection();
+				$db=$this->getDbConnection();
 				foreach($prop->getAttributes() as $name => $value)
 					$db->setSubproperty($name, $value);
 			}
@@ -88,7 +88,7 @@ 
 	 */
 	public function setConnectionID($value)
 	{
-		$this->_connID = $value;
+		$this->_connID=$value;
 	}
 
 	/**
@@ -107,12 +107,12 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn === null)
+		if($this->_conn===null)
 		{
-			if($this->_connID !== '')
-				$this->_conn = $this->findConnectionByID($this->getConnectionID());
+			if($this->_connID!=='')
+				$this->_conn=$this->findConnectionByID($this->getConnectionID());
 			else
-				$this->_conn = Prado::createComponent($this->getConnectionClass());
+				$this->_conn=Prado::createComponent($this->getConnectionClass());
 		}
 		return $this->_conn;
 	}
@@ -145,9 +145,9 @@ 
 	 */
 	public function setConnectionClass($value)
 	{
-		if($this->_conn !== null)
+		if($this->_conn!==null)
 			throw new TConfigurationException('datasource_dbconnection_exists', $value);
-		$this->_connClass = $value;
+		$this->_connClass=$value;
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	protected function findConnectionByID($id)
 	{
-		$conn = $this->getApplication()->getModule($id);
+		$conn=$this->getApplication()->getModule($id);
 		if($conn instanceof TDbConnection)
 			return $conn;
 		elseif($conn instanceof TDataSourceConfig)

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
 				foreach($xml['database'] as $name => $value)
 					$db->setSubProperty($name, $value);
 			}
-		}
-		else
+		} else
 		{
 			if($prop = $xml->getElementByTagName('database'))
 			{

framework/Data/TDbConnection.php

Doc Comments +4 added lines

@@ -157,6 +157,7 @@ 
 	/**
 	 * Open or close the DB connection.
 	 * @param boolean whether to open or close DB connection
+	 * @param boolean $value
 	 * @throws TDbException if connection fails
 	 */
 	public function setActive($value)
@@ -241,6 +242,7 @@ 
 
 	/**
 	 * @param string The Data Source Name, or DSN, contains the information required to connect to the database.
+	 * @param string $value
 	 * @see http://www.php.net/manual/en/function.PDO-construct.php
 	 */
 	public function setConnectionString($value)
@@ -258,6 +260,7 @@ 
 
 	/**
 	 * @param string the username for establishing DB connection
+	 * @param string $value
 	 */
 	public function setUsername($value)
 	{
@@ -274,6 +277,7 @@ 
 
 	/**
 	 * @param string the password for establishing DB connection
+	 * @param string $value
 	 */
 	public function setPassword($value)
 	{

Spacing +45 added lines, -45 removed lines

@@ -92,14 +92,14 @@ 
 	 *
 	 * @since 3.1.7
 	 */
-	const DEFAULT_TRANSACTION_CLASS = 'System.Data.TDbTransaction';
-
-	private $_dsn = '';
-	private $_username = '';
-	private $_password = '';
-	private $_charset = '';
-	private $_attributes = [];
-	private $_active = false;
+	const DEFAULT_TRANSACTION_CLASS='System.Data.TDbTransaction';
+
+	private $_dsn='';
+	private $_username='';
+	private $_password='';
+	private $_charset='';
+	private $_attributes=[];
+	private $_active=false;
 	private $_pdo;
 	private $_transaction;
 
@@ -112,7 +112,7 @@ 
 	 * @var string
 	 * @since 3.1.7
 	 */
-	private $_transactionClass = self::DEFAULT_TRANSACTION_CLASS;
+	private $_transactionClass=self::DEFAULT_TRANSACTION_CLASS;
 
 	/**
 	 * Constructor.
@@ -127,12 +127,12 @@ 
 	 * @param string Charset used for DB Connection (MySql & pgsql only). If not set, will use the default charset of your database server
 	 * @see http://www.php.net/manual/en/function.PDO-construct.php
 	 */
-	public function __construct($dsn = '', $username = '', $password = '', $charset = '')
+	public function __construct($dsn='', $username='', $password='', $charset='')
 	{
-		$this->_dsn = $dsn;
-		$this->_username = $username;
-		$this->_password = $password;
-		$this->_charset = $charset;
+		$this->_dsn=$dsn;
+		$this->_username=$username;
+		$this->_password=$password;
+		$this->_charset=$charset;
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	public function __sleep()
 	{
 //		$this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session
-		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo","\0Prado\Data\TDbConnection\0_active"]);
+		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo", "\0Prado\Data\TDbConnection\0_active"]);
 	}
 
 	/**
@@ -168,8 +168,8 @@ 
 	 */
 	public function setActive($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
-		if($value !== $this->_active)
+		$value=TPropertyValue::ensureBoolean($value);
+		if($value!==$this->_active)
 		{
 			if($value)
 				$this->open();
@@ -184,17 +184,17 @@ 
 	 */
 	protected function open()
 	{
-		if($this->_pdo === null)
+		if($this->_pdo===null)
 		{
 			try
 			{
-				$this->_pdo = new PDO($this->getConnectionString(),$this->getUsername(),
+				$this->_pdo=new PDO($this->getConnectionString(), $this->getUsername(),
 									$this->getPassword(), $this->_attributes);
 				// This attribute is only useful for PDO::MySql driver.
 				// Ignore the warning if a driver doesn't understand this.
 				@$this->_pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-				$this->_active = true;
+				$this->_active=true;
 				$this->setConnectionCharset();
 			}
 			catch(PDOException $e)
@@ -210,8 +210,8 @@ 
 	 */
 	protected function close()
 	{
-		$this->_pdo = null;
-		$this->_active = false;
+		$this->_pdo=null;
+		$this->_active=false;
 	}
 
 	/*
@@ -221,16 +221,16 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
+		if($this->_charset==='' || $this->_active===false)
 			return;
-		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
+		switch($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
 			case 'sqlite':
-				$stmt = $this->_pdo->prepare('SET NAMES ?');
+				$stmt=$this->_pdo->prepare('SET NAMES ?');
 			break;
 			case 'pgsql':
-				$stmt = $this->_pdo->prepare('SET client_encoding TO ?');
+				$stmt=$this->_pdo->prepare('SET client_encoding TO ?');
 			break;
 			default:
 				throw new TDbException('dbconnection_unsupported_driver_charset', $driver);
@@ -252,7 +252,7 @@ 
 	 */
 	public function setConnectionString($value)
 	{
-		$this->_dsn = $value;
+		$this->_dsn=$value;
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setUsername($value)
 	{
-		$this->_username = $value;
+		$this->_username=$value;
 	}
 
 	/**
@@ -284,13 +284,13 @@ 
 	 */
 	public function setPassword($value)
 	{
-		$this->_password = $value;
+		$this->_password=$value;
 	}
 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -298,9 +298,9 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
-		$this->_charset = $value;
+		$this->_charset=$value;
 		$this->setConnectionCharset();
 	}
 
@@ -331,7 +331,7 @@ 
 	 */
 	public function getCurrentTransaction()
 	{
-		if($this->_transaction !== null)
+		if($this->_transaction!==null)
 		{
 			if($this->_transaction->getActive())
 				return $this->_transaction;
@@ -349,7 +349,7 @@ 
 		if($this->getActive())
 		{
 			$this->_pdo->beginTransaction();
-			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
+			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
 		}
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -371,7 +371,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass=(string) $value;
 	}
 
 	/**
@@ -380,7 +380,7 @@ 
 	 * @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
 	 * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
 	 */
-	public function getLastInsertID($sequenceName = '')
+	public function getLastInsertID($sequenceName='')
 	{
 		if($this->getActive())
 			return $this->_pdo->lastInsertId($sequenceName);
@@ -437,9 +437,9 @@ 
 	 */
 	public function getDbMetaData()
 	{
-		if($this->_dbMeta === null)
+		if($this->_dbMeta===null)
 		{
-			$this->_dbMeta = TDbMetaData::getInstance($this);
+			$this->_dbMeta=TDbMetaData::getInstance($this);
 		}
 		return $this->_dbMeta;
 	}
@@ -468,13 +468,13 @@ 
 		switch(TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbColumnCaseMode'))
 		{
 			case TDbColumnCaseMode::Preserved:
-				$value = PDO::CASE_NATURAL;
+				$value=PDO::CASE_NATURAL;
 				break;
 			case TDbColumnCaseMode::LowerCase:
-				$value = PDO::CASE_LOWER;
+				$value=PDO::CASE_LOWER;
 				break;
 			case TDbColumnCaseMode::UpperCase:
-				$value = PDO::CASE_UPPER;
+				$value=PDO::CASE_UPPER;
 				break;
 		}
 		$this->setAttribute(PDO::ATTR_CASE, $value);
@@ -504,13 +504,13 @@ 
 		switch(TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbNullConversionMode'))
 		{
 			case TDbNullConversionMode::Preserved:
-				$value = PDO::NULL_NATURAL;
+				$value=PDO::NULL_NATURAL;
 				break;
 			case TDbNullConversionMode::EmptyStringToNull:
-				$value = PDO::NULL_EMPTY_STRING;
+				$value=PDO::NULL_EMPTY_STRING;
 				break;
 			case TDbNullConversionMode::NullToEmptyString:
-				$value = PDO::NULL_TO_STRING;
+				$value=PDO::NULL_TO_STRING;
 				break;
 		}
 		$this->setAttribute(PDO::ATTR_ORACLE_NULLS, $value);
@@ -634,6 +634,6 @@ 
 		if($this->_pdo instanceof PDO)
 			$this->_pdo->setAttribute($name, $value);
 		else
-			$this->_attributes[$name] = $value;
+			$this->_attributes[$name]=$value;
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -196,8 +196,7 @@ 
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 				$this->_active = true;
 				$this->setConnectionCharset();
-			}
-			catch(PDOException $e)
+			} catch(PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
@@ -350,8 +349,7 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
-		}
-		else
+		} else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
 

framework/Data/TDbTransaction.php

Doc Comments +1 added lines

@@ -101,6 +101,7 @@
 
 	/**
 	 * @param boolean whether this transaction is active
+	 * @param boolean $value
 	 */
 	protected function setActive($value)
 	{

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function __construct(TDbConnection $connection)
 	{
-		$this->_connection = $connection;
+		$this->_connection=$connection;
 		$this->setActive(true);
 	}
 
@@ -67,7 +67,7 @@ 
 		if($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->commit();
-			$this->_active = false;
+			$this->_active=false;
 		}
 		else
 			throw new TDbException('dbtransaction_transaction_inactive');
@@ -82,7 +82,7 @@ 
 		if($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->rollBack();
-			$this->_active = false;
+			$this->_active=false;
 		}
 		else
 			throw new TDbException('dbtransaction_transaction_inactive');
@@ -109,7 +109,7 @@ 
 	 */
 	protected function setActive($value)
 	{
-		$this->_active = TPropertyValue::ensureBoolean($value);
+		$this->_active=TPropertyValue::ensureBoolean($value);
 	}
 }
 

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
 		{
 			$this->_connection->getPdoInstance()->commit();
 			$this->_active = false;
-		}
-		else
+		} else
 			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
@@ -83,8 +82,7 @@ 
 		{
 			$this->_connection->getPdoInstance()->rollBack();
 			$this->_active = false;
-		}
-		else
+		} else
 			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 

framework/I18N/core/MessageSource_XLIFF.php

Doc Comments +3 added lines

@@ -486,6 +486,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 namespace Prado\I18N\core;
 
 use DOMDocument;
-use DOMXPath;
 use Prado\Exceptions\TException;
 use Prado\Exceptions\TIOException;
 

Spacing +105 added lines, -105 removed lines

@@ -43,13 +43,13 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.xml';
+	protected $dataExt='.xml';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	/**
 	 * Constructor.
@@ -58,7 +58,7 @@ 
 	 */
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 	/**
@@ -69,20 +69,20 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($XML = simplexml_load_file($filename))) {
+		if(false===($XML=simplexml_load_file($filename))) {
 			return false;
 		}
 
-		$translationUnit = $XML->xpath('//trans-unit');
+		$translationUnit=$XML->xpath('//trans-unit');
 
-		$translations = [];
+		$translations=[];
 
 		foreach($translationUnit as $unit)
 		{
-			$source = (string)$unit->source;
-			$translations[$source][] = (string)$unit->target;
-			$translations[$source][] = (string)$unit['id'];
-			$translations[$source][] = (string)$unit->note;
+			$source=(string) $unit->source;
+			$translations[$source][]=(string) $unit->target;
+			$translations[$source][]=(string) $unit['id'];
+			$translations[$source][]=(string) $unit->note;
 		}
 
 		return $translations;
@@ -107,7 +107,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source . '/' . $variant;
+		return $this->source.'/'.$variant;
 	}
 
 	/**
@@ -127,28 +127,28 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$source = $catalogue . $this->dataExt;
-		$catalogues = [$source];
-		$variant = null;
+		$variants=explode('_', $this->culture);
+		$source=$catalogue.$this->dataExt;
+		$catalogues=[$source];
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.$this->dataSeparator.$variant.$this->dataExt;
 			}
 		}
 
-		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir, array_reverse($catalogues));
-		$files = [];
+		$byDir=$this->getCatalogueByDir($catalogue);
+		$catalogues=array_merge($byDir, array_reverse($catalogues));
+		$files=[];
 
 		foreach($catalogues as $file)
 		{
-			$files[] = $file;
-			$files[] = preg_replace('/\.xml$/', '.xlf', $file);
+			$files[]=$file;
+			$files[]=preg_replace('/\.xml$/', '.xlf', $file);
 		}
 
 		return $files;
@@ -163,16 +163,16 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_', $this->culture);
-		$catalogues = [];
-		$variant = null;
+		$variants=explode('_', $this->culture);
+		$catalogues=[];
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 
@@ -196,38 +196,38 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir = null, $variant = null)
+	protected function getCatalogues($dir=null, $variant=null)
 	{
-		$dir = $dir?$dir:$this->source;
-		$files = scandir($dir);
-		$catalogue = [];
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
+		$catalogue=[];
 
 		foreach($files as $file)
 		{
-			if(is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
-				$catalogue = array_merge(
+			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+				$catalogue=array_merge(
 					$catalogue,
-					$this->getCatalogues($dir . '/' . $file, $file)
+					$this->getCatalogues($dir.'/'.$file, $file)
 				);
 			}
 
-			$pos = strpos($file, $this->dataExt);
-			if($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
+			$pos=strpos($file, $this->dataExt);
+			if($pos > 0 && substr($file, -1 * strlen($this->dataExt))==$this->dataExt)
 			{
-				$name = substr($file, 0, $pos);
-				$dot = strrpos($name, $this->dataSeparator);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 
 				if(is_int($dot))
 				{
-					$culture = substr($name, $dot + 1, strlen($name));
-					$cat = substr($name, 0, $dot);
+					$culture=substr($name, $dot + 1, strlen($name));
+					$cat=substr($name, 0, $dot);
 				}
 
-				$details[0] = $cat;
-				$details[1] = $culture;
-				$catalogue[] = $details;
+				$details[0]=$cat;
+				$details[1]=$culture;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -242,15 +242,15 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue = 'messages')
+	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
+			$file=$this->getSource($variant);
 			if(is_file($file)) {
 				return [$variant, $file];
 			}
@@ -265,50 +265,50 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	public function save($catalogue = 'messages')
+	public function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 		if(count($messages) <= 0) {
 			return false;
 		}
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
-			list($variant, $filename) = $this->createMessageTemplate($catalogue);
+			list($variant, $filename)=$this->createMessageTemplate($catalogue);
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = new DOMDocument();
+		$dom=new DOMDocument();
 		$dom->load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-		$body = $xpath->query('//body')->item(0);
+		$xpath=new DomXPath($dom);
+		$body=$xpath->query('//body')->item(0);
 
-		$lastNodes = $xpath->query('//trans-unit[last()]');
-		if(($last = $lastNodes->item(0)) !== null) {
-			$count = (int)$last->getAttribute('id');
+		$lastNodes=$xpath->query('//trans-unit[last()]');
+		if(($last=$lastNodes->item(0))!==null) {
+			$count=(int) $last->getAttribute('id');
 		} else {
-			$count = 0;
+			$count=0;
 		}
 
 		//for each message add it to the XML file using DOM
 		foreach($messages as $message)
 		{
-			$unit = $dom->createElement('trans-unit');
+			$unit=$dom->createElement('trans-unit');
 			$unit->setAttribute('id', ++$count);
 
-			$source = $dom->createElement('source');
+			$source=$dom->createElement('source');
 			$source->appendChild($dom->createCDATASection($message));
 
-			$target = $dom->createElement('target');
+			$target=$dom->createElement('target');
 			$target->appendChild($dom->createCDATASection(''));
 
 			$unit->appendChild($dom->createTextNode("\n"));
@@ -323,7 +323,7 @@ 
 		}
 
 
-		$fileNode = $xpath->query('//file')->item(0);
+		$fileNode=$xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
 		//save it and clear the cache for this variant
@@ -343,58 +343,58 @@ 
 	 * @param string the catalogue to save to.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	public function update($text, $target, $comments, $catalogue = 'messages')
+	public function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = DOMDocument::load($filename);
+		$dom=DOMDocument::load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-		$units = $xpath->query('//trans-unit');
+		$xpath=new DomXPath($dom);
+		$units=$xpath->query('//trans-unit');
 
 		//for each of the existin units
 		foreach($units as $unit)
 		{
-			$found = false;
-			$targetted = false;
-			$commented = false;
+			$found=false;
+			$targetted=false;
+			$commented=false;
 
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
 			foreach($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
-					$found = true;
+				if($node->nodeName=='source' && $node->firstChild->wholeText==$text) {
+					$found=true;
 				}
 
 				//found source, get the target and notes
 				if($found)
 				{
 					//set the new translated string
-					if($node->nodeName == 'target')
+					if($node->nodeName=='target')
 					{
-						$node->nodeValue = $target;
-						$targetted = true;
+						$node->nodeValue=$target;
+						$targetted=true;
 					}
 
 					//set the notes
-					if(!empty($comments) && $node->nodeName == 'note')
+					if(!empty($comments) && $node->nodeName=='note')
 					{
-						$node->nodeValue = $comments;
-						$commented = true;
+						$node->nodeValue=$comments;
+						$commented=true;
 					}
 				}
 			}
@@ -415,7 +415,7 @@ 
 			}
 		}
 
-		$fileNode = $xpath->query('//file')->item(0);
+		$fileNode=$xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
 		if($dom->save($filename) > 0)
@@ -436,25 +436,25 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	public function delete($message, $catalogue = 'messages')
+	public function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if(is_writable($filename)==false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = DOMDocument::load($filename);
+		$dom=DOMDocument::load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-		$units = $xpath->query('//trans-unit');
+		$xpath=new DomXPath($dom);
+		$units=$xpath->query('//trans-unit');
 
 		//for each of the existin units
 		foreach($units as $unit)
@@ -464,14 +464,14 @@ 
 			foreach($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
+				if($node->nodeName=='source' && $node->firstChild->wholeText==$message)
 				{
 					//we found it, remove and save the xml file.
 					$unit->parentNode->removeChild($unit);
-					$fileNode = $xpath->query('//file')->item(0);
+					$fileNode=$xpath->query('//file')->item(0);
 					$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-					if(false !== $dom->save($filename)) {
+					if(false!==$dom->save($filename)) {
 						if(!empty($this->cache)) {
 							$this->cache->clean($variant, $this->culture);
 						}
@@ -488,14 +488,14 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 		
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$file = $this->getSource($variant);
-		$dir = dirname($file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$file=$this->getSource($variant);
+		$dir=dirname($file);
 
 		if(!is_dir($dir)) {
 			@mkdir($dir);
@@ -514,8 +514,8 @@ 
 
 	protected function getTemplate($catalogue)
 	{
-		$date = @date('c');
-		$xml = <<<EOD
+		$date=@date('c');
+		$xml=<<<EOD
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.0">
  <file source-language="EN" target-language="{$this->culture}" datatype="plaintext" original="$catalogue" date="$date" product-name="$catalogue">

framework/IO/TTextWriter.php

Doc Comments +1 added lines

@@ -38,6 +38,7 @@
 	/**
 	 * Writes a string.
 	 * @param string string to be written
+	 * @param string $str
 	 */
 	public function write($str)
 	{

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
  */
 class TTextWriter extends \Prado\TComponent implements \Prado\IO\ITextWriter
 {
-	private $_str = '';
+	private $_str='';
 
 	/**
 	 * Flushes the content that has been written.
@@ -32,8 +32,8 @@ 
 	 */
 	public function flush()
 	{
-		$str = $this->_str;
-		$this->_str = '';
+		$str=$this->_str;
+		$this->_str='';
 		return $str;
 	}
 
@@ -43,7 +43,7 @@ 
 	 */
 	public function write($str)
 	{
-		$this->_str .= $str;
+		$this->_str.=$str;
 	}
 
 	/**
@@ -51,9 +51,9 @@ 
 	 * @param string content to be written
 	 * @see write
 	 */
-	public function writeLine($str = '')
+	public function writeLine($str='')
 	{
-		$this->write($str . "\n");
+		$this->write($str."\n");
 	}
 }
 

framework/TService.php

Doc Comments +1 added lines

@@ -49,6 +49,7 @@
 
 	/**
 	 * @param string id of this service
+	 * @param string $value
 	 */
 	public function setID($value)
 	{

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
 	/**
 	 * @var boolean whether the service is enabled
 	 */
-	private $_enabled = true;
+	private $_enabled=true;
 
 	/**
 	 * Initializes the service and attaches {@link run} to the RunService event of application.
@@ -54,7 +54,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		$this->_enabled = TPropertyValue::ensureBoolean($value);
+		$this->_enabled=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

framework/Util/TLogger.php

Doc Comments +1 added lines

@@ -98,6 +98,7 @@
 	 * @param integer level filter
 	 * @param array category filter
 	 * @param array control filter
+	 * @param integer $levels
 	 * @return array list of messages. Each array elements represents one message
 	 * with the following structure:
 	 * array(

Spacing +41 added lines, -41 removed lines

@@ -29,17 +29,17 @@ 
 	/**
 	 * Log levels.
 	 */
-	const DEBUG = 0x01;
-	const INFO = 0x02;
-	const NOTICE = 0x04;
-	const WARNING = 0x08;
-	const ERROR = 0x10;
-	const ALERT = 0x20;
-	const FATAL = 0x40;
+	const DEBUG=0x01;
+	const INFO=0x02;
+	const NOTICE=0x04;
+	const WARNING=0x08;
+	const ERROR=0x10;
+	const ALERT=0x20;
+	const FATAL=0x40;
 	/**
 	 * @var array log messages
 	 */
-	private $_logs = [];
+	private $_logs=[];
 	/**
 	 * @var integer log levels (bits) to be filtered
 	 */
@@ -67,16 +67,16 @@ 
 	 * @param string category of the message
 	 * @param string|TControl control of the message
 	 */
-	public function log($message, $level, $category = 'Uncategorized', $ctl = null)
+	public function log($message, $level, $category='Uncategorized', $ctl=null)
 	{
 		if($ctl) {
 			if($ctl instanceof TControl)
-				$ctl = $ctl->ClientId;
+				$ctl=$ctl->ClientId;
 			elseif(!is_string($ctl))
-				$ctl = null;
+				$ctl=null;
 		} else
-			$ctl = null;
-		$this->_logs[] = [$message,$level,$category,microtime(true),memory_get_usage(),$ctl];
+			$ctl=null;
+		$this->_logs[]=[$message, $level, $category, microtime(true), memory_get_usage(), $ctl];
 	}
 
 	/**
@@ -112,23 +112,23 @@ 
 	 *   [4] => memory in bytes
 	 *   [5] => control client id
 	 */
-	public function getLogs($levels = null, $categories = null, $controls = null, $timestamp = null)
+	public function getLogs($levels=null, $categories=null, $controls=null, $timestamp=null)
 	{
-		$this->_levels = $levels;
-		$this->_categories = $categories;
-		$this->_controls = $controls;
-		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
+		$this->_levels=$levels;
+		$this->_categories=$categories;
+		$this->_controls=$controls;
+		$this->_timestamp=$timestamp;
+		if(empty($levels) && empty($categories) && empty($controls) && null===$timestamp)
 			return $this->_logs;
-		$logs = $this->_logs;
+		$logs=$this->_logs;
 		if(!empty($levels))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByLevels'])));
+			$logs=array_values(array_filter(array_filter($logs, [$this, 'filterByLevels'])));
 		if(!empty($categories))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByCategories'])));
+			$logs=array_values(array_filter(array_filter($logs, [$this, 'filterByCategories'])));
 		if(!empty($controls))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByControl'])));
-		if(null !== $timestamp)
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByTimeStamp'])));
+			$logs=array_values(array_filter(array_filter($logs, [$this, 'filterByControl'])));
+		if(null!==$timestamp)
+			$logs=array_values(array_filter(array_filter($logs, [$this, 'filterByTimeStamp'])));
 		return $logs;
 	}
 
@@ -156,27 +156,27 @@ 
 	 * @param array category filter
 	 * @param array control filter
 	 */
-	public function deleteLogs($levels = null, $categories = null, $controls = null, $timestamp = null)
+	public function deleteLogs($levels=null, $categories=null, $controls=null, $timestamp=null)
 	{
-		$this->_levels = $levels;
-		$this->_categories = $categories;
-		$this->_controls = $controls;
-		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
+		$this->_levels=$levels;
+		$this->_categories=$categories;
+		$this->_controls=$controls;
+		$this->_timestamp=$timestamp;
+		if(empty($levels) && empty($categories) && empty($controls) && null===$timestamp)
 		{
-			$this->_logs = [];
+			$this->_logs=[];
 			return;
 		}
-		$logs = $this->_logs;
+		$logs=$this->_logs;
 		if(!empty($levels))
-			$logs = array_filter(array_filter($logs, [$this,'filterByLevels']));
+			$logs=array_filter(array_filter($logs, [$this, 'filterByLevels']));
 		if(!empty($categories))
-			$logs = array_filter(array_filter($logs, [$this,'filterByCategories']));
+			$logs=array_filter(array_filter($logs, [$this, 'filterByCategories']));
 		if(!empty($controls))
-			$logs = array_filter(array_filter($logs, [$this,'filterByControl']));
-		if(null !== $timestamp)
-			$logs = array_filter(array_filter($logs, [$this,'filterByTimeStamp']));
-		$this->_logs = array_values(array_diff_key($this->_logs, $logs));
+			$logs=array_filter(array_filter($logs, [$this, 'filterByControl']));
+		if(null!==$timestamp)
+			$logs=array_filter(array_filter($logs, [$this, 'filterByTimeStamp']));
+		$this->_logs=array_values(array_diff_key($this->_logs, $logs));
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 		foreach($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2] === $category || strpos($value[2], $category . '.') === 0)
+			if($value[2]===$category || strpos($value[2], $category.'.')===0)
 				return $value;
 		}
 		return false;
@@ -216,7 +216,7 @@ 
 		// element 5 are the control client ids
 		foreach($this->_controls as $control)
 		{
-			if($value[5] === $control || strpos($value[5], $control) === 0)
+			if($value[5]===$control || strpos($value[5], $control)===0)
 				return $value;
 		}
 		return false;

framework/Util/TRpcClient.php

Doc Comments +3 added lines

@@ -105,6 +105,9 @@
 	 * @param string RPC server URL
 	 * @param array payload data
 	 * @param string request mime type
+	 * @param string $serverUrl
+	 * @param string $mimeType
+	 * @return string
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{

Spacing +10 added lines, -10 removed lines

@@ -58,7 +58,7 @@ 
 	/**
 	 * @var boolean whether the request is a notification and therefore should not care about the result (default: false)
 	 */
-	private $_isNotification = false;
+	private $_isNotification=false;
 
 	// magics
 
@@ -66,10 +66,10 @@ 
 	 * @param string url to RPC server
 	 * @param boolean whether requests are considered to be notifications (completely ignoring the response) (default: false)
 	 */
-	public function __construct($serverUrl, $isNotification = false)
+	public function __construct($serverUrl, $isNotification=false)
 	{
-		$this->_serverUrl = $serverUrl;
-		$this->_isNotification = TPropertyValue::ensureBoolean($isNotification);
+		$this->_serverUrl=$serverUrl;
+		$this->_isNotification=TPropertyValue::ensureBoolean($isNotification);
 	}
 
 	// methods
@@ -79,9 +79,9 @@ 
 	 * @return TRpcClient instance
 	 * @throws TApplicationException if an unsupported RPC client type was specified
 	 */
-	public static function create($type, $serverUrl, $isNotification = false)
+	public static function create($type, $serverUrl, $isNotification=false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::' . strtoupper($type))) === null)
+		if(($_handler=constant('TRpcClientTypesEnumerable::'.strtoupper($type)))===null)
 			throw new TApplicationException('rpcclient_unsupported_handler');
 
 		return new $_handler($serverUrl, $isNotification);
@@ -111,8 +111,8 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
-			throw new TRpcClientRequestException('Request failed ("' . $http_response_header[0] . '")');
+		if(($_response=@file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType)))===false)
+			throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
 
 		return $_response;
 	}
@@ -132,7 +132,7 @@ 
 	 */
 	public function setIsNotification($bool)
 	{
-		$this->_isNotification = TPropertyValue::ensureBoolean($bool);
+		$this->_isNotification=TPropertyValue::ensureBoolean($bool);
 	}
 
 	/**
@@ -148,6 +148,6 @@ 
 	 */
 	public function setServerUrl($value)
 	{
-		$this->_serverUrl = $value;
+		$this->_serverUrl=$value;
 	}
 }
\ No newline at end of file