pradosoft / prado

bin/prado-cli.php

Doc Comments +25 added lines

@@ -140,6 +140,10 @@ 
 	 */
 	public abstract function performAction($args);
 
+	/**
+	 * @param string $dir
+	 * @param integer $mask
+	 */
 	protected function createDirectory($dir, $mask)
 	{
 		if(!is_dir($dir))
@@ -151,6 +155,9 @@ 
 			chmod($dir, $mask);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected function createFile($filename, $content)
 	{
 		if(!is_file($filename))
@@ -300,6 +307,9 @@ 
 ';
 	}
 
+	/**
+	 * @param string $appName
+	 */
 	protected function renderConfigFile($appName)
 	{
 		return <<<EOD
@@ -513,6 +523,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getActiveRecordConfig($app_dir)
 	{
 		if(false === ($xml=$this->getXmlFile($app_dir)))
@@ -528,6 +541,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getOutputFile($app_dir, $namespace)
 	{
 		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
@@ -589,6 +605,9 @@ 
 		return $prop;
 	}
 
+	/**
+	 * @param string $class
+	 */
 	protected function generateClass($properties, $tablename, $class)
 	{
 		$props = implode("\n", $properties);
@@ -684,6 +703,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $l
+     */
     public function generate($l)
     {
 		$input = explode(" ", trim($l));
@@ -722,6 +744,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $app_dir
+     */
     protected function getActiveRecordConfig($app_dir) {
         if (false === ($xml = $this->getXmlFile($app_dir)))
             return false;

Indentation +90 added lines, -90 removed lines

@@ -623,31 +623,31 @@ 
  */
 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;
-
-            switch($con->getDriverName())
-           	{
+	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;
+
+			switch($con->getDriverName())
+		   	{
 				case 'mysqli':
 				case 'mysql':
 					$command = $con->createCommand("SHOW TABLES");
@@ -665,27 +665,27 @@ 
 				default:
 					echo "\n    Sorry, generateAll is not implemented for ".$con->getDriverName()."\n";
 					
-           	}
-
-            $dataReader = $command->query();
-            $dataReader->bindColumn(1, $table);
-            $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) {
-                    $this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
-                }
-            }
-        }
-        return true;
-    }
-
-    public function generate($l)
-    {
+		   	}
+
+			$dataReader = $command->query();
+			$dataReader->bindColumn(1, $table);
+			$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) {
+					$this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+				}
+			}
+		}
+		return true;
+	}
+
+	public function generate($l)
+	{
 		$input = explode(" ", trim($l));
 		if(count($input) > 2)
 		{
@@ -702,49 +702,49 @@ 
 		{
 			echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 		}
-    }
-
-    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 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;
+	}
 
 }

Spacing +156 added lines, -156 removed lines

@@ -12,10 +12,10 @@ 
 if(!isset($_SERVER['argv']) || php_sapi_name()!=='cli')
 	die('Must be run from the command line');
 
-if(file_exists($autoloader = realpath(__DIR__ . '/../vendor/autoload.php')))
+if(file_exists($autoloader=realpath(__DIR__.'/../vendor/autoload.php')))
 {
 	include($autoloader);
-} elseif(file_exists($autoloader = realpath(__DIR__ . '/../autoload.php'))) {
+} elseif(file_exists($autoloader=realpath(__DIR__.'/../autoload.php'))) {
 	include($autoloader);
 }
 
@@ -66,7 +66,7 @@ 
 	 */
 	public function addActionClass($class)
 	{
-		$this->_actions[$class] = new $class;
+		$this->_actions[$class]=new $class;
 	}
 
 	/**
@@ -75,8 +75,8 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
-			$instance = new self;
+		if($instance===null)
+			$instance=new self;
 		return $instance;
 	}
 
@@ -93,17 +93,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)
@@ -162,23 +162,23 @@ 
 
 	public function isValidAction($args)
 	{
-		return 0 == strcasecmp($args[0], $this->action) &&
-			count($args)-1 >= count($this->parameters);
+		return 0==strcasecmp($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}
@@ -188,15 +188,15 @@ 
 
 	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)
 			{
-				$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";
@@ -207,9 +207,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;
 	}
@@ -224,10 +224,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)
 	{
@@ -241,31 +241,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));
@@ -275,7 +275,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.'\';
@@ -374,10 +374,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)
 	{
@@ -388,22 +388,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());
@@ -411,7 +411,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.'\';
@@ -426,7 +426,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.'\';
@@ -448,15 +448,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]);
 
 		\Psy\Shell::debug([], Prado::getApplication());
 		return true;
@@ -471,23 +471,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;
@@ -497,7 +497,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;
@@ -505,9 +505,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;
@@ -515,9 +515,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)
@@ -532,8 +532,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;
@@ -544,24 +544,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 {
@@ -569,14 +569,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
@@ -585,14 +585,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
 /**
@@ -623,38 +623,38 @@ 
  */
 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] : '';
+        $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
@@ -667,17 +667,17 @@ 
 					
            	}
 
-            $dataReader = $command->query();
+            $dataReader=$command->query();
             $dataReader->bindColumn(1, $table);
-            $tables = array();
-            while ($dataReader->read() !== false) {
-                $tables[] = $table;
+            $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) {
-                    $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);
                 }
             }
         }
@@ -686,16 +686,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
@@ -705,45 +705,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;
     }
 

Braces +4 added lines, -8 removed lines

@@ -100,8 +100,7 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
@@ -203,8 +202,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+'.str_repeat('-',77)."+\n";
@@ -552,8 +550,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)
@@ -697,8 +694,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";
 		}