pradosoft / prado

requirements/index.php

Indentation +25 added lines, -25 removed lines

@@ -62,31 +62,31 @@
 		class_exists("DOMDocument",false),
 		'DOM extension check',
 		'DOM extension required'),
-    array(
-        true,
-        extension_loaded("SPL"),
-        'SPL extension check',
-        'SPL extension required'),
-    array(
-        true,
-        extension_loaded("CType"),
-        'CType extension check',
-        'CType extension required'),
-    array(
-        true,
-        extension_loaded("pcre"),
-        'PCRE extension check',
-        'PCRE extension required'),
-    array(
-        true,
-        extension_loaded("json"),
-        'JSON extension check',
-        'JSON extension required'),
-    array(
-        false,
-        class_exists("PDO",false),
-        'PDO extension check',
-        'PDO extension optional'),
+	array(
+		true,
+		extension_loaded("SPL"),
+		'SPL extension check',
+		'SPL extension required'),
+	array(
+		true,
+		extension_loaded("CType"),
+		'CType extension check',
+		'CType extension required'),
+	array(
+		true,
+		extension_loaded("pcre"),
+		'PCRE extension check',
+		'PCRE extension required'),
+	array(
+		true,
+		extension_loaded("json"),
+		'JSON extension check',
+		'JSON extension required'),
+	array(
+		false,
+		class_exists("PDO",false),
+		'PDO extension check',
+		'PDO extension optional'),
 	array(
 		false,
 		function_exists("iconv"),

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 
 		echo "\n\n** PDF file quickstart.pdf created **\n\n";
 
-	}
-	else
+	} else
 	{
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}

Spacing +22 added lines, -22 removed lines

@@ -27,11 +27,11 @@ 
 /**
  * @var array List of requirements (required or not, check item, hint)
  */
-$requirements = array(
+$requirements=array(
 	array(
 		true,
-		version_compare(PHP_VERSION,"5.3.3",">="),
-		'PHP version check','PHP 5.3.3 or higher required'),
+		version_compare(PHP_VERSION, "5.3.3", ">="),
+		'PHP version check', 'PHP 5.3.3 or higher required'),
 	array(
 		true,
 		isset($_SERVER["HTTP_ACCEPT"]),
@@ -49,17 +49,17 @@ 
 		'REQUEST_URI required'),
 	array(
 		true,
-		isset($_SERVER["PATH_INFO"]) || strpos($_SERVER["PHP_SELF"],$_SERVER["SCRIPT_NAME"])===0,
+		isset($_SERVER["PATH_INFO"]) || strpos($_SERVER["PHP_SELF"], $_SERVER["SCRIPT_NAME"])===0,
 		'$_SERVER["PATH_INFO"] check',
 		'PATH_INFO required'),
 	array(
 		true,
-		class_exists('Reflection',false),
+		class_exists('Reflection', false),
 		'Reflection extension check',
 		'Reflection extension required'),
 	array(
 		true,
-		class_exists("DOMDocument",false),
+		class_exists("DOMDocument", false),
 		'DOM extension check',
 		'DOM extension required'),
     array(
@@ -84,7 +84,7 @@ 
         'JSON extension required'),
     array(
         false,
-        class_exists("PDO",false),
+        class_exists("PDO", false),
         'PDO extension check',
         'PDO extension optional'),
 	array(
@@ -149,11 +149,11 @@ 
 		'SOAP extension optional'),
 );
 
-$results = "<table class=\"result\">\n";
-$conclusion = 0;
+$results="<table class=\"result\">\n";
+$conclusion=0;
 foreach($requirements as $requirement)
 {
-	list($required,$expression,$aspect,$hint)=$requirement;
+	list($required, $expression, $aspect, $hint)=$requirement;
 	//eval('$ret='.$expression.';');
 	$ret=$expression;
 	if($required)
@@ -179,7 +179,7 @@ 
 	}
 	$results.="<tr class=\"$ret\"><td class=\"$ret\">".lmessage($aspect)."</td><td class=\"$ret\">".lmessage($hint)."</td></tr>\n";
 }
-$results .= '</table>';
+$results.='</table>';
 if($conclusion===0)
 	$conclusion=lmessage('all passed');
 else if($conclusion===1)
@@ -187,11 +187,11 @@ 
 else
 	$conclusion=lmessage('passed with warnings');
 
-$tokens = array(
+$tokens=array(
 	'%%Conclusion%%' => $conclusion,
 	'%%Details%%' => $results,
 	'%%Version%%' => $_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.getPradoVersion(),
-	'%%Time%%' => @strftime('%Y-%m-%d %H:%m',time()),
+	'%%Time%%' => @strftime('%Y-%m-%d %H:%m', time()),
 );
 
 $lang=getPreferredLanguage();
@@ -202,7 +202,7 @@ 
 	die("Unable to open template file '$templateFile'.");
 
 header('Content-Type: text/html; charset=UTF-8');
-echo strtr($content,$tokens);
+echo strtr($content, $tokens);
 
 /**
  * Returns a localized message according to user preferred language.
@@ -214,7 +214,7 @@ 
 	static $messages=null;
 	if($messages===null)
 	{
-		$lang = getPreferredLanguage();
+		$lang=getPreferredLanguage();
 		$msgFile=dirname(__FILE__)."/messages-$lang.txt";
 		if(!is_file($msgFile))
 			$msgFile=dirname(__FILE__).'/messages.txt';
@@ -222,12 +222,12 @@ 
 		{
 			foreach($entries as $entry)
 			{
-				@list($code,$message)=explode('=',$entry,2);
+				@list($code, $message)=explode('=', $entry, 2);
 				$messages[trim($code)]=trim($message);
 			}
 		}
 	}
-	return isset($messages[$token])?$messages[$token]:$token;
+	return isset($messages[$token]) ? $messages[$token] : $token;
 }
 
 /**
@@ -243,10 +243,10 @@ 
 	if($languages===null)
 	{
 		$languages=array();
-		foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 		{
-			$array=explode(';q=',trim($language));
-			$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+			$array=explode(';q=', trim($language));
+			$languages[trim($array[0])]=isset($array[1]) ? (float) $array[1] : 1.0;
 		}
 		arsort($languages);
 		$languages=array_keys($languages);
@@ -266,7 +266,7 @@ 
 	if($language===null)
 	{
 		$langs=getUserLanguages();
-		$lang=explode('-',$langs[0]);
+		$lang=explode('-', $langs[0]);
 		if(empty($lang[0]) || !function_exists('ctype_alpha') || !ctype_alpha($lang[0]))
 			$language='en';
 		else
@@ -285,7 +285,7 @@ 
 	{
 		$contents=file_get_contents($coreFile);
 		$matches=array();
-		if(preg_match('/public static function getVersion.*?return \'(.*?)\'/ms',$contents,$matches)>0)
+		if(preg_match('/public static function getVersion.*?return \'(.*?)\'/ms', $contents, $matches) > 0)
 			return $matches[1];
 	}
 	return '';

bin/prado-cli.php

Indentation +94 added lines, -94 removed lines

@@ -740,89 +740,89 @@ 
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction {
 
-    protected $action = 'generateAll';
-    protected $parameters = array('output');
-    protected $optional = array('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] : '';
-
-        if ($app_dir !== false) {
-            $config = $this->getActiveRecordConfig($app_dir);
-
-            $manager = TActiveRecordManager::getInstance();
-            $con = $manager->getDbConnection();
-            $con->Active = true;
-            $command = $con->createCommand("Show Tables");
-            $dataReader = $command->query();
-            $dataReader->bindColumn(1, $table);
-            $generator = new PHP_Shell_Extensions_ActiveRecord();
-            $tables = array();
-            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) {
-                    $generator->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
-                }
-            }
-        }
-        return true;
-    }
-
-    protected function getAppDir($dir=".") {
-        if (is_dir($dir))
-            return realpath($dir);
-        if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-            return $app_dir;
-        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))
-            return $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";
-        return false;
-    }
-
-    protected function getActiveRecordConfig($app_dir) {
-        if (false === ($xml = $this->getXmlFile($app_dir)))
-            return false;
-        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";
-        }
-        return false;
-    }
-
-    protected function getOutputFile($app_dir, $namespace) {
-        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)
-                return $file;
-        }
-        echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
-        return false;
-    }
+	protected $action = 'generateAll';
+	protected $parameters = array('output');
+	protected $optional = array('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] : '';
+
+		if ($app_dir !== false) {
+			$config = $this->getActiveRecordConfig($app_dir);
+
+			$manager = TActiveRecordManager::getInstance();
+			$con = $manager->getDbConnection();
+			$con->Active = true;
+			$command = $con->createCommand("Show Tables");
+			$dataReader = $command->query();
+			$dataReader->bindColumn(1, $table);
+			$generator = new PHP_Shell_Extensions_ActiveRecord();
+			$tables = array();
+			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) {
+					$generator->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+				}
+			}
+		}
+		return true;
+	}
+
+	protected function getAppDir($dir=".") {
+		if (is_dir($dir))
+			return realpath($dir);
+		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+			return $app_dir;
+		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))
+			return $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";
+		return false;
+	}
+
+	protected function getActiveRecordConfig($app_dir) {
+		if (false === ($xml = $this->getXmlFile($app_dir)))
+			return false;
+		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";
+		}
+		return false;
+	}
+
+	protected function getOutputFile($app_dir, $namespace) {
+		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)
+				return $file;
+		}
+		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		return false;
+	}
 
 }
 
@@ -830,20 +830,20 @@ 
 if(class_exists('PHP_Shell_Commands', false))
 {
 	class PHP_Shell_Extensions_ActiveRecord implements PHP_Shell_Extension {
-	    public function register()
-	    {
+		public function register()
+		{
 
-	        $cmd = PHP_Shell_Commands::getInstance();
+			$cmd = PHP_Shell_Commands::getInstance();
 			if(Prado::getApplication() !== null)
 			{
-		        $cmd->registerCommand('#^generate#', $this, 'generate', 'generate <table> <output> [soap]',
-		            'Generate Active Record skeleton for <table> to <output> file using'.PHP_EOL.
-		            '    application.xml in [directory]. May also generate [soap] properties.');
+				$cmd->registerCommand('#^generate#', $this, 'generate', 'generate <table> <output> [soap]',
+					'Generate Active Record skeleton for <table> to <output> file using'.PHP_EOL.
+					'    application.xml in [directory]. May also generate [soap] properties.');
 			}
-	    }
+		}
 
-	    public function generate($l)
-	    {
+		public function generate($l)
+		{
 			$input = explode(" ", trim($l));
 			if(count($input) > 2)
 			{
@@ -860,12 +860,12 @@ 
 			{
 				echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 			}
-	    }
+		}
 	}
 
 	$__shell_exts = PHP_Shell_Extensions::getInstance();
 	$__shell_exts->registerExtensions(array(
-		    "active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
+			"active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
 
 	include_once(realpath(dirname(dirname(__FILE__))).'/framework/3rdParty/PhpShell/php-shell-cmd.php');
 }

Spacing +192 added lines, -192 removed lines

@@ -12,7 +12,7 @@ 
 if(!isset($_SERVER['argv']) || php_sapi_name()!=='cli')
 	die('Must be run from the command line');
 
-$frameworkPath = realpath(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR;
+$frameworkPath=realpath(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR;
 
 require_once($frameworkPath.'prado.php');
 
@@ -30,7 +30,7 @@ 
 //config PHP shell
 if(count($_SERVER['argv']) > 1 && strtolower($_SERVER['argv'][1])==='shell')
 {
-	function __shell_print_var($shell,$var)
+	function __shell_print_var($shell, $var)
 	{
 		if(!$shell->has_semicolon) echo Prado::varDump($var);
 	}
@@ -71,7 +71,7 @@ 
 	 */
 	public function addActionClass($class)
 	{
-		$this->_actions[$class] = new $class;
+		$this->_actions[$class]=new $class;
 	}
 
 	/**
@@ -80,8 +80,8 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
-			$instance = new self;
+		if($instance===null)
+			$instance=new self;
 		return $instance;
 	}
 
@@ -98,17 +98,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)
@@ -167,23 +167,23 @@ 
 
 	public function isValidAction($args)
 	{
-		return strtolower($args[0]) === $this->action &&
-				count($args)-1 >= count($this->parameters);
+		return strtolower($args[0])===$this->action &&
+				count($args) - 1 >= count($this->parameters);
 	}
 
 	public function renderHelp()
 	{
-		$params = array();
+		$params=array();
 		foreach($this->parameters as $v)
-			$params[] = '<'.$v.'>';
-		$parameters = join($params, ' ');
-		$options = array();
+			$params[]='<'.$v.'>';
+		$parameters=join($params, ' ');
+		$options=array();
 		foreach($this->optional as $v)
-			$options[] = '['.$v.']';
-		$optional = (strlen($parameters) ? ' ' : ''). join($options, ' ');
+			$options[]='['.$v.']';
+		$optional=(strlen($parameters) ? ' ' : '').join($options, ' ');
 		$description='';
-		foreach(explode("\n", wordwrap($this->description,65)) as $line)
-			$description .= '    '.$line."\n";
+		foreach(explode("\n", wordwrap($this->description, 65)) as $line)
+			$description.='    '.$line."\n";
 		return <<<EOD
   {$this->action} {$parameters}{$optional}
 {$description}
@@ -193,14 +193,14 @@ 
 
 	protected function initializePradoApplication($directory)
 	{
-		$app_dir = realpath($directory.'/protected/');
-		if($app_dir !== false && is_dir($app_dir))
+		$app_dir=realpath($directory.'/protected/');
+		if($app_dir!==false && is_dir($app_dir))
 		{
 			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);
 				$initialized=true;
 				PradoCommandLineInterpreter::printGreeting();
 				echo '** Loaded PRADO appplication in directory "'.$dir."\".\n";
@@ -211,9 +211,9 @@ 
 		else
 		{
 			PradoCommandLineInterpreter::printGreeting();
-			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";
+			echo '+'.str_repeat('-', 77)."+\n";
 		}
 		return false;
 	}
@@ -228,10 +228,10 @@ 
  */
 class PradoCommandLineCreateProject extends PradoCommandLineAction
 {
-	protected $action = '-c';
-	protected $parameters = array('directory');
-	protected $optional = array();
-	protected $description = 'Creates a Prado project skeleton for the given <directory>.';
+	protected $action='-c';
+	protected $parameters=array('directory');
+	protected $optional=array();
+	protected $description='Creates a Prado project skeleton for the given <directory>.';
 
 	public function performAction($args)
 	{
@@ -245,31 +245,31 @@ 
 	 */
 	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);
+			$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);
-		$this->createDirectory($protectedPath,0755);
-		$this->createDirectory($runtimePath,0777);
-		$this->createDirectory($pagesPath,0755);
+		$this->createDirectory($assetPath, 0777);
+		$this->createDirectory($protectedPath, 0755);
+		$this->createDirectory($runtimePath, 0777);
+		$this->createDirectory($pagesPath, 0755);
 
 		$this->createFile($indexFile, $this->renderIndexFile());
 		$this->createFile($configFile, $this->renderConfigFile($appName));
@@ -279,7 +279,7 @@ 
 
 	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.'\';
@@ -378,10 +378,10 @@ 
  */
 class PradoCommandLineCreateTests extends PradoCommandLineAction
 {
-	protected $action = '-t';
-	protected $parameters = array('directory');
-	protected $optional = array();
-	protected $description = 'Create test fixtures in the given <directory>.';
+	protected $action='-t';
+	protected $parameters=array('directory');
+	protected $optional=array();
+	protected $description='Create test fixtures in the given <directory>.';
 
 	public function performAction($args)
 	{
@@ -392,22 +392,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);
+		$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());
@@ -415,7 +415,7 @@ 
 
 	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.'\';
@@ -430,7 +430,7 @@ 
 
 	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.'\';
@@ -452,15 +452,15 @@ 
  */
 class PradoCommandLinePhpShell extends PradoCommandLineAction
 {
-	protected $action = 'shell';
-	protected $parameters = array();
-	protected $optional = array('directory');
-	protected $description = 'Runs a PHP interactive interpreter. Initializes the Prado application in the given [directory].';
+	protected $action='shell';
+	protected $parameters=array();
+	protected $optional=array('directory');
+	protected $description='Runs a PHP interactive interpreter. Initializes the Prado application in the given [directory].';
 
 	public function performAction($args)
 	{
 		if(count($args) > 1)
-			$app = $this->initializePradoApplication($args[1]);
+			$app=$this->initializePradoApplication($args[1]);
 		return true;
 	}
 }
@@ -473,18 +473,18 @@ 
  */
 class PradoCommandLineUnitTest extends PradoCommandLineAction
 {
-	protected $action = 'test';
-	protected $parameters = array('directory');
-	protected $optional = array('testcase ...');
-	protected $description = 'Runs all unit test cases in the given <directory>. Use [testcase] option to run specific test cases.';
+	protected $action='test';
+	protected $parameters=array('directory');
+	protected $optional=array('testcase ...');
+	protected $description='Runs all unit test cases in the given <directory>. Use [testcase] option to run specific test cases.';
 
-	protected $matches = array();
+	protected $matches=array();
 
 	public function performAction($args)
 	{
-		$dir = realpath($args[1]);
-		if($dir !== false && is_dir($dir))
-			$this->runUnitTests($dir,$args);
+		$dir=realpath($args[1]);
+		if($dir!==false && is_dir($dir))
+			$this->runUnitTests($dir, $args);
 		else
 			echo '** Unable to find directory "'.$args[1]."\".\n";
 		return true;
@@ -492,7 +492,7 @@ 
 
 	protected function initializeTestRunner()
 	{
-		$TEST_TOOLS = realpath(dirname(dirname(__FILE__))).'/tests/test_tools/';
+		$TEST_TOOLS=realpath(dirname(dirname(__FILE__))).'/tests/test_tools/';
 
 		require_once($TEST_TOOLS.'/simpletest/unit_tester.php');
 		require_once($TEST_TOOLS.'/simpletest/web_tester.php');
@@ -502,77 +502,77 @@ 
 
 	protected function runUnitTests($dir, $args)
 	{
-		$app_dir = $this->getAppDir($dir);
-		if($app_dir !== false)
+		$app_dir=$this->getAppDir($dir);
+		if($app_dir!==false)
 			$this->initializePradoApplication($app_dir.'/../');
 
 		$this->initializeTestRunner();
-		$test_dir = $this->getTestDir($dir);
-		if($test_dir !== false)
+		$test_dir=$this->getTestDir($dir);
+		if($test_dir!==false)
 		{
-			$test =$this->getUnitTestCases($test_dir,$args);
-			$running_dir = substr(str_replace(realpath('./'),'',$test_dir),1);
+			$test=$this->getUnitTestCases($test_dir, $args);
+			$running_dir=substr(str_replace(realpath('./'), '', $test_dir), 1);
 			echo 'Running unit tests in directory "'.$running_dir."\":\n";
 			$test->run(new TextReporter());
 		}
 		else
 		{
-			$running_dir = substr(str_replace(realpath('./'),'',$dir),1);
+			$running_dir=substr(str_replace(realpath('./'), '', $dir), 1);
 			echo '** Unable to find test directory "'.$running_dir.'/unit" or "'.$running_dir.'/tests/unit".'."\n";
 		}
 	}
 
 	protected function getAppDir($dir)
 	{
-		$app_dir = realpath($dir.'/protected');
-		if($app_dir !== false && is_dir($app_dir))
+		$app_dir=realpath($dir.'/protected');
+		if($app_dir!==false && is_dir($app_dir))
 			return $app_dir;
 		return realpath($dir.'/../protected');
 	}
 
 	protected function getTestDir($dir)
 	{
-		$test_dir = realpath($dir.'/unit');
-		if($test_dir !== false && is_dir($test_dir))
+		$test_dir=realpath($dir.'/unit');
+		if($test_dir!==false && is_dir($test_dir))
 			return $test_dir;
 		return realpath($dir.'/tests/unit/');
 	}
 
-	protected function getUnitTestCases($dir,$args)
+	protected function getUnitTestCases($dir, $args)
 	{
-		$matches = null;
+		$matches=null;
 		if(count($args) > 2)
-			$matches = array_slice($args,2);
+			$matches=array_slice($args, 2);
 		$test=new GroupTest(' ');
-		$this->addTests($test,$dir,true,$matches);
-		$test->setLabel(implode(' ',$this->matches));
+		$this->addTests($test, $dir, true, $matches);
+		$test->setLabel(implode(' ', $this->matches));
 		return $test;
 	}
 
-	protected function addTests($test,$path,$recursive=true,$match=null)
+	protected function addTests($test, $path, $recursive=true, $match=null)
 	{
 		$dir=opendir($path);
 		while(($entry=readdir($dir))!==false)
 		{
 			if(is_file($path.'/'.$entry) && (preg_match('/[^\s]*test[^\s]*\.php/', strtolower($entry))))
 			{
-				if($match==null||($match!=null && $this->hasMatch($match,$entry)))
+				if($match==null || ($match!=null && $this->hasMatch($match, $entry)))
 					$test->addTestFile($path.'/'.$entry);
 			}
 			if($entry!=='.' && $entry!=='..' && is_dir($path.'/'.$entry) && $recursive)
-				$this->addTests($test,$path.'/'.$entry,$recursive,$match);
+				$this->addTests($test, $path.'/'.$entry, $recursive, $match);
 		}
 		closedir($dir);
 	}
 
-	protected function hasMatch($match,$entry)
+	protected function hasMatch($match, $entry)
 	{
-		$file = strtolower(substr($entry,0,strrpos($entry,'.')));
+		$file=strtolower(substr($entry, 0, strrpos($entry, '.')));
 		foreach($match as $m)
 		{
-			if(strtolower($m) === $file)
+			if(strtolower($m)===$file)
 			{
-				$this->matches[] = $m;
+				$this->matches[]=$m;
 				return true;
 			}
 		}
@@ -588,23 +588,23 @@ 
  */
 class PradoCommandLineActiveRecordGen extends PradoCommandLineAction
 {
-	protected $action = 'generate';
-	protected $parameters = array('table', 'output');
-	protected $optional = array('directory', 'soap');
-	protected $description = 'Generate Active Record skeleton for <table> to <output> file using application.xml in [directory]. May also generate [soap] properties.';
+	protected $action='generate';
+	protected $parameters=array('table', 'output');
+	protected $optional=array('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";
-			else if($config !== false && $output !== false)
+			else if($config!==false && $output!==false)
 				$this->generateActiveRecord($config, $args[1], $output);
 		}
 		return true;
@@ -614,7 +614,7 @@ 
 	{
 		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";
 		return false;
@@ -622,9 +622,9 @@ 
 
 	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";
 		return false;
@@ -632,9 +632,9 @@ 
 
 	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)
@@ -649,8 +649,8 @@ 
 	{
 		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)
 				return $file;
@@ -661,24 +661,24 @@ 
 
 	protected function generateActiveRecord($config, $tablename, $output)
 	{
-		$manager = TActiveRecordManager::getInstance();
-		if($connection = $manager->getDbConnection()) {
-			$gateway = $manager->getRecordGateway();
-			$tableInfo = $gateway->getTableInfo($manager->getDbConnection(), $tablename);
-			if(count($tableInfo->getColumns()) === 0)
+		$manager=TActiveRecordManager::getInstance();
+		if($connection=$manager->getDbConnection()) {
+			$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";
 				return false;
 			}
 			else
 			{
-				$properties = array();
+				$properties=array();
 				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 {
@@ -686,14 +686,14 @@ 
 		}
 	}
 
-	protected function generateProperty($field,$column)
+	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
@@ -702,14 +702,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
 /**
@@ -740,41 +740,41 @@ 
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction {
 
-    protected $action = 'generateAll';
-    protected $parameters = array('output');
-    protected $optional = array('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=array('output');
+    protected $optional=array('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] : '';
-
-        if ($app_dir !== false) {
-            $config = $this->getActiveRecordConfig($app_dir);
-
-            $manager = TActiveRecordManager::getInstance();
-            $con = $manager->getDbConnection();
-            $con->Active = true;
-            $command = $con->createCommand("Show Tables");
-            $dataReader = $command->query();
+        $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);
+
+            $manager=TActiveRecordManager::getInstance();
+            $con=$manager->getDbConnection();
+            $con->Active=true;
+            $command=$con->createCommand("Show Tables");
+            $dataReader=$command->query();
             $dataReader->bindColumn(1, $table);
-            $generator = new PHP_Shell_Extensions_ActiveRecord();
-            $tables = array();
-            while ($dataReader->read() !== false) {
-                $tables[] = $table;
+            $generator=new PHP_Shell_Extensions_ActiveRecord();
+            $tables=array();
+            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) {
-                    $generator->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) {
+                    $generator->generate("generate ".$table." ".$output." ".$this->_soap." ".$this->_overwrite);
                 }
             }
         }
@@ -782,45 +782,45 @@ 
     }
 
     protected function getAppDir($dir=".") {
-        if (is_dir($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;
     }
 
@@ -833,8 +833,8 @@ 
 	    public function register()
 	    {
 
-	        $cmd = PHP_Shell_Commands::getInstance();
-			if(Prado::getApplication() !== null)
+	        $cmd=PHP_Shell_Commands::getInstance();
+			if(Prado::getApplication()!==null)
 			{
 		        $cmd->registerCommand('#^generate#', $this, 'generate', 'generate <table> <output> [soap]',
 		            'Generate Active Record skeleton for <table> to <output> file using'.PHP_EOL.
@@ -844,16 +844,16 @@ 
 
 	    public function generate($l)
 	    {
-			$input = explode(" ", trim($l));
+			$input=explode(" ", trim($l));
 			if(count($input) > 2)
 			{
-				$app_dir = '.';
+				$app_dir='.';
 				if(Prado::getApplication()!==null)
-					$app_dir = dirname(Prado::getApplication()->getBasePath());
-				$args = array($input[0],$input[1], $input[2],$app_dir);
-				if(count($input)>3)
-					$args = array($input[0],$input[1], $input[2],$app_dir,'soap');
-				$cmd = new PradoCommandLineActiveRecordGen;
+					$app_dir=dirname(Prado::getApplication()->getBasePath());
+				$args=array($input[0], $input[1], $input[2], $app_dir);
+				if(count($input) > 3)
+					$args=array($input[0], $input[1], $input[2], $app_dir, 'soap');
+				$cmd=new PradoCommandLineActiveRecordGen;
 				$cmd->performAction($args);
 			}
 			else
@@ -863,7 +863,7 @@ 
 	    }
 	}
 
-	$__shell_exts = PHP_Shell_Extensions::getInstance();
+	$__shell_exts=PHP_Shell_Extensions::getInstance();
 	$__shell_exts->registerExtensions(array(
 		    "active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
 

Braces +5 added lines, -10 removed lines

@@ -105,8 +105,7 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
@@ -207,8 +206,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+'.str_repeat('-',77)."+\n";
@@ -514,8 +512,7 @@ 
 			$running_dir = substr(str_replace(realpath('./'),'',$test_dir),1);
 			echo 'Running unit tests in directory "'.$running_dir."\":\n";
 			$test->run(new TextReporter());
-		}
-		else
+		} else
 		{
 			$running_dir = substr(str_replace(realpath('./'),'',$dir),1);
 			echo '** Unable to find test directory "'.$running_dir.'/unit" or "'.$running_dir.'/tests/unit".'."\n";
@@ -669,8 +666,7 @@ 
 			{
 				echo '** Unable to find table or view "'.$tablename.'" in "'.$manager->getDbConnection()->getConnectionString()."\".\n";
 				return false;
-			}
-			else
+			} else
 			{
 				$properties = array();
 				foreach($tableInfo->getColumns() as $field=>$column)
@@ -855,8 +851,7 @@ 
 					$args = array($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";
 			}

Doc Comments +34 added lines

@@ -145,6 +145,10 @@ 
 	 */
 	public abstract function performAction($args);
 
+	/**
+	 * @param string $dir
+	 * @param integer $mask
+	 */
 	protected function createDirectory($dir, $mask)
 	{
 		if(!is_dir($dir))
@@ -156,6 +160,9 @@ 
 			chmod($dir, $mask);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected function createFile($filename, $content)
 	{
 		if(!is_file($filename))
@@ -304,6 +311,9 @@ 
 ';
 	}
 
+	/**
+	 * @param string $appName
+	 */
 	protected function renderConfigFile($appName)
 	{
 		return <<<EOD
@@ -500,6 +510,9 @@ 
 		require_once($TEST_TOOLS.'/simpletest/reporter.php');
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	protected function runUnitTests($dir, $args)
 	{
 		$app_dir = $this->getAppDir($dir);
@@ -538,6 +551,9 @@ 
 		return realpath($dir.'/tests/unit/');
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	protected function getUnitTestCases($dir,$args)
 	{
 		$matches = null;
@@ -565,6 +581,9 @@ 
 		closedir($dir);
 	}
 
+	/**
+	 * @param string $entry
+	 */
 	protected function hasMatch($match,$entry)
 	{
 		$file = strtolower(substr($entry,0,strrpos($entry,'.')));
@@ -630,6 +649,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getActiveRecordConfig($app_dir)
 	{
 		if(false === ($xml=$this->getXmlFile($app_dir)))
@@ -645,6 +667,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getOutputFile($app_dir, $namespace)
 	{
 		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
@@ -706,6 +731,9 @@ 
 		return $prop;
 	}
 
+	/**
+	 * @param string $class
+	 */
 	protected function generateClass($properties, $tablename, $class)
 	{
 		$props = implode("\n", $properties);
@@ -799,6 +827,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $app_dir
+     */
     protected function getActiveRecordConfig($app_dir) {
         if (false === ($xml = $this->getXmlFile($app_dir)))
             return false;
@@ -842,6 +873,9 @@ 
 			}
 	    }
 
+	    /**
+	     * @param string $l
+	     */
 	    public function generate($l)
 	    {
 			$input = explode(" ", trim($l));

framework/Data/Common/TDbTableColumn.php

Doc Comments +1 added lines

@@ -136,6 +136,7 @@
 	 * @param mixed Name of the PHP variable to bind to the SQL statement parameter
 	 * @param int SQL data type of the parameter
 	 * @param int length of the data type
+	 * @param string $name
 	 * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
 	 */
 	public function bindParameter($name, &$value, $dataType=null, $length=null)

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
  */
 class TDbTableColumn extends TComponent
 {
-	const UNDEFINED_VALUE= INF; //use infinity for undefined value
+	const UNDEFINED_VALUE=INF; //use infinity for undefined value
 
 	private $_info=array();
 
@@ -36,7 +36,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	protected function getInfo($name,$default=null)
+	protected function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -45,7 +45,7 @@ 
 	 * @param string information array key name
 	 * @param mixed new information array value.
 	 */
-	protected function setInfo($name,$value)
+	protected function setInfo($name, $value)
 	{
 		$this->_info[$name]=$value;
 	}
@@ -118,7 +118,7 @@ 
 	 */
 	public function getAllowNull()
 	{
-		return $this->getInfo('AllowNull',false);
+		return $this->getInfo('AllowNull', false);
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 		if(($precision=$this->getNumericPrecision())!==null)
 		{
 			$scale=$this->getNumericScale();
-			return $scale===null ? pow(10,$precision) : pow(10,$precision-$scale);
+			return $scale===null ? pow(10, $precision) : pow(10, $precision - $scale);
 		}
 	}
 
@@ -159,7 +159,7 @@ 
 	 */
 	public function getIsPrimaryKey()
 	{
-		return $this->getInfo('IsPrimaryKey',false);
+		return $this->getInfo('IsPrimaryKey', false);
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getIsForeignKey()
 	{
-		return $this->getInfo('IsForeignKey',false);
+		return $this->getInfo('IsForeignKey', false);
 	}
 
 	/**

framework/Data/SqlMap/Configuration/TParameterProperty.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 
 	/**
 	 * @param string button caption
+	 * @param string $value
 	 */
 	public function setButtonText($value)
 	{

Spacing +14 added lines, -14 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function setTypeHandler($value)
 	{
-		$this->_typeHandler = $value;
+		$this->_typeHandler=$value;
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	public function setType($value)
 	{
-		$this->_type = $value;
+		$this->_type=$value;
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 */
 	public function setColumn($value)
 	{
-		$this->_column = $value;
+		$this->_column=$value;
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setDbType($value)
 	{
-		$this->_dbType = $value;
+		$this->_dbType=$value;
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function setProperty($value)
 	{
-		$this->_property = $value;
+		$this->_property=$value;
 	}
 
 	/**
@@ -130,19 +130,19 @@ 
 	 */
 	public function setNullValue($value)
 	{
-		$this->_nullValue = $value;
+		$this->_nullValue=$value;
 	}
 
 	public function __sleep()
 	{
-		$exprops = array(); $cn = 'TParameterProperty';
-		if ($this->_typeHandler===null) $exprops[] = "\0$cn\0_typeHandler";
-		if ($this->_type===null) $exprops[] = "\0$cn\0_type";
-		if ($this->_column===null) $exprops[] = "\0$cn\0_column";
-		if ($this->_dbType===null) $exprops[] = "\0$cn\0_dbType";
-		if ($this->_property===null) $exprops[] = "\0$cn\0_property";
-		if ($this->_nullValue===null) $exprops[] = "\0$cn\0_nullValue";
-		return array_diff(parent::__sleep(),$exprops);
+		$exprops=array(); $cn='TParameterProperty';
+		if($this->_typeHandler===null) $exprops[]="\0$cn\0_typeHandler";
+		if($this->_type===null) $exprops[]="\0$cn\0_type";
+		if($this->_column===null) $exprops[]="\0$cn\0_column";
+		if($this->_dbType===null) $exprops[]="\0$cn\0_dbType";
+		if($this->_property===null) $exprops[]="\0$cn\0_property";
+		if($this->_nullValue===null) $exprops[]="\0$cn\0_nullValue";
+		return array_diff(parent::__sleep(), $exprops);
 	}
 }
 

framework/TService.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 
 	/**
 	 * @param string button caption
+	 * @param string $value
 	 */
 	public function setButtonText($value)
 	{

framework/Web/UI/ActiveControls/TActiveControlAdapter.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 
 	/**
 	 * @param string button caption
+	 * @param string $value
 	 */
 	public function setButtonText($value)
 	{

Indentation +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
 	}
 
  	/**
-	 * Publish the ajax script
-	 */
+ 	 * Publish the ajax script
+ 	 */
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);

Spacing +10 added lines, -10 removed lines

@@ -73,12 +73,12 @@ 
 		if($type===null)
 		{
 			if($this->getControl() instanceof ICallbackEventHandler)
-				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
+				$this->_activeControlType='Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
 			else
-				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
+				$this->_activeControlType='Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
 		}
 		else
-			$this->_activeControlType = $type;
+			$this->_activeControlType=$type;
 	}
 
  	/**
@@ -118,8 +118,8 @@ 
 	{
 		if($this->_baseActiveControl===null)
 		{
-			$type = $this->_activeControlType;
-			$this->_baseActiveControl = new $type($this->getControl());
+			$type=$this->_activeControlType;
+			$this->_baseActiveControl=new $type($this->getControl());
 		}
 		return $this->_baseActiveControl;
 	}
@@ -131,10 +131,10 @@ 
 	{
 		if($this->getPage()->getIsCallback())
 		{
-			$target = $this->getPage()->getCallbackEventTarget();
+			$target=$this->getPage()->getCallbackEventTarget();
 			if($target instanceof ICallbackEventHandler)
 			{
-				$client = $target->getActiveControl()->getClientSide();
+				$client=$target->getActiveControl()->getClientSide();
 				return $client->getEnablePageStateUpdate();
 			}
 		}
@@ -148,8 +148,8 @@ 
 	{
 		if($this->getIsTrackingPageState())
 		{
-		  $stateTrackerClass = $this->_stateTrackerClass;
-			$this->_stateTracker = new $stateTrackerClass($this->getControl());
+		  $stateTrackerClass=$this->_stateTrackerClass;
+			$this->_stateTracker=new $stateTrackerClass($this->getControl());
 			$this->_stateTracker->trackChanges();
 		}
 		parent::onLoad($param);
@@ -182,6 +182,6 @@ 
 	 */
 	public function setStateTracker($value)
 	{
-		$this->_stateTrackerClass = TPropertyValue::ensureString($value);
+		$this->_stateTrackerClass=TPropertyValue::ensureString($value);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

framework/Web/UI/ActiveControls/TActiveDropDownList.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	/**
 	 * Javascript client class for this control.
 	 * This method overrides the parent implementation.
-	 * @return null no javascript class name.
+	 * @return string no javascript class name.
 	 */
 	protected function getClientClassName()
 	{

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
 	 */
 	protected function createListItemCollection()
 	{
-		$collection  = new TActiveListItemCollection;
+		$collection=new TActiveListItemCollection;
 		$collection->setControl($this);
 		return $collection;
 	}
@@ -102,8 +102,8 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
-		if ($this->getAutoPostBack())
+		$writer->addAttribute('id', $this->getClientID());
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/WebControls/TDataTypeValidator.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 
 	/**
 	 * @param string button caption
+	 * @param string $value
 	 */
 	public function setButtonText($value)
 	{

Indentation +3 added lines, -3 removed lines

@@ -124,9 +124,9 @@
 	}
 
 	/**
-     * Sets the date format for a date validation
-     * @param string the date format value
-     */
+	 * Sets the date format for a date validation
+	 * @param string the date format value
+	 */
 	public function setDateFormat($value)
 	{
 		$this->setViewState('DateFormat', $value, '');

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 				{
 					$domain=substr($value,$pos+1);
 					return $domain===''?false:checkdnsrr($domain,'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function getDataType()
 	{
-		return $this->getViewState('DataType','String');
+		return $this->getViewState('DataType', 'String');
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	 */
 	public function setDataType($value)
 	{
-		$this->setViewState('DataType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TValidationDataType'),TValidationDataType::String);
+		$this->setViewState('DataType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TValidationDataType'), TValidationDataType::String);
 	}
 
 	/**
@@ -92,14 +92,14 @@ 
 		switch($this->getDataType())
 		{
 			case TValidationDataType::Integer:
-				return preg_match('/^[-+]?[0-9]+$/',trim($value));
+				return preg_match('/^[-+]?[0-9]+$/', trim($value));
 			case TValidationDataType::Float:
-				return preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/',trim($value));
+				return preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 			case TValidationDataType::Date:
-				$dateFormat = $this->getDateFormat();
+				$dateFormat=$this->getDateFormat();
 				if(strlen($dateFormat))
 				{
-					$formatter = new TSimpleDateFormatter($dateFormat);
+					$formatter=new TSimpleDateFormatter($dateFormat);
 					return $formatter->isValidDate($value);
 				}
 				else
@@ -114,7 +114,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		$options['DataType']=$this->getDataType();
 		if(($dateFormat=$this->getDateFormat())!=='')
 			$options['DateFormat']=$dateFormat;

framework/Web/UI/WebControls/TDropDownList.php

Doc Comments +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Indentation +2 added lines, -2 removed lines

@@ -463,14 +463,14 @@
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$writer->addAttribute('name',$this->getUniqueID());
+		$writer->addAttribute('name', $this->getUniqueID());
 		parent::addAttributesToRender($writer);
 	}
 
@@ -73,15 +73,15 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		if(!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selection=isset($values[$key])?$values[$key]:null;
+		$selection=isset($values[$key]) ? $values[$key] : null;
 		if($selection!==null)
 		{
-			$index=$this->getItems()->findIndexByValue($selection,false);
+			$index=$this->getItems()->findIndexByValue($selection, false);
 			if($this->getSelectedIndex()!==$index)
 			{
 				$this->setSelectedIndex($index);