pradosoft / prado

bin/prado-cli.php

Doc Comments +25 added lines

@@ -143,6 +143,10 @@ 
 	 */
 	abstract public function performAction($args);
 
+	/**
+	 * @param string $dir
+	 * @param integer $mask
+	 */
 	protected function createDirectory($dir, $mask)
 	{
 		if(!is_dir($dir))
@@ -154,6 +158,9 @@ 
 			chmod($dir, $mask);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected function createFile($filename, $content)
 	{
 		if(!is_file($filename))
@@ -302,6 +309,9 @@ 
 ';
 	}
 
+	/**
+	 * @param string $appName
+	 */
 	protected function renderConfigFile($appName)
 	{
 		return <<<EOD
@@ -515,6 +525,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getActiveRecordConfig($app_dir)
 	{
 		if(false === ($xml = $this->getXmlFile($app_dir)))
@@ -530,6 +543,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getOutputFile($app_dir, $namespace)
 	{
 		if(is_file($namespace) && strpos($namespace, $app_dir) === 0)
@@ -591,6 +607,9 @@ 
 		return $prop;
 	}
 
+	/**
+	 * @param string $class
+	 */
 	protected function generateClass($properties, $tablename, $class)
 	{
 		$props = implode("\n", $properties);
@@ -686,6 +705,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $l
+	 */
 	public function generate($l)
 	{
 		$input = explode(" ", trim($l));
@@ -724,6 +746,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getActiveRecordConfig($app_dir) {
 		if (false === ($xml = $this->getXmlFile($app_dir)))
 			return false;

Spacing +167 added lines, -167 removed lines

@@ -9,15 +9,15 @@ 
  * @license https://github.com/pradosoft/prado/blob/master/LICENSE
  */
 
-if(!isset($_SERVER['argv']) || php_sapi_name() !== 'cli')
+if(!isset($_SERVER['argv']) || php_sapi_name()!=='cli')
 	die('Must be run from the command line');
 
 // Locate composer's autoloader
-if(file_exists($autoloader = realpath(__DIR__ . '/../vendor/autoload.php')))
+if(file_exists($autoloader=realpath(__DIR__.'/../vendor/autoload.php')))
 {
 	// if we are running inside a prado repo checkout, get out of bin/
 	include($autoloader);
-} elseif(file_exists($autoloader = realpath(__DIR__ . '/../../../autoload.php'))) {
+} elseif(file_exists($autoloader=realpath(__DIR__.'/../../../autoload.php'))) {
 	// if we are running from inside an application's vendor/ directory, get out of pradosoft/prado/bin/
 	include($autoloader);
 }
@@ -62,14 +62,14 @@ 
 	/**
 	 * @var array command action classes
 	 */
-	protected $_actions = [];
+	protected $_actions=[];
 
 	/**
 	 * @param string action class name
 	 */
 	public function addActionClass($class)
 	{
-		$this->_actions[$class] = new $class;
+		$this->_actions[$class]=new $class;
 	}
 
 	/**
@@ -78,14 +78,14 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
-			$instance = new self;
+		if($instance===null)
+			$instance=new self;
 		return $instance;
 	}
 
 	public static function printGreeting()
 	{
-		echo "Command line tools for Prado " . Prado::getVersion() . ".\n";
+		echo "Command line tools for Prado ".Prado::getVersion().".\n";
 	}
 
 	/**
@@ -96,17 +96,17 @@ 
 	{
 		if(count($args) > 1)
 			array_shift($args);
-		$valid = false;
+		$valid=false;
 		foreach($this->_actions as $class => $action)
 		{
 			if($action->isValidAction($args))
 			{
-				$valid |= $action->performAction($args);
+				$valid|=$action->performAction($args);
 				break;
 			}
 			else
 			{
-				$valid = false;
+				$valid=false;
 			}
 		}
 		if(!$valid)
@@ -165,23 +165,23 @@ 
 
 	public function isValidAction($args)
 	{
-		return 0 == strcasecmp($args[0], $this->action) &&
+		return 0==strcasecmp($args[0], $this->action) &&
 			count($args) - 1 >= count($this->parameters);
 	}
 
 	public function renderHelp()
 	{
-		$params = [];
+		$params=[];
 		foreach($this->parameters as $v)
-			$params[] = '<' . $v . '>';
-		$parameters = implode($params, ' ');
-		$options = [];
+			$params[]='<'.$v.'>';
+		$parameters=implode($params, ' ');
+		$options=[];
 		foreach($this->optional as $v)
-			$options[] = '[' . $v . ']';
-		$optional = (strlen($parameters) ? ' ' : '') . implode($options, ' ');
-		$description = '';
+			$options[]='['.$v.']';
+		$optional=(strlen($parameters) ? ' ' : '').implode($options, ' ');
+		$description='';
 		foreach(explode("\n", wordwrap($this->description, 65)) as $line)
-			$description .= '    ' . $line . "\n";
+			$description.='    '.$line."\n";
 		return <<<EOD
   {$this->action} {$parameters}{$optional}
 {$description}
@@ -191,17 +191,17 @@ 
 
 	protected function initializePradoApplication($directory)
 	{
-		$_SERVER['SCRIPT_FILENAME'] = $directory . '/index.php';
-		$app_dir = realpath($directory . '/protected/');
-		if($app_dir !== false && is_dir($app_dir))
+		$_SERVER['SCRIPT_FILENAME']=$directory.'/index.php';
+		$app_dir=realpath($directory.'/protected/');
+		if($app_dir!==false && is_dir($app_dir))
 		{
-			if(Prado::getApplication() === null)
+			if(Prado::getApplication()===null)
 			{
-				$app = new PradoShellApplication($app_dir);
+				$app=new PradoShellApplication($app_dir);
 				$app->run();
-				$dir = substr(str_replace(realpath('./'), '', $app_dir), 1);
+				$dir=substr(str_replace(realpath('./'), '', $app_dir), 1);
 				PradoCommandLineInterpreter::printGreeting();
-				echo '** Loaded PRADO appplication in directory "' . $dir . "\".\n";
+				echo '** Loaded PRADO appplication in directory "'.$dir."\".\n";
 			}
 
 			return Prado::getApplication();
@@ -209,9 +209,9 @@ 
 		else
 		{
 			PradoCommandLineInterpreter::printGreeting();
-			echo '+' . str_repeat('-', 77) . "+\n";
-			echo '** Unable to load PRADO application in directory "' . $directory . "\".\n";
-			echo '+' . str_repeat('-', 77) . "+\n";
+			echo '+'.str_repeat('-', 77)."+\n";
+			echo '** Unable to load PRADO application in directory "'.$directory."\".\n";
+			echo '+'.str_repeat('-', 77)."+\n";
 		}
 		return false;
 	}
@@ -226,10 +226,10 @@ 
  */
 class PradoCommandLineCreateProject extends PradoCommandLineAction
 {
-	protected $action = '-c';
-	protected $parameters = ['directory'];
-	protected $optional = [];
-	protected $description = 'Creates a Prado project skeleton for the given <directory>.';
+	protected $action='-c';
+	protected $parameters=['directory'];
+	protected $optional=[];
+	protected $description='Creates a Prado project skeleton for the given <directory>.';
 
 	public function performAction($args)
 	{
@@ -243,25 +243,25 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if(strlen(trim($dir)) == 0)
+		if(strlen(trim($dir))==0)
 			return;
 
-		$rootPath = realpath(dirname(trim($dir)));
+		$rootPath=realpath(dirname(trim($dir)));
 
-		if(basename($dir) !== '.')
-			$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
+		if(basename($dir)!=='.')
+			$basePath=$rootPath.DIRECTORY_SEPARATOR.basename($dir);
 		else
-			$basePath = $rootPath;
-		$appName = basename($basePath);
-		$assetPath = $basePath . DIRECTORY_SEPARATOR . 'assets';
-		$protectedPath = $basePath . DIRECTORY_SEPARATOR . 'protected';
-		$runtimePath = $basePath . DIRECTORY_SEPARATOR . 'protected' . DIRECTORY_SEPARATOR . 'runtime';
-		$pagesPath = $protectedPath . DIRECTORY_SEPARATOR . 'pages';
-
-		$indexFile = $basePath . DIRECTORY_SEPARATOR . 'index.php';
-		$htaccessFile = $protectedPath . DIRECTORY_SEPARATOR . '.htaccess';
-		$configFile = $protectedPath . DIRECTORY_SEPARATOR . 'application.xml';
-		$defaultPageFile = $pagesPath . DIRECTORY_SEPARATOR . 'Home.page';
+			$basePath=$rootPath;
+		$appName=basename($basePath);
+		$assetPath=$basePath.DIRECTORY_SEPARATOR.'assets';
+		$protectedPath=$basePath.DIRECTORY_SEPARATOR.'protected';
+		$runtimePath=$basePath.DIRECTORY_SEPARATOR.'protected'.DIRECTORY_SEPARATOR.'runtime';
+		$pagesPath=$protectedPath.DIRECTORY_SEPARATOR.'pages';
+
+		$indexFile=$basePath.DIRECTORY_SEPARATOR.'index.php';
+		$htaccessFile=$protectedPath.DIRECTORY_SEPARATOR.'.htaccess';
+		$configFile=$protectedPath.DIRECTORY_SEPARATOR.'application.xml';
+		$defaultPageFile=$pagesPath.DIRECTORY_SEPARATOR.'Home.page';
 
 		$this->createDirectory($basePath, 0755);
 		$this->createDirectory($assetPath, 0777);
@@ -277,10 +277,10 @@ 
 
 	protected function renderIndexFile()
 	{
-		$framework = realpath(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'framework' . DIRECTORY_SEPARATOR . 'prado.php';
+		$framework=realpath(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR.'prado.php';
 return '<?php
 
-$frameworkPath=\'' . $framework . '\';
+$frameworkPath=\'' . $framework.'\';
 
 // The following directory checks may be removed if performance is required
 $basePath=dirname(__FILE__);
@@ -376,10 +376,10 @@ 
  */
 class PradoCommandLineCreateTests extends PradoCommandLineAction
 {
-	protected $action = '-t';
-	protected $parameters = ['directory'];
-	protected $optional = [];
-	protected $description = 'Create test fixtures in the given <directory>.';
+	protected $action='-t';
+	protected $parameters=['directory'];
+	protected $optional=[];
+	protected $description='Create test fixtures in the given <directory>.';
 
 	public function performAction($args)
 	{
@@ -390,22 +390,22 @@ 
 
 	protected function createTestFixtures($dir)
 	{
-		if(strlen(trim($dir)) == 0)
+		if(strlen(trim($dir))==0)
 			return;
 
-		$rootPath = realpath(dirname(trim($dir)));
-		$basePath = $rootPath . '/' . basename($dir);
+		$rootPath=realpath(dirname(trim($dir)));
+		$basePath=$rootPath.'/'.basename($dir);
 
-		$tests = $basePath . '/tests';
-		$unit_tests = $tests . '/unit';
-		$functional_tests = $tests . '/functional';
+		$tests=$basePath.'/tests';
+		$unit_tests=$tests.'/unit';
+		$functional_tests=$tests.'/functional';
 
 		$this->createDirectory($tests, 0755);
 		$this->createDirectory($unit_tests, 0755);
 		$this->createDirectory($functional_tests, 0755);
 
-		$unit_test_index = $tests . '/unit.php';
-		$functional_test_index = $tests . '/functional.php';
+		$unit_test_index=$tests.'/unit.php';
+		$functional_test_index=$tests.'/functional.php';
 
 		$this->createFile($unit_test_index, $this->renderUnitTestFixture());
 		$this->createFile($functional_test_index, $this->renderFunctionalTestFixture());
@@ -413,10 +413,10 @@ 
 
 	protected function renderUnitTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))) . '/tests/test_tools/unit_tests.php';
+		$tester=realpath(dirname(dirname(__FILE__))).'/tests/test_tools/unit_tests.php';
 return '<?php
 
-include_once \'' . $tester . '\';
+include_once \'' . $tester.'\';
 
 $app_directory = "../protected";
 $test_cases = dirname(__FILE__)."/unit";
@@ -428,10 +428,10 @@ 
 
 	protected function renderFunctionalTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))) . '/tests/test_tools/functional_tests.php';
+		$tester=realpath(dirname(dirname(__FILE__))).'/tests/test_tools/functional_tests.php';
 return '<?php
 
-include_once \'' . $tester . '\';
+include_once \'' . $tester.'\';
 
 $test_cases = dirname(__FILE__)."/functional";
 
@@ -450,10 +450,10 @@ 
  */
 class PradoCommandLinePhpShell extends PradoCommandLineAction
 {
-	protected $action = 'shell';
-	protected $parameters = [];
-	protected $optional = ['directory'];
-	protected $description = 'Runs a PHP interactive interpreter. Initializes the Prado application in the given [directory].';
+	protected $action='shell';
+	protected $parameters=[];
+	protected $optional=['directory'];
+	protected $description='Runs a PHP interactive interpreter. Initializes the Prado application in the given [directory].';
 
 	public function performAction($args)
 	{
@@ -473,112 +473,112 @@ 
  */
 class PradoCommandLineActiveRecordGen extends PradoCommandLineAction
 {
-	protected $action = 'generate';
-	protected $parameters = ['table', 'output'];
-	protected $optional = ['directory', 'soap'];
-	protected $description = 'Generate Active Record skeleton for <table> to <output> file using application.xml in [directory]. May also generate [soap] properties.';
-	private $_soap = false;
+	protected $action='generate';
+	protected $parameters=['table', 'output'];
+	protected $optional=['directory', 'soap'];
+	protected $description='Generate Active Record skeleton for <table> to <output> file using application.xml in [directory]. May also generate [soap] properties.';
+	private $_soap=false;
 
 	public function performAction($args)
 	{
-		$app_dir = count($args) > 3 ? $this->getAppDir($args[3]) : $this->getAppDir();
-		$this->_soap = count($args) > 4;
-		if($app_dir !== false)
+		$app_dir=count($args) > 3 ? $this->getAppDir($args[3]) : $this->getAppDir();
+		$this->_soap=count($args) > 4;
+		if($app_dir!==false)
 		{
-			$config = $this->getActiveRecordConfig($app_dir);
-			$output = $this->getOutputFile($app_dir, $args[2]);
+			$config=$this->getActiveRecordConfig($app_dir);
+			$output=$this->getOutputFile($app_dir, $args[2]);
 			if(is_file($output))
 				echo "** File $output already exists, skiping. \n";
-			elseif($config !== false && $output !== false)
+			elseif($config!==false && $output!==false)
 				$this->generateActiveRecord($config, $args[1], $output);
 		}
 		return true;
 	}
 
-	protected function getAppDir($dir = ".")
+	protected function getAppDir($dir=".")
 	{
 		if(is_dir($dir))
 			return realpath($dir);
-		if(false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+		if(false!==($app_dir=realpath($dir.'/protected/')) && is_dir($app_dir))
 			return $app_dir;
-		echo '** Unable to find directory "' . $dir . "\".\n";
+		echo '** Unable to find directory "'.$dir."\".\n";
 		return false;
 	}
 
 	protected function getXmlFile($app_dir)
 	{
-		if(false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
+		if(false!==($xml=realpath($app_dir.'/application.xml')) && is_file($xml))
 			return $xml;
-		if(false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
+		if(false!==($xml=realpath($app_dir.'/protected/application.xml')) && is_file($xml))
 			return $xml;
-		echo '** Unable to find application.xml in ' . $app_dir . "\n";
+		echo '** Unable to find application.xml in '.$app_dir."\n";
 		return false;
 	}
 
 	protected function getActiveRecordConfig($app_dir)
 	{
-		if(false === ($xml = $this->getXmlFile($app_dir)))
+		if(false===($xml=$this->getXmlFile($app_dir)))
 			return false;
-		if(false !== ($app = $this->initializePradoApplication($app_dir)))
+		if(false!==($app=$this->initializePradoApplication($app_dir)))
 		{
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
 			foreach($app->getModules() as $module)
 				if($module instanceof TActiveRecordConfig)
 					return $module;
-			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
+			echo '** Unable to find TActiveRecordConfig module in '.$xml."\n";
 		}
 		return false;
 	}
 
 	protected function getOutputFile($app_dir, $namespace)
 	{
-		if(is_file($namespace) && strpos($namespace, $app_dir) === 0)
+		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
 				return $namespace;
-		$file = Prado::getPathOfNamespace($namespace, ".php");
-		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
+		$file=Prado::getPathOfNamespace($namespace, ".php");
+		if($file!==null && false!==($path=realpath(dirname($file))) && is_dir($path))
 		{
-			if(strpos($path, $app_dir) === 0)
+			if(strpos($path, $app_dir)===0)
 				return $file;
 		}
-		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		echo '** Output file '.$file.' must be within directory '.$app_dir."\n";
 		return false;
 	}
 
 	protected function generateActiveRecord($config, $tablename, $output)
 	{
-		$manager = TActiveRecordManager::getInstance();
+		$manager=TActiveRecordManager::getInstance();
 		if($manager->getDbConnection()) {
-			$gateway = $manager->getRecordGateway();
-			$tableInfo = $gateway->getTableInfo($manager->getDbConnection(), $tablename);
-			if(count($tableInfo->getColumns()) === 0)
+			$gateway=$manager->getRecordGateway();
+			$tableInfo=$gateway->getTableInfo($manager->getDbConnection(), $tablename);
+			if(count($tableInfo->getColumns())===0)
 			{
-				echo '** Unable to find table or view "' . $tablename . '" in "' . $manager->getDbConnection()->getConnectionString() . "\".\n";
+				echo '** Unable to find table or view "'.$tablename.'" in "'.$manager->getDbConnection()->getConnectionString()."\".\n";
 				return false;
 			}
 			else
 			{
-				$properties = [];
+				$properties=[];
 				foreach($tableInfo->getColumns() as $field => $column)
-					$properties[] = $this->generateProperty($field, $column);
+					$properties[]=$this->generateProperty($field, $column);
 			}
 
-			$classname = basename($output, '.php');
-			$class = $this->generateClass($properties, $tablename, $classname);
+			$classname=basename($output, '.php');
+			$class=$this->generateClass($properties, $tablename, $classname);
 			echo "  Writing class $classname to file $output\n";
 			file_put_contents($output, $class);
 		} else {
-			echo '** Unable to connect to database with ConnectionID=\'' . $config->getConnectionID() . "'. Please check your settings in application.xml and ensure your database connection is set up first.\n";
+			echo '** Unable to connect to database with ConnectionID=\''.$config->getConnectionID()."'. Please check your settings in application.xml and ensure your database connection is set up first.\n";
 		}
 	}
 
 	protected function generateProperty($field, $column)
 	{
-		$prop = '';
-		$name = '$' . $field;
-		$type = $column->getPHPType();
+		$prop='';
+		$name='$'.$field;
+		$type=$column->getPHPType();
 		if($this->_soap)
 		{
-			$prop .= <<<EOD
+			$prop.=<<<EOD
 
 	/**
 	 * @var $type $name
@@ -587,14 +587,14 @@ 
 
 EOD;
 		}
-		$prop .= "\tpublic $name;";
+		$prop.="\tpublic $name;";
 		return $prop;
 	}
 
 	protected function generateClass($properties, $tablename, $class)
 	{
-		$props = implode("\n", $properties);
-		$date = date('Y-m-d h:i:s');
+		$props=implode("\n", $properties);
+		$date=date('Y-m-d h:i:s');
 return <<<EOD
 <?php
 /**
@@ -625,38 +625,38 @@ 
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction
 {
-	protected $action = 'generateAll';
-	protected $parameters = ['output'];
-	protected $optional = ['directory', 'soap', 'overwrite', 'prefix', 'postfix'];
-	protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
-	private $_soap = false;
-	private $_prefix = '';
-	private $_postfix = '';
-	private $_overwrite = false;
+	protected $action='generateAll';
+	protected $parameters=['output'];
+	protected $optional=['directory', 'soap', 'overwrite', 'prefix', 'postfix'];
+	protected $description="Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
+	private $_soap=false;
+	private $_prefix='';
+	private $_postfix='';
+	private $_overwrite=false;
 
 	public function performAction($args) {
-		$app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
-		$this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
-		$this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
-		$this->_prefix = count($args) > 5 ? $args[5] : '';
-		$this->_postfix = count($args) > 6 ? $args[6] : '';
+		$app_dir=count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
+		$this->_soap=count($args) > 3 ? ($args[3]=="soap" || $args[3]=="true" ? true : false) : false;
+		$this->_overwrite=count($args) > 4 ? ($args[4]=="overwrite" || $args[4]=="true" ? true : false) : false;
+		$this->_prefix=count($args) > 5 ? $args[5] : '';
+		$this->_postfix=count($args) > 6 ? $args[6] : '';
 
-		if ($app_dir !== false) {
-			$config = $this->getActiveRecordConfig($app_dir);
+		if($app_dir!==false) {
+			$config=$this->getActiveRecordConfig($app_dir);
 
-			$manager = TActiveRecordManager::getInstance();
-			$con = $manager->getDbConnection();
-			$con->Active = true;
+			$manager=TActiveRecordManager::getInstance();
+			$con=$manager->getDbConnection();
+			$con->Active=true;
 
 			switch($con->getDriverName())
 			   {
 				case 'mysqli':
 				case 'mysql':
-					$command = $con->createCommand("SHOW TABLES");
+					$command=$con->createCommand("SHOW TABLES");
 					break;
 				case 'sqlite': //sqlite 3
 				case 'sqlite2': //sqlite 2
-					$command = $con->createCommand("SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'");
+					$command=$con->createCommand("SELECT DISTINCT tbl_name FROM sqlite_master WHERE tbl_name<>'sqlite_sequence'");
 					break;
 				case 'pgsql':
 				case 'mssql': // Mssql driver on windows hosts
@@ -665,21 +665,21 @@ 
 				case 'oci':
 //				case 'ibm':
 				default:
-					echo "\n    Sorry, generateAll is not implemented for " . $con->getDriverName() . "\n";
+					echo "\n    Sorry, generateAll is not implemented for ".$con->getDriverName()."\n";
 					
 			   }
 
-			$dataReader = $command->query();
+			$dataReader=$command->query();
 			$dataReader->bindColumn(1, $table);
-			$tables = [];
-			while ($dataReader->read() !== false) {
-				$tables[] = $table;
+			$tables=[];
+			while($dataReader->read()!==false) {
+				$tables[]=$table;
 			}
-			$con->Active = false;
-			foreach ($tables as $key => $table) {
-				$output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
-				if ($config !== false && $output !== false) {
-					$this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+			$con->Active=false;
+			foreach($tables as $key => $table) {
+				$output=$args[1].".".$this->_prefix.ucfirst($table).$this->_postfix;
+				if($config!==false && $output!==false) {
+					$this->generate("generate ".$table." ".$output." ".$this->_soap." ".$this->_overwrite);
 				}
 			}
 		}
@@ -688,16 +688,16 @@ 
 
 	public function generate($l)
 	{
-		$input = explode(" ", trim($l));
+		$input=explode(" ", trim($l));
 		if(count($input) > 2)
 		{
-			$app_dir = '.';
-			if(Prado::getApplication() !== null)
-				$app_dir = dirname(Prado::getApplication()->getBasePath());
-			$args = [$input[0],$input[1], $input[2],$app_dir];
+			$app_dir='.';
+			if(Prado::getApplication()!==null)
+				$app_dir=dirname(Prado::getApplication()->getBasePath());
+			$args=[$input[0], $input[1], $input[2], $app_dir];
 			if(count($input) > 3)
-				$args = [$input[0],$input[1], $input[2],$app_dir,'soap'];
-			$cmd = new PradoCommandLineActiveRecordGen;
+				$args=[$input[0], $input[1], $input[2], $app_dir, 'soap'];
+			$cmd=new PradoCommandLineActiveRecordGen;
 			$cmd->performAction($args);
 		}
 		else
@@ -706,46 +706,46 @@ 
 		}
 	}
 
-	protected function getAppDir($dir = ".") {
-		if (is_dir($dir))
+	protected function getAppDir($dir=".") {
+		if(is_dir($dir))
 			return realpath($dir);
-		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+		if(false!==($app_dir=realpath($dir.'/protected/')) && is_dir($app_dir))
 			return $app_dir;
-		echo '** Unable to find directory "' . $dir . "\".\n";
+		echo '** Unable to find directory "'.$dir."\".\n";
 		return false;
 	}
 
 	protected function getXmlFile($app_dir) {
-		if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
+		if(false!==($xml=realpath($app_dir.'/application.xml')) && is_file($xml))
 			return $xml;
-		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
+		if(false!==($xml=realpath($app_dir.'/protected/application.xml')) && is_file($xml))
 			return $xml;
-		echo '** Unable to find application.xml in ' . $app_dir . "\n";
+		echo '** Unable to find application.xml in '.$app_dir."\n";
 		return false;
 	}
 
 	protected function getActiveRecordConfig($app_dir) {
-		if (false === ($xml = $this->getXmlFile($app_dir)))
+		if(false===($xml=$this->getXmlFile($app_dir)))
 			return false;
-		if (false !== ($app = $this->initializePradoApplication($app_dir))) {
+		if(false!==($app=$this->initializePradoApplication($app_dir))) {
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-			foreach ($app->getModules() as $module)
-				if ($module instanceof TActiveRecordConfig)
+			foreach($app->getModules() as $module)
+				if($module instanceof TActiveRecordConfig)
 					return $module;
-			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
+			echo '** Unable to find TActiveRecordConfig module in '.$xml."\n";
 		}
 		return false;
 	}
 
 	protected function getOutputFile($app_dir, $namespace) {
-		if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
+		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
 			return $namespace;
-		$file = Prado::getPathOfNamespace($namespace, "");
-		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-			if (strpos($path, $app_dir) === 0)
+		$file=Prado::getPathOfNamespace($namespace, "");
+		if($file!==null && false!==($path=realpath(dirname($file))) && is_dir($path)) {
+			if(strpos($path, $app_dir)===0)
 				return $file;
 		}
-		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		echo '** Output file '.$file.' must be within directory '.$app_dir."\n";
 		return false;
 	}
 

Braces +4 added lines, -8 removed lines

@@ -103,8 +103,7 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
@@ -205,8 +204,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+' . str_repeat('-', 77) . "+\n";
@@ -554,8 +552,7 @@ 
 			{
 				echo '** Unable to find table or view "' . $tablename . '" in "' . $manager->getDbConnection()->getConnectionString() . "\".\n";
 				return false;
-			}
-			else
+			} else
 			{
 				$properties = [];
 				foreach($tableInfo->getColumns() as $field => $column)
@@ -699,8 +696,7 @@ 
 				$args = [$input[0],$input[1], $input[2],$app_dir,'soap'];
 			$cmd = new PradoCommandLineActiveRecordGen;
 			$cmd->performAction($args);
-		}
-		else
+		} else
 		{
 			echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 		}

framework/Caching/ICache.php

Doc Comments +1 added lines

@@ -47,6 +47,7 @@
 	 * @param mixed the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
+	 * @param string $id
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	public function add($id, $value, $expire = 0, $dependency = null);

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id, $value, $expire = 0, $dependency = null);
+	public function set($id, $value, $expire=0, $dependency=null);
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
 	 * Nothing will be done if the cache already contains the key.
@@ -49,7 +49,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id, $value, $expire = 0, $dependency = null);
+	public function add($id, $value, $expire=0, $dependency=null);
 	/**
 	 * Deletes a value with the specified key from cache
 	 * @param string the key of the value to be deleted

framework/Caching/TCache.php

Doc Comments +9 added lines, -3 removed lines

@@ -110,7 +110,7 @@ 
 
 	/**
 	 * @param string a key identifying a value to be cached
-	 * @return sring a key generated from the provided key which ensures the uniqueness across applications
+	 * @return string a key generated from the provided key which ensures the uniqueness across applications
 	 */
 	protected function generateUniqueKey($key)
 	{
@@ -144,7 +144,7 @@ 
 	 * @param mixed the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 * @return null|boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	public function set($id, $value, $expire = 0, $dependency = null)
 	{
@@ -202,6 +202,7 @@ 
 	 * in {@link get()} already. So only the implementation of data retrieval
 	 * is needed.
 	 * @param string a unique key identifying the cached value
+	 * @param string $key
 	 * @return string the value stored in cache, false if the value is not in the cache or expired.
 	 */
 	abstract protected function getValue($key);
@@ -216,6 +217,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function setValue($key, $value, $expire);
@@ -230,6 +233,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function addValue($key, $value, $expire);
@@ -238,6 +243,7 @@ 
 	 * Deletes a value with the specified key from cache
 	 * This method should be implemented by child classes to delete the data from actual cache storage.
 	 * @param string the key of the value to be deleted
+	 * @param string $key
 	 * @return boolean if no error happens during deletion
 	 */
 	abstract protected function deleteValue($key);
@@ -281,7 +287,7 @@ 
 	 * Deletes the value with the specified key from cache
 	 * This method is required by the interface \ArrayAccess.
 	 * @param string the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
+	 * @return boolean|null if no error happens during deletion
 	 */
 	public function offsetUnset($id)
 	{

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
 abstract class TCache extends \Prado\TModule implements ICache, \ArrayAccess
 {
 	private $_prefix;
-	private $_primary = true;
+	private $_primary=true;
 
 	/**
 	 * Initializes the cache module.
@@ -61,11 +61,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_prefix === null)
-			$this->_prefix = $this->getApplication()->getUniqueID();
+		if($this->_prefix===null)
+			$this->_prefix=$this->getApplication()->getUniqueID();
 		if($this->_primary)
 		{
-			if($this->getApplication()->getCache() === null)
+			if($this->getApplication()->getCache()===null)
 				$this->getApplication()->setCache($this);
 			else
 				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
@@ -88,7 +88,7 @@ 
 	 */
 	public function setPrimaryCache($value)
 	{
-		$this->_primary = TPropertyValue::ensureBoolean($value);
+		$this->_primary=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setKeyPrefix($value)
 	{
-		$this->_prefix = $value;
+		$this->_prefix=$value;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	protected function generateUniqueKey($key)
 	{
-		return md5($this->_prefix . $key);
+		return md5($this->_prefix.$key);
 	}
 
 	/**
@@ -124,7 +124,7 @@ 
 	 */
 	public function get($id)
 	{
-		if(($data = $this->getValue($this->generateUniqueKey($id))) !== false)
+		if(($data=$this->getValue($this->generateUniqueKey($id)))!==false)
 		{
 			if(!is_array($data))
 				return false;
@@ -146,13 +146,13 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id, $value, $expire = 0, $dependency = null)
+	public function set($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			$this->delete($id);
 		else
 		{
-			$data = [$value,$dependency];
+			$data=[$value, $dependency];
 			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
@@ -166,11 +166,11 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id, $value, $expire = 0, $dependency = null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			return false;
-		$data = [$value,$dependency];
+		$data=[$value, $dependency];
 		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 
@@ -250,7 +250,7 @@ 
 	 */
 	public function offsetExists($id)
 	{
-		return $this->get($id) !== false;
+		return $this->get($id)!==false;
 	}
 
 	/**

framework/Caching/TDirectoryCacheDependency.php

Doc Comments +3 added lines

@@ -124,6 +124,7 @@ 
 	 * By default, it always returns true, meaning the file should be checked.
 	 * You may override this method to check only certain files.
 	 * @param string the name of the file that may be checked for dependency.
+	 * @param string $fileName
 	 * @return boolean whether this file should be checked.
 	 */
 	protected function validateFile($fileName)
@@ -137,6 +138,7 @@ 
 	 * By default, it always returns true, meaning the subdirectory should be checked.
 	 * You may override this method to check only certain subdirectories.
 	 * @param string the name of the subdirectory that may be checked for dependency.
+	 * @param string $directory
 	 * @return boolean whether this subdirectory should be checked.
 	 */
 	protected function validateDirectory($directory)
@@ -150,6 +152,7 @@ 
 	 * {@link setRecursiveCheck RecursiveCheck} is set true.
 	 * @param string the directory name
 	 * @param int level of the recursion
+	 * @param string $directory
 	 * @return array list of file modification time indexed by the file path
 	 */
 	protected function generateTimestamps($directory, $level = 0)

Spacing +16 added lines, -16 removed lines

@@ -35,8 +35,8 @@ 
  */
 class TDirectoryCacheDependency extends TCacheDependency
 {
-	private $_recursiveCheck = true;
-	private $_recursiveLevel = -1;
+	private $_recursiveCheck=true;
+	private $_recursiveLevel=-1;
 	private $_timestamps;
 	private $_directory;
 
@@ -63,10 +63,10 @@ 
 	 */
 	public function setDirectory($directory)
 	{
-		if(($path = realpath($directory)) === false || !is_dir($path))
+		if(($path=realpath($directory))===false || !is_dir($path))
 			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
-		$this->_directory = $path;
-		$this->_timestamps = $this->generateTimestamps($path);
+		$this->_directory=$path;
+		$this->_timestamps=$this->generateTimestamps($path);
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 */
 	public function setRecursiveCheck($value)
 	{
-		$this->_recursiveCheck = TPropertyValue::ensureBoolean($value);
+		$this->_recursiveCheck=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function setRecursiveLevel($value)
 	{
-		$this->_recursiveLevel = TPropertyValue::ensureInteger($value);
+		$this->_recursiveLevel=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function getHasChanged()
 	{
-		return $this->generateTimestamps($this->_directory) != $this->_timestamps;
+		return $this->generateTimestamps($this->_directory)!=$this->_timestamps;
 	}
 
 	/**
@@ -152,23 +152,23 @@ 
 	 * @param int level of the recursion
 	 * @return array list of file modification time indexed by the file path
 	 */
-	protected function generateTimestamps($directory, $level = 0)
+	protected function generateTimestamps($directory, $level=0)
 	{
-		if(($dir = opendir($directory)) === false)
+		if(($dir=opendir($directory))===false)
 			throw new TIOException('directorycachedependency_directory_invalid', $directory);
-		$timestamps = [];
-		while(($file = readdir($dir)) !== false)
+		$timestamps=[];
+		while(($file=readdir($dir))!==false)
 		{
-			$path = $directory . DIRECTORY_SEPARATOR . $file;
-			if($file === '.' || $file === '..')
+			$path=$directory.DIRECTORY_SEPARATOR.$file;
+			if($file==='.' || $file==='..')
 				continue;
 			elseif(is_dir($path))
 			{
 				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
+					$timestamps=array_merge($this->generateTimestamps($path, $level + 1));
 			}
 			elseif($this->validateFile($path))
-				$timestamps[$path] = filemtime($path);
+				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);
 		return $timestamps;

Braces +1 added lines, -2 removed lines

@@ -166,8 +166,7 @@
 			{
 				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
-			}
-			elseif($this->validateFile($path))
+			} elseif($this->validateFile($path))
 				$timestamps[$path] = filemtime($path);
 		}
 		closedir($dir);

framework/Caching/TEtcdCache.php

Doc Comments +2 added lines

@@ -206,6 +206,8 @@
    * @param string the HTTP method for the request (GET,PUT,DELETE)
    * @param string the the key to perform the action on (includes the directory)
    * @param array the additional post data to send with the request
+   * @param string $method
+   * @param string $key
    * @return \stdClass the response from the etcd instance
    */
   protected function request($method, $key, $value = []) {

Spacing +19 added lines, -19 removed lines

@@ -59,17 +59,17 @@ 
   /**
    * @var string the etcd host
    */
-  protected $_host = 'localhost';
+  protected $_host='localhost';
   
   /**
    * @var integer the etcd port
    */
-  protected $_port = 2379;
+  protected $_port=2379;
   
   /**
    * @var string the directory to store values in
    */
-  protected $_dir = 'pradocache';
+  protected $_dir='pradocache';
 
    /**
     * Initializes this module.
@@ -79,7 +79,7 @@ 
     */
 	public function init($config)
 	{
-		if (!function_exists('curl_version')) throw new TConfigurationException('curl_extension_required');
+		if(!function_exists('curl_version')) throw new TConfigurationException('curl_extension_required');
 		parent::init($config);
 	}
   
@@ -96,7 +96,7 @@ 
 	 * @param string $value the etcd host
 	 */
 	public function setHost($value) {
-	$this->_host = TPropertyValue::ensureString($value);
+	$this->_host=TPropertyValue::ensureString($value);
 	}
 	
   /**
@@ -112,7 +112,7 @@ 
 	 * @param integer $value the etcd port
 	 */
 	public function setPort($value) {
-	$this->_port = TPropertyValue::ensureInteger($value);
+	$this->_port=TPropertyValue::ensureInteger($value);
 	}
 	 
   /**
@@ -128,7 +128,7 @@ 
 	 * @param string $value the directory to store values in
 	 */
 	public function setDir($value) {
-	$this->_dir = TPropertyValue::ensureString($value);
+	$this->_dir=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	protected function getValue($key)
 	{
-		$result = $this->request('GET', $this->_dir . '/' . $key);
+		$result=$this->request('GET', $this->_dir.'/'.$key);
 	return property_exists($result, 'errorCode') ? false : unserialize($result->node->value);
 	}
 
@@ -154,9 +154,9 @@ 
 	 */
 	protected function setValue($key, $value, $expire)
 	{
-	$value = ['value' => serialize($value)];
-	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+	$value=['value' => serialize($value)];
+	if($expire > 0) $value['ttl']=$expire;
+		$result=$this->request('PUT', $this->_dir.'/'.$key, $value);
 	return !property_exists($result, 'errorCode');
 	}
 
@@ -171,9 +171,9 @@ 
 	 */
 	protected function addValue($key, $value, $expire)
 	{
-	$value = ['value' => serialize($value), 'prevExist' => 'false'];
-	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+	$value=['value' => serialize($value), 'prevExist' => 'false'];
+	if($expire > 0) $value['ttl']=$expire;
+		$result=$this->request('PUT', $this->_dir.'/'.$key, $value);
 	return !property_exists($result, 'errorCode');
 	}
 
@@ -185,7 +185,7 @@ 
 	 */
 	protected function deleteValue($key)
 	{
-		$this->request('DELETE', $this->_dir . '/' . $key);
+		$this->request('DELETE', $this->_dir.'/'.$key);
 	return true;
 	}
 
@@ -195,7 +195,7 @@ 
 	 */
 	public function flush()
 	{
-	 $this->request('DELETE', $this->_dir . '?recursive=true');
+	 $this->request('DELETE', $this->_dir.'?recursive=true');
 	}
   
   /**
@@ -208,15 +208,15 @@ 
    * @param array the additional post data to send with the request
    * @return \stdClass the response from the etcd instance
    */
-  protected function request($method, $key, $value = []) {
-	$curl = curl_init("http://{$this->_host}:{$this->_port}/v2/keys/{$key}");
+  protected function request($method, $key, $value=[]) {
+	$curl=curl_init("http://{$this->_host}:{$this->_port}/v2/keys/{$key}");
 	curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
 	curl_setopt($curl, CURLOPT_HEADER, false);
 	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
 	curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/x-www-form-urlencoded']);
 	curl_setopt($curl, CURLOPT_POSTFIELDS, http_build_query($value));
-	$response = curl_exec($curl);
+	$response=curl_exec($curl);
 	curl_close($curl);
 	return json_decode($response);
   }

framework/Collections/TPriorityMap.php

Doc Comments +5 added lines, -2 removed lines

@@ -119,6 +119,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -136,6 +137,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param numeric sets the default priority of inserted items without a specified priority
+	 * @param integer $value
 	 */
 	protected function setDefaultPriority($value)
 	{
@@ -153,6 +155,7 @@ 
 	/**
 	 * This must be called internally or when instantiated.
 	 * @param integer The precision of numeric priorities.
+	 * @param integer $value
 	 */
 	protected function setPrecision($value)
 	{
@@ -162,7 +165,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the map.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the map.
+	 * @return \ArrayIterator an iterator for traversing the items in the map.
 	 */
 	public function getIterator()
 	{
@@ -343,7 +346,7 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 * @param numeric|null priority, default: null, filled in with default priority
-	 * @return numeric priority at which the pair was added
+	 * @return string priority at which the pair was added
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
 	public function add($key, $value, $priority = null)

Spacing +70 added lines, -70 removed lines

@@ -65,15 +65,15 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * @var boolean whether this list is read-only
 	 */
-	private $_r = false;
+	private $_r=false;
 	/**
 	 * @var boolean indicates if the _d is currently ordered.
 	 */
-	private $_o = false;
+	private $_o=false;
 	/**
 	 * @var array cached flattened internal data storage
 	 */
@@ -81,15 +81,15 @@ 
 	/**
 	 * @var integer number of items contain within the map
 	 */
-	private $_c = 0;
+	private $_c=0;
 	/**
 	 * @var numeric the default priority of items without specified priorities
 	 */
-	private $_dp = 10;
+	private $_dp=10;
 	/**
 	 * @var integer the precision of the numeric priorities within this priority list.
 	 */
-	private $_p = 8;
+	private $_p=8;
 
 	/**
 	 * Constructor.
@@ -100,9 +100,9 @@ 
 	 * @param integer the precision of the numeric priorities
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data = null, $readOnly = false, $defaultPriority = 10, $precision = 8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
-		if($data !== null)
+		if($data!==null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
@@ -122,7 +122,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r = TPropertyValue::ensureBoolean($value);
+		$this->_r=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	protected function setPrecision($value)
 	{
-		$this->_p = TPropertyValue::ensureInteger($value);
+		$this->_p=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	protected function sortPriorities() {
 		if(!$this->_o) {
 			ksort($this->_d, SORT_NUMERIC);
-			$this->_o = true;
+			$this->_o=true;
 		}
 	}
 
@@ -189,9 +189,9 @@ 
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd = [];
+		$this->_fd=[];
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -219,11 +219,11 @@ 
 	 * it will be set to the default {@link getDefaultPriority}
 	 * @return integer the number of items in the map at the specified priority
 	 */
-	public function getPriorityCount($priority = null)
+	public function getPriorityCount($priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
@@ -257,16 +257,16 @@ 
 	 * and numeric is a specific priority.  default: false, any priority.
 	 * @return mixed the element at the offset, null if no element is found at the offset
 	 */
-	public function itemAt($key, $priority = false)
+	public function itemAt($key, $priority=false)
 	{
-		if($priority === false){
-			$map = $this->flattenPriorities();
-			return isset($map[$key])?$map[$key]:null;
+		if($priority===false) {
+			$map=$this->flattenPriorities();
+			return isset($map[$key]) ? $map[$key] : null;
 		} else {
-			if($priority === null)
-				$priority = $this->getDefaultPriority();
-			$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
-			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
+			if($priority===null)
+				$priority=$this->getDefaultPriority();
+			$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key])) ? $this->_d[$priority][$key] : null;
 		}
 	}
 
@@ -277,15 +277,15 @@ 
 	 * @param numeric|null the priority.  default: null, filled in with the default priority numeric.
 	 * @return numeric old priority of the item
 	 */
-	public function setPriorityAt($key, $priority = null)
+	public function setPriorityAt($key, $priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		$oldpriority = $this->priorityAt($key);
-		if($oldpriority !== false && $oldpriority != $priority) {
-			$value = $this->remove($key, $oldpriority);
+		$oldpriority=$this->priorityAt($key);
+		if($oldpriority!==false && $oldpriority!=$priority) {
+			$value=$this->remove($key, $oldpriority);
 			$this->add($key, $value, $priority);
 		}
 		return $oldpriority;
@@ -296,13 +296,13 @@ 
 	 * @param numeric priority of the items to get.  Defaults to null, filled in with the default priority, if left blank.
 	 * @return array all items at priority in index order, null if there are no items at that priority
 	 */
-	public function itemsAtPriority($priority = null)
+	public function itemsAtPriority($priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	{
 		$this->sortPriorities();
 		foreach($this->_d as $priority => $items)
-			if(($index = array_search($item, $items, true)) !== false)
+			if(($index=array_search($item, $items, true))!==false)
 				return $priority;
 		return false;
 	}
@@ -346,11 +346,11 @@ 
 	 * @return numeric priority at which the pair was added
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key, $value, $priority = null)
+	public function add($key, $value, $priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!$this->_r)
 		{
@@ -359,17 +359,17 @@ 
 				{
 					unset($this->_d[$innerpriority][$key]);
 					$this->_c--;
-					if(count($this->_d[$innerpriority]) === 0)
+					if(count($this->_d[$innerpriority])===0)
 						unset($this->_d[$innerpriority]);
 				}
 			if(!isset($this->_d[$priority])) {
-				$this->_d[$priority] = [$key => $value];
-				$this->_o = false;
+				$this->_d[$priority]=[$key => $value];
+				$this->_o=false;
 			}
 			else
-				$this->_d[$priority][$key] = $value;
+				$this->_d[$priority][$key]=$value;
 			$this->_c++;
-			$this->_fd = null;
+			$this->_fd=null;
 		}
 		else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
@@ -388,45 +388,45 @@ 
 	 * @return mixed the removed value, null if no such key exists.
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function remove($key, $priority = false)
+	public function remove($key, $priority=false)
 	{
 		if(!$this->_r)
 		{
-			if($priority === null)
-				$priority = $this->getDefaultPriority();
+			if($priority===null)
+				$priority=$this->getDefaultPriority();
 
-			if($priority === false)
+			if($priority===false)
 			{
 				$this->sortPriorities();
 				foreach($this->_d as $priority => $items)
 					if(array_key_exists($key, $items))
 					{
-						$value = $this->_d[$priority][$key];
+						$value=$this->_d[$priority][$key];
 						unset($this->_d[$priority][$key]);
 						$this->_c--;
-						if(count($this->_d[$priority]) === 0)
+						if(count($this->_d[$priority])===0)
 						{
 							unset($this->_d[$priority]);
-							$this->_o = false;
+							$this->_o=false;
 						}
-						$this->_fd = null;
+						$this->_fd=null;
 						return $value;
 					}
 				return null;
 			}
 			else
 			{
-				$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 				if(isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
 				{
-					$value = $this->_d[$priority][$key];
+					$value=$this->_d[$priority][$key];
 					unset($this->_d[$priority][$key]);
 					$this->_c--;
-					if(count($this->_d[$priority]) === 0) {
+					if(count($this->_d[$priority])===0) {
 						unset($this->_d[$priority]);
-						$this->_o = false;
+						$this->_o=false;
 					}
-					$this->_fd = null;
+					$this->_fd=null;
 					return $value;
 				}
 				else
@@ -453,7 +453,7 @@ 
 	 */
 	public function contains($key)
 	{
-		$map = $this->flattenPriorities();
+		$map=$this->flattenPriorities();
 		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 
@@ -475,15 +475,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are below a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayBelowPriority($priority, $inclusive = false)
+	public function toArrayBelowPriority($priority, $inclusive=false)
 	{
 		$this->sortPriorities();
-		$items = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -495,15 +495,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are above a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayAbovePriority($priority, $inclusive = true)
+	public function toArrayAbovePriority($priority, $inclusive=true)
 	{
 		$this->sortPriorities();
-		$items = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -534,7 +534,7 @@ 
 			foreach($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -560,7 +560,7 @@ 
 			foreach($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

Braces +9 added lines, -18 removed lines

@@ -365,13 +365,11 @@ 
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority] = [$key => $value];
 				$this->_o = false;
-			}
-			else
+			} else
 				$this->_d[$priority][$key] = $value;
 			$this->_c++;
 			$this->_fd = null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
 		return $priority;
 	}
@@ -413,8 +411,7 @@ 
 						return $value;
 					}
 				return null;
-			}
-			else
+			} else
 			{
 				$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 				if(isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
@@ -428,12 +425,10 @@ 
 					}
 					$this->_fd = null;
 					return $value;
-				}
-				else
+				} else
 					return null;
 			}
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
@@ -526,15 +521,13 @@ 
 					$this->add($key, $value, $priority);
 				}
 			}
-		}
-		elseif(is_array($data) || $data instanceof \Traversable)
+		} elseif(is_array($data) || $data instanceof \Traversable)
 		{
 			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key => $value)
 				$this->add($key, $value);
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -554,13 +547,11 @@ 
 				foreach($data->itemsAtPriority($priority) as $key => $value)
 					$this->add($key, $value, $priority);
 			}
-		}
-		elseif(is_array($data) || $data instanceof \Traversable)
+		} elseif(is_array($data) || $data instanceof \Traversable)
 		{
 			foreach($data as $key => $value)
 				$this->add($key, $value);
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Doc Comments +5 added lines, -1 removed lines

@@ -36,6 +36,9 @@ 
 	private $_relation; //data from an entry of TActiveRecord::$RELATION
 	private $_fkeys;
 
+	/**
+	 * @param TActiveRecord $record
+	 */
 	public function __construct($record, $property = null, $relation = null)
 	{
 		$this->_record = $record;
@@ -169,6 +172,7 @@ 
 	 * An instance of TActiveRecordHasOne, TActiveRecordBelongsTo, TActiveRecordHasMany,
 	 * or TActiveRecordHasManyAssocation will be returned.
 	 * @param TActiveRecordCriteria search criteria
+	 * @param \Prado\Data\DataGateway\TSqlCriteria $criteria
 	 * @return TActiveRecordRelation record relationship handler instnace.
 	 * @throws TActiveRecordException if property is not defined or missing.
 	 */
@@ -197,7 +201,7 @@ 
 	}
 
 	/**
-	 * @return TActiveRecordRelationCommand
+	 * @return boolean
 	 */
 	public function updateAssociatedRecords($updateBelongsTo = false)
 	{

Spacing +24 added lines, -24 removed lines

@@ -36,11 +36,11 @@ 
 	private $_relation; //data from an entry of TActiveRecord::$RELATION
 	private $_fkeys;
 
-	public function __construct($record, $property = null, $relation = null)
+	public function __construct($record, $property=null, $relation=null)
 	{
-		$this->_record = $record;
-		$this->_property = $property;
-		$this->_relation = $relation;
+		$this->_record=$record;
+		$this->_property=$property;
+		$this->_relation=$relation;
 	}
 
 	/**
@@ -49,12 +49,12 @@ 
 	 */
 	public function hasRecordRelation()
 	{
-		return $this->_relation !== null;
+		return $this->_relation!==null;
 	}
 
 	public function getPropertyValue()
 	{
-		$obj = $this->getSourceRecord();
+		$obj=$this->getSourceRecord();
 		return $obj->getColumnValue($this->getProperty());
 	}
 
@@ -81,8 +81,8 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		if($this->_fkeys === null)
-			$this->_fkeys = $this->getRelationHandler()->getRelationForeignKeys();
+		if($this->_fkeys===null)
+			$this->_fkeys=$this->getRelationHandler()->getRelationForeignKeys();
 		return $this->_fkeys;
 	}
 
@@ -117,7 +117,7 @@ 
 	 */
 	public function getCondition()
 	{
-		return isset($this->_relation[3])?$this->_relation[3]:null;
+		return isset($this->_relation[3]) ? $this->_relation[3] : null;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function getParameters()
 	{
-		return isset($this->_relation[4])?$this->_relation[4]:[];
+		return isset($this->_relation[4]) ? $this->_relation[4] : [];
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function hasFkField()
 	{
-		$notManyToMany = $this->getRelationType() !== TActiveRecord::MANY_TO_MANY;
+		$notManyToMany=$this->getRelationType()!==TActiveRecord::MANY_TO_MANY;
 		return $notManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -152,7 +152,7 @@ 
 	 */
 	public function hasAssociationTable()
 	{
-		$isManyToMany = $this->getRelationType() === TActiveRecord::MANY_TO_MANY;
+		$isManyToMany=$this->getRelationType()===TActiveRecord::MANY_TO_MANY;
 		return $isManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -172,15 +172,15 @@ 
 	 * @return TActiveRecordRelation record relationship handler instnace.
 	 * @throws TActiveRecordException if property is not defined or missing.
 	 */
-	public function getRelationHandler($criteria = null)
+	public function getRelationHandler($criteria=null)
 	{
 		if(!$this->hasRecordRelation())
 		{
 			throw new TActiveRecordException('ar_undefined_relation_prop',
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
-		if($criteria === null)
-			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+		if($criteria===null)
+			$criteria=new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
@@ -199,20 +199,20 @@ 
 	/**
 	 * @return TActiveRecordRelationCommand
 	 */
-	public function updateAssociatedRecords($updateBelongsTo = false)
+	public function updateAssociatedRecords($updateBelongsTo=false)
 	{
-		$success = true;
+		$success=true;
 		foreach($this->_record->getRecordRelations() as $data)
 		{
-			list($property, $relation) = $data;
-			$belongsTo = $relation[0] == TActiveRecord::BELONGS_TO;
+			list($property, $relation)=$data;
+			$belongsTo=$relation[0]==TActiveRecord::BELONGS_TO;
 			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
 			{
-				$obj = $this->getSourceRecord();
+				$obj=$this->getSourceRecord();
 				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))
 				{
-					$context = new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
-					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;
+					$context=new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
+					$success=$context->getRelationHandler()->updateAssociatedRecords() && $success;
 				}
 			}
 		}
@@ -222,9 +222,9 @@ 
 	protected function isEmptyFkObject($obj)
 	{
 		if(is_object($obj))
-			return $obj instanceof TList ? $obj->count() === 0 : false;
+			return $obj instanceof TList ? $obj->count()===0 : false;
 		elseif(is_array($obj))
-			return count($obj) === 0;
+			return count($obj)===0;
 		else
 			return empty($obj);
 	}

framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php

Doc Comments +8 added lines

@@ -52,6 +52,10 @@ 
 		}
 	}
 
+	/**
+	 * @param \Prado\Data\ActiveRecord\Scaffold\TScaffoldEditView $parent
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
+	 */
 	public function createScaffoldInput($parent, $item, $column, $record)
 	{
 		$this->_parent = $parent;
@@ -68,6 +72,10 @@ 
 		$label->setForControl(self::DEFAULT_ID);
 	}
 
+	/**
+	 * @param \Prado\Data\ActiveRecord\Scaffold\TScaffoldEditView $parent
+	 * @param \Prado\Data\ActiveRecord\TActiveRecord $record
+	 */
 	public function loadScaffoldInput($parent, $item, $column, $record)
 	{
 		$this->_parent = $parent;

Spacing +14 added lines, -14 removed lines

@@ -15,7 +15,7 @@ 
 
 class TScaffoldInputBase
 {
-	const DEFAULT_ID = 'scaffold_input';
+	const DEFAULT_ID='scaffold_input';
 	private $_parent;
 
 	protected function getParent()
@@ -26,25 +26,25 @@ 
 	public static function createInputBuilder($record)
 	{
 		$record->getDbConnection()->setActive(true); //must be connected before retrieving driver name!
-		$driver = $record->getDbConnection()->getDriverName();
+		$driver=$record->getDbConnection()->getDriverName();
 		switch(strtolower($driver))
 		{
 			case 'sqlite': //sqlite 3
 			case 'sqlite2': //sqlite 2
-				require_once(dirname(__FILE__) . '/TSqliteScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TSqliteScaffoldInput.php');
 				return new TSqliteScaffoldInput($conn);
 			case 'mysqli':
 			case 'mysql':
-				require_once(dirname(__FILE__) . '/TMysqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TMysqlScaffoldInput.php');
 				return new TMysqlScaffoldInput($conn);
 			case 'pgsql':
-				require_once(dirname(__FILE__) . '/TPgsqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TPgsqlScaffoldInput.php');
 				return new TPgsqlScaffoldInput($conn);
 			case 'mssql':
-				require_once(dirname(__FILE__) . '/TMssqlScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TMssqlScaffoldInput.php');
 				return new TMssqlScaffoldInput($conn);
 			case 'ibm':
-				require_once(dirname(__FILE__) . '/TIbmScaffoldInput.php');
+				require_once(dirname(__FILE__).'/TIbmScaffoldInput.php');
 				return new TIbmScaffoldInput($conn);
 			default:
 				throw new TConfigurationException(
@@ -54,7 +54,7 @@ 
 
 	public function createScaffoldInput($parent, $item, $column, $record)
 	{
-		$this->_parent = $parent;
+		$this->_parent=$parent;
 		$item->setCustomData($column->getColumnId());
 		$this->createControl($item->_input, $column, $record);
 		if($item->_input->findControl(self::DEFAULT_ID))
@@ -63,31 +63,31 @@ 
 
 	protected function createControlLabel($label, $column, $record)
 	{
-		$fieldname = ucwords(str_replace('_', ' ', $column->getColumnId())) . ':';
+		$fieldname=ucwords(str_replace('_', ' ', $column->getColumnId())).':';
 		$label->setText($fieldname);
 		$label->setForControl(self::DEFAULT_ID);
 	}
 
 	public function loadScaffoldInput($parent, $item, $column, $record)
 	{
-		$this->_parent = $parent;
+		$this->_parent=$parent;
 		if($this->getIsEnabled($column, $record))
 		{
-			$prop = $column->getColumnId();
+			$prop=$column->getColumnId();
 			$record->setColumnValue($prop, $this->getControlValue($item->_input, $column, $record));
 		}
 	}
 
 	protected function getIsEnabled($column, $record)
 	{
-		return !($this->getParent()->getRecordPk() !== null
+		return !($this->getParent()->getRecordPk()!==null
 				&& $column->getIsPrimaryKey() || $column->hasSequence());
 	}
 
 	protected function getRecordPropertyValue($column, $record)
 	{
-		$value = $record->getColumnValue($column->getColumnId());
-		if($column->getDefaultValue() !== TDbTableColumn::UNDEFINED_VALUE && $value === null)
+		$value=$record->getColumnValue($column->getColumnId());
+		if($column->getDefaultValue()!==TDbTableColumn::UNDEFINED_VALUE && $value===null)
 			return $column->getDefaultValue();
 		else
 			return $value;

framework/Data/ActiveRecord/TActiveRecord.php

Doc Comments +10 added lines, -2 removed lines

@@ -324,7 +324,7 @@ 
 	/**
 	 * Gets the current Db connection, the connection object is obtained from
 	 * the TActiveRecordManager if connection is currently null.
-	 * @return TDbConnection current db connection for this object.
+	 * @return \Prado\Data\TDbConnection current db connection for this object.
 	 */
 	public function getDbConnection()
 	{
@@ -511,6 +511,7 @@ 
 	 * Delete multiple records using a criteria.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return int number of records deleted.
 	 */
 	public function deleteAll($criteria = null, $parameters = [])
@@ -577,6 +578,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
 	public function find($criteria, $parameters = [])
@@ -593,6 +595,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
 	public function findAll($criteria = null, $parameters = [])
@@ -706,6 +709,7 @@ 
 	 * Find the number of records.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return int number of records.
 	 */
 	public function count($criteria = null, $parameters = [])
@@ -721,6 +725,7 @@ 
 	 * value equal to the $property value.
 	 * @param string relationship/property name corresponding to keys in $RELATION array.
 	 * @param array method call arguments.
+	 * @param string $name
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
 	protected function getRelationHandler($name, $args = [])
@@ -945,6 +950,7 @@ 
 	 * Raised before the record attempt to insert its data into the database.
 	 * To prevent the insert operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onInsert($param)
 	{
@@ -955,6 +961,7 @@ 
 	 * Raised before the record attempt to delete its data from the database.
 	 * To prevent the delete operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onDelete($param)
 	{
@@ -965,6 +972,7 @@ 
 	 * Raised before the record attempt to update its data in the database.
 	 * To prevent the update operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onUpdate($param)
 	{
@@ -1048,7 +1056,7 @@ 
 	
 		/**
 		 * Return record data as JSON
-		 * @return JSON
+		 * @return string
 		 * @since 3.2.4
 		 */
 		public function toJSON(){

Spacing +124 added lines, -124 removed lines

@@ -152,20 +152,20 @@ 
  */
 abstract class TActiveRecord extends \Prado\TComponent
 {
-	const BELONGS_TO = 'BELONGS_TO';
-	const HAS_ONE = 'HAS_ONE';
-	const HAS_MANY = 'HAS_MANY';
-	const MANY_TO_MANY = 'MANY_TO_MANY';
+	const BELONGS_TO='BELONGS_TO';
+	const HAS_ONE='HAS_ONE';
+	const HAS_MANY='HAS_MANY';
+	const MANY_TO_MANY='MANY_TO_MANY';
 
-	const STATE_NEW = 0;
-	const STATE_LOADED = 1;
-	const STATE_DELETED = 2;
+	const STATE_NEW=0;
+	const STATE_LOADED=1;
+	const STATE_DELETED=2;
 
 	/**
 	 * @var integer record state: 0 = new, 1 = loaded, 2 = deleted.
 	 * @since 3.1.2
 	 */
-	protected $_recordState = 0; // use protected so that serialization is fine
+	protected $_recordState=0; // use protected so that serialization is fine
 
 	/**
 	 * This static variable defines the column mapping.
@@ -175,8 +175,8 @@ 
 	 * @var array column mapping. Keys: physical column names, values: logical column names.
 	 * @since 3.1.1
 	 */
-	public static $COLUMN_MAPPING = [];
-	private static $_columnMapping = [];
+	public static $COLUMN_MAPPING=[];
+	private static $_columnMapping=[];
 
 	/**
 	 * This static variable defines the relationships.
@@ -185,8 +185,8 @@ 
 	 * @var array relationship.
 	 * @since 3.1.1
 	 */
-	public static $RELATIONS = [];
-	private static $_relations = [];
+	public static $RELATIONS=[];
+	private static $_relations=[];
 
 	/**
 	 * @var TDbConnection database connection object.
@@ -226,9 +226,9 @@ 
 	 * @param array optional name value pair record data.
 	 * @param TDbConnection optional database connection this object record use.
 	 */
-	public function __construct($data = [], $connection = null)
+	public function __construct($data=[], $connection=null)
 	{
-		if($connection !== null)
+		if($connection!==null)
 			$this->setDbConnection($connection);
 		$this->setupColumnMapping();
 		$this->setupRelations();
@@ -265,7 +265,7 @@ 
 	public function __set($name, $value)
 	{
 		if($this->hasRecordRelation($name) && !$this->canSetProperty($name))
-			$this->$name = $value;
+			$this->$name=$value;
 		else
 			parent::__set($name, $value);
 	}
@@ -275,11 +275,11 @@ 
 	 */
 	private function setupColumnMapping()
 	{
-		$className = get_class($this);
+		$className=get_class($this);
 		if(!isset(self::$_columnMapping[$className]))
 		{
-			$class = new ReflectionClass($className);
-			self::$_columnMapping[$className] = $class->getStaticPropertyValue('COLUMN_MAPPING');
+			$class=new ReflectionClass($className);
+			self::$_columnMapping[$className]=$class->getStaticPropertyValue('COLUMN_MAPPING');
 		}
 	}
 
@@ -288,14 +288,14 @@ 
 	 */
 	private function setupRelations()
 	{
-		$className = get_class($this);
+		$className=get_class($this);
 		if(!isset(self::$_relations[$className]))
 		{
-			$class = new ReflectionClass($className);
-			$relations = [];
+			$class=new ReflectionClass($className);
+			$relations=[];
 			foreach($class->getStaticPropertyValue('RELATIONS') as $key => $value)
-				$relations[strtolower($key)] = [$key,$value];
-			self::$_relations[$className] = $relations;
+				$relations[strtolower($key)]=[$key, $value];
+			self::$_relations[$className]=$relations;
 		}
 	}
 
@@ -306,7 +306,7 @@ 
 	public function copyFrom($data)
 	{
 		if(is_object($data))
-			$data = get_object_vars($data);
+			$data=get_object_vars($data);
 		if(!is_array($data))
 			throw new TActiveRecordException('ar_data_invalid', get_class($this));
 		foreach($data as $name => $value)
@@ -316,7 +316,7 @@ 
 
 	public static function getActiveDbConnection()
 	{
-		if(($db = self::getRecordManager()->getDbConnection()) !== null)
+		if(($db=self::getRecordManager()->getDbConnection())!==null)
 			$db->setActive(true);
 		return $db;
 	}
@@ -328,8 +328,8 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection === null)
-			$this->_connection = self::getActiveDbConnection();
+		if($this->_connection===null)
+			$this->_connection=self::getActiveDbConnection();
 		return $this->_connection;
 	}
 
@@ -338,7 +338,7 @@ 
 	 */
 	public function setDbConnection($connection)
 	{
-		$this->_connection = $connection;
+		$this->_connection=$connection;
 	}
 
 	/**
@@ -357,20 +357,20 @@ 
 	 * @param boolean true to perform strict identity comparison
 	 * @return boolean true if $record equals, false otherwise.
 	 */
-	public function equals(TActiveRecord $record, $strict = false)
+	public function equals(TActiveRecord $record, $strict=false)
 	{
-		if($record === null || get_class($this) !== get_class($record))
+		if($record===null || get_class($this)!==get_class($record))
 			return false;
-		$tableInfo = $this->getRecordTableInfo();
-		$pks = $tableInfo->getPrimaryKeys();
-		$properties = count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
-		$equals = true;
+		$tableInfo=$this->getRecordTableInfo();
+		$pks=$tableInfo->getPrimaryKeys();
+		$properties=count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
+		$equals=true;
 		foreach($properties as $prop)
 		{
 			if($strict)
-				$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
+				$equals=$equals && $this->getColumnValue($prop)===$record->getColumnValue($prop);
 			else
-				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
+				$equals=$equals && $this->getColumnValue($prop)==$record->getColumnValue($prop);
 			if(!$equals)
 				return false;
 		}
@@ -386,13 +386,13 @@ 
 	 * @param string active record class name.
 	 * @return TActiveRecord active record finder instance.
 	 */
-	public static function finder($className = __CLASS__)
+	public static function finder($className=__CLASS__)
 	{
-		static $finders = [];
+		static $finders=[];
 		if(!isset($finders[$className]))
 		{
-			$f = Prado::createComponent($className);
-			$finders[$className] = $f;
+			$f=Prado::createComponent($className);
+			$finders[$className]=$f;
 		}
 		return $finders[$className];
 	}
@@ -421,18 +421,18 @@ 
 	 */
 	public function save()
 	{
-		$gateway = $this->getRecordGateway();
-		$param = new TActiveRecordChangeEventParameter();
-		if($this->_recordState === self::STATE_NEW)
+		$gateway=$this->getRecordGateway();
+		$param=new TActiveRecordChangeEventParameter();
+		if($this->_recordState===self::STATE_NEW)
 		{
 			$this->onInsert($param);
 			if($param->getIsValid() && $gateway->insert($this))
 			{
-				$this->_recordState = self::STATE_LOADED;
+				$this->_recordState=self::STATE_LOADED;
 				return true;
 			}
 		}
-		elseif($this->_recordState === self::STATE_LOADED)
+		elseif($this->_recordState===self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
 			if($param->getIsValid() && $gateway->update($this))
@@ -451,14 +451,14 @@ 
 	 */
 	public function delete()
 	{
-		if($this->_recordState === self::STATE_LOADED)
+		if($this->_recordState===self::STATE_LOADED)
 		{
-			$gateway = $this->getRecordGateway();
-			$param = new TActiveRecordChangeEventParameter();
+			$gateway=$this->getRecordGateway();
+			$param=new TActiveRecordChangeEventParameter();
 			$this->onDelete($param);
 			if($param->getIsValid() && $gateway->delete($this))
 			{
-				$this->_recordState = self::STATE_DELETED;
+				$this->_recordState=self::STATE_DELETED;
 				return true;
 			}
 		}
@@ -494,8 +494,8 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		return $this->getRecordGateway()->deleteRecordsByPk($this, (array)$keys);
+			$keys=func_get_args();
+		return $this->getRecordGateway()->deleteRecordsByPk($this, (array) $keys);
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 	/**
@@ -513,10 +513,10 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records deleted.
 	 */
-	public function deleteAll($criteria = null, $parameters = [])
+	public function deleteAll($criteria=null, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
 		return $this->getRecordGateway()->deleteRecordsByCriteria($this, $criteria);
 	}
 
@@ -538,9 +538,9 @@ 
 	 */
 	protected function populateObjects($reader)
 	{
-		$result = [];
+		$result=[];
 		foreach($reader as $data)
-			$result[] = $this->populateObject($data);
+			$result[]=$this->populateObject($data);
 		return $result;
 	}
 
@@ -557,8 +557,8 @@ 
 	{
 		if(empty($data))
 			return null;
-		$record = new $type($data);
-		$record->_recordState = self::STATE_LOADED;
+		$record=new $type($data);
+		$record->_recordState=self::STATE_LOADED;
 		return $record;
 	}
 
@@ -579,12 +579,12 @@ 
 	 * @param mixed parameter values.
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
-	public function find($criteria, $parameters = [])
+	public function find($criteria, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordsByCriteria($this, $criteria);
+		$data=$this->getRecordGateway()->findRecordsByCriteria($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -595,12 +595,12 @@ 
 	 * @param mixed parameter values.
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
-	public function findAll($criteria = null, $parameters = [])
+	public function findAll($criteria=null, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
-			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if($criteria!==null)
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
+		$result=$this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
 		return $this->populateObjects($result);
 	}
 
@@ -618,11 +618,11 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
+		if($keys===null)
 			return null;
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$data = $this->getRecordGateway()->findRecordByPK($this, $keys);
+			$keys=func_get_args();
+		$data=$this->getRecordGateway()->findRecordByPK($this, $keys);
 		return $this->populateObject($data);
 	}
 
@@ -646,8 +646,8 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$result = $this->getRecordGateway()->findRecordsByPks($this, (array)$keys);
+			$keys=func_get_args();
+		$result=$this->getRecordGateway()->findRecordsByPks($this, (array) $keys);
 		return $this->populateObjects($result);
 	}
 
@@ -659,12 +659,12 @@ 
 	 * @param array $parameters
 	 * @return TActiveRecord, null if no result is returned.
 	 */
-	public function findBySql($sql, $parameters = [])
+	public function findBySql($sql, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getRecordCriteria($sql, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($sql, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordBySql($this, $criteria);
+		$data=$this->getRecordGateway()->findRecordBySql($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -676,11 +676,11 @@ 
 	 * @param array $parameters
 	 * @return array matching active records. Empty array is returned if no result is found.
 	 */
-	public function findAllBySql($sql, $parameters = [])
+	public function findAllBySql($sql, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		$criteria = $this->getRecordCriteria($sql, $parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsBySql($this, $criteria);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getRecordCriteria($sql, $parameters, $args);
+		$result=$this->getRecordGateway()->findRecordsBySql($this, $criteria);
 		return $this->populateObjects($result);
 	}
 
@@ -698,7 +698,7 @@ 
 	 */
 	public function findAllByIndex($criteria, $fields, $values)
 	{
-		$result = $this->getRecordGateway()->findRecordsByIndex($this, $criteria, $fields, $values);
+		$result=$this->getRecordGateway()->findRecordsByIndex($this, $criteria, $fields, $values);
 		return $this->populateObjects($result);
 	}
 
@@ -708,11 +708,11 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria = null, $parameters = [])
+	public function count($criteria=null, $parameters=[])
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
-			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if($criteria!==null)
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
 		return $this->getRecordGateway()->countRecords($this, $criteria);
 	}
 
@@ -723,11 +723,11 @@ 
 	 * @param array method call arguments.
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
-	protected function getRelationHandler($name, $args = [])
+	protected function getRelationHandler($name, $args=[])
 	{
-		if(($context = $this->createRelationContext($name)) !== null)
+		if(($context=$this->createRelationContext($name))!==null)
 		{
-			$criteria = $this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
+			$criteria=$this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
 		}
 		else
@@ -745,9 +745,9 @@ 
 	 */
 	protected function createRelationContext($name)
 	{
-		if(($definition = $this->getRecordRelation($name)) !== null)
+		if(($definition=$this->getRecordRelation($name))!==null)
 		{
-			list($property, $relation) = $definition;
+			list($property, $relation)=$definition;
 			return new TActiveRecordRelationContext($this, $property, $relation);
 		}
 		else
@@ -791,7 +791,7 @@ 
 	 */
 	protected function fetchResultsFor($property)
 	{
-		if(($context = $this->createRelationContext($property)) !== null)
+		if(($context=$this->createRelationContext($property))!==null)
 			return $context->getRelationHandler()->fetchResultsInto($this);
 		else
 			return false;
@@ -828,29 +828,29 @@ 
 	 */
 	public function __call($method, $args)
 	{
-		$delete = false;
-		if(strncasecmp($method, 'with', 4) === 0)
+		$delete=false;
+		if(strncasecmp($method, 'with', 4)===0)
 		{
-			$property = $method[4] === '_' ? substr($method, 5) : substr($method, 4);
+			$property=$method[4]==='_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
 		}
-		elseif($findOne = strncasecmp($method, 'findby', 6) === 0)
-			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
-		elseif(strncasecmp($method, 'findallby', 9) === 0)
-			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
-		elseif($delete = strncasecmp($method, 'deleteby', 8) === 0)
-			$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
-		elseif($delete = strncasecmp($method, 'deleteallby', 11) === 0)
-			$condition = $method[11] === '_' ? substr($method, 12) : substr($method, 11);
+		elseif($findOne=strncasecmp($method, 'findby', 6)===0)
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		elseif(strncasecmp($method, 'findallby', 9)===0)
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		elseif($delete=strncasecmp($method, 'deleteby', 8)===0)
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		elseif($delete=strncasecmp($method, 'deleteallby', 11)===0)
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 		{
-			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
+			if($this->getInvalidFinderResult()==TActiveRecordInvalidFinderResult::Exception)
 				throw new TActiveRecordException('ar_invalid_finder_method', $method);
 			else
 				return null;
 		}
 
-		$criteria = $this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else
@@ -864,7 +864,7 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
+		if($this->_invalidFinderResult!==null)
 			return $this->_invalidFinderResult;
 
 		return self::getRecordManager()->getInvalidFinderResult();
@@ -879,10 +879,10 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
-			$this->_invalidFinderResult = null;
+		if($value===null)
+			$this->_invalidFinderResult=null;
 		else
-			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
+			$this->_invalidFinderResult=TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
 	}
 
 	/**
@@ -894,11 +894,11 @@ 
 	 * @param array additional parameters obtained from function_get_args().
 	 * @return TSqlCriteria criteria object.
 	 */
-	protected function getRecordCriteria($criteria, $parameters, $args = [])
+	protected function getRecordCriteria($criteria, $parameters, $args=[])
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
+			$useArgs=!is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		elseif($criteria instanceof TSqlCriteria)
@@ -980,9 +980,9 @@ 
 	 */
 	public function getColumnValue($columnName)
 	{
-		$className = get_class($this);
+		$className=get_class($this);
 		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName = self::$_columnMapping[$className][$columnName];
+			$columnName=self::$_columnMapping[$className][$columnName];
 		return $this->$columnName;
 	}
 
@@ -995,10 +995,10 @@ 
 	 */
 	public function setColumnValue($columnName, $value)
 	{
-		$className = get_class($this);
+		$className=get_class($this);
 		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName = self::$_columnMapping[$className][$columnName];
-		$this->$columnName = $value;
+			$columnName=self::$_columnMapping[$className][$columnName];
+		$this->$columnName=$value;
 	}
 
 	/**
@@ -1008,9 +1008,9 @@ 
 	 */
 	public function getRecordRelation($property)
 	{
-		$className = get_class($this);
-		$property = strtolower($property);
-		return isset(self::$_relations[$className][$property])?self::$_relations[$className][$property]:null;
+		$className=get_class($this);
+		$property=strtolower($property);
+		return isset(self::$_relations[$className][$property]) ?self::$_relations[$className][$property] : null;
 	}
 
 	/**
@@ -1037,10 +1037,10 @@ 
 		 * @return array of column name and column values
 		 * @since 3.2.4
 		 */
-		public function toArray(){
-			$result = [];
-			foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
-					$result[$columnName] = $this->getColumnValue($columnName);
+		public function toArray() {
+			$result=[];
+			foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName) {
+					$result[$columnName]=$this->getColumnValue($columnName);
 			   }
 		
 			return $result;
@@ -1051,7 +1051,7 @@ 
 		 * @return JSON
 		 * @since 3.2.4
 		 */
-		public function toJSON(){
+		public function toJSON() {
 			return json_encode($this->toArray());
 		}
 }
\ No newline at end of file

Braces +7 added lines, -14 removed lines

@@ -431,14 +431,12 @@ 
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
-		}
-		elseif($this->_recordState === self::STATE_LOADED)
+		} elseif($this->_recordState === self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
 			if($param->getIsValid() && $gateway->update($this))
 				return true;
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
@@ -461,8 +459,7 @@ 
 				$this->_recordState = self::STATE_DELETED;
 				return true;
 			}
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
@@ -729,8 +726,7 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -749,8 +745,7 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this, $property, $relation);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -833,8 +828,7 @@ 
 		{
 			$property = $method[4] === '_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
-		}
-		elseif($findOne = strncasecmp($method, 'findby', 6) === 0)
+		} elseif($findOne = strncasecmp($method, 'findby', 6) === 0)
 			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
 		elseif(strncasecmp($method, 'findallby', 9) === 0)
 			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
@@ -900,8 +894,7 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
-		}
-		elseif($criteria instanceof TSqlCriteria)
+		} elseif($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();