pradosoft / prado

bin/prado-cli.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 */
 

framework/Wsat/TWsatARGenerator.php

Spacing +59 added lines, -59 removed lines

@@ -33,7 +33,7 @@ 
          * unquote chars
          * @var array
          */
-        private $uqChars = array('[', ']', '"', '`', "'");
+        private $uqChars=array('[', ']', '"', '`', "'");
 
         function __construct()
         {
@@ -42,31 +42,31 @@ 
 
         public function setClasPrefix($_clas_prefix)
         {
-                $this->_clasPrefix = $_clas_prefix;
+                $this->_clasPrefix=$_clas_prefix;
         }
 
         public function setClassSufix($_clas_sufix)
         {
-                $this->_classSufix = $_clas_sufix;
+                $this->_classSufix=$_clas_sufix;
         }
 
 //-----------------------------------------------------------------------------
         // <editor-fold defaultstate="collapsed" desc="Main APIs">
         public function generate($tableName)
         {
-                $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
+                $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
                 $this->_commonGenerate($tableName, $tableInfo);
         }
 
         public function generateAll()
         {
-                foreach ($this->getAllTableNames() as $tableName)
+                foreach($this->getAllTableNames() as $tableName)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-                        if (!empty($this->_relations))
+                        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+                        if(!empty($this->_relations))
                         {
                                 // Cancel generation of M-M relationships middle table
-                                if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                                if(count($tableInfo->getPrimaryKeys())===2 && count($tableInfo->getColumns())===2)//M-M relationships
                                         continue;
                         }
                         $this->_commonGenerate($tableName, $tableInfo);
@@ -75,26 +75,26 @@ 
 
         public function buildRelations()
         {
-                $this->_relations = array();
-                foreach ($this->getAllTableNames() as $table_name)
+                $this->_relations=array();
+                foreach($this->getAllTableNames() as $table_name)
                 {
-                        $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-                        $pks = $tableInfo->getPrimaryKeys();
-                        $fks = $tableInfo->getForeignKeys();
+                        $tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+                        $pks=$tableInfo->getPrimaryKeys();
+                        $fks=$tableInfo->getForeignKeys();
 
-                        if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+                        if(count($pks)===2 && count($tableInfo->getColumns())===2)//M-M relationships
                         {
-                                $table_name_mm = $fks[0]["table"];
-                                $table_name_mm2 = $fks[1]["table"];
+                                $table_name_mm=$fks[0]["table"];
+                                $table_name_mm2=$fks[1]["table"];
 
-                                $this->_relations[$table_name_mm][] = array(
+                                $this->_relations[$table_name_mm][]=array(
                                         "prop_name" => strtolower($table_name_mm2),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm2),
                                         "prop_ref" => $table_name
                                 );
 
-                                $this->_relations[$table_name_mm2][] = array(
+                                $this->_relations[$table_name_mm2][]=array(
                                         "prop_name" => strtolower($table_name_mm),
                                         "rel_type" => "self::MANY_TO_MANY",
                                         "ref_class_name" => $this->_getProperClassName($table_name_mm),
@@ -102,20 +102,20 @@ 
                                 );
                                 continue;
                         }
-                        foreach ($fks as $fk_data)//1-M relationships
+                        foreach($fks as $fk_data)//1-M relationships
                         {
-                                $owner_table = $fk_data["table"];
-                                $slave_table = $table_name;
-                                $fk_prop = key($fk_data["keys"]);
+                                $owner_table=$fk_data["table"];
+                                $slave_table=$table_name;
+                                $fk_prop=key($fk_data["keys"]);
 
-                                $this->_relations[$owner_table][] = array(
+                                $this->_relations[$owner_table][]=array(
                                         "prop_name" => strtolower($slave_table),
                                         "rel_type" => "self::HAS_MANY",
                                         "ref_class_name" => $this->_getProperClassName($slave_table),
                                         "prop_ref" => $fk_prop
                                 );
 
-                                $this->_relations[$slave_table][] = array(
+                                $this->_relations[$slave_table][]=array(
                                         "prop_name" => strtolower($owner_table),
                                         "rel_type" => "self::BELONGS_TO",
                                         "ref_class_name" => $this->_getProperClassName($owner_table),
@@ -131,88 +131,88 @@ 
 
         private function _commonGenerate($tableName, $tableInfo)
         {
-                if (count($tableInfo->getColumns()) === 0)
-                        throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+                if(count($tableInfo->getColumns())===0)
+                        throw new Exception("Unable to find table or view $tableName in ".$this->_dbMetaData->getDbConnection()->getConnectionString().".");
                 else
                 {
-                        $properties = array();
-                        foreach ($tableInfo->getColumns() as $field => $metadata)
-                                $properties[] = $this->generateProperty($field, $metadata);
-                        $toString = $this->_buildSmartToString($tableInfo);
+                        $properties=array();
+                        foreach($tableInfo->getColumns() as $field => $metadata)
+                                $properties[]=$this->generateProperty($field, $metadata);
+                        $toString=$this->_buildSmartToString($tableInfo);
                 }
 
-                $clasName = $this->_getProperClassName($tableName);
-                $class = $this->generateClass($properties, $tableName, $clasName, $toString);
-                $output = $this->_opFile . DIRECTORY_SEPARATOR . $clasName . ".php";
+                $clasName=$this->_getProperClassName($tableName);
+                $class=$this->generateClass($properties, $tableName, $clasName, $toString);
+                $output=$this->_opFile.DIRECTORY_SEPARATOR.$clasName.".php";
                 file_put_contents($output, $class);
         }
 
         private function _getProperClassName($tableName)
         {
-                $table_name_words = str_replace("_", " ", strtolower($tableName));
-                $final_conversion = str_replace(" ", "", ucwords($table_name_words));
-                return $this->_clasPrefix . $final_conversion . $this->_classSufix;
+                $table_name_words=str_replace("_", " ", strtolower($tableName));
+                $final_conversion=str_replace(" ", "", ucwords($table_name_words));
+                return $this->_clasPrefix.$final_conversion.$this->_classSufix;
         }
 
 //-----------------------------------------------------------------------------
 
         protected function generateProperty($field, $metadata)
         {
-                $prop = '';
-                $name = '$' . $field;
+                $prop='';
+                $name='$'.$field;
 
                 /* TODO use in version 2.0 */
                 // $type = $column->getPHPType();
 
-                $prop .= "\tpublic $name;";
+                $prop.="\tpublic $name;";
                 return $prop;
         }
 
         private function _renderRelations($tablename)
         {
-                if (!isset($this->_relations[$tablename]))
+                if(!isset($this->_relations[$tablename]))
                         return "";
 
-                $code = "\tpublic static \$RELATIONS = array (";
-                foreach ($this->_relations[$tablename] as $rel_data)
-                        $code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+                $code="\tpublic static \$RELATIONS = array (";
+                foreach($this->_relations[$tablename] as $rel_data)
+                        $code.="\n\t\t'".$rel_data["prop_name"]."' => array(".$rel_data["rel_type"].", '".$rel_data["ref_class_name"]."', '".$rel_data["prop_ref"]."'),";
 
-                $code = substr($code, 0, -1);
-                $code .= "\n\t);";
+                $code=substr($code, 0, -1);
+                $code.="\n\t);";
                 return $code;
         }
 
         private function _buildSmartToString($tableInfo)
         {
-                $code = "\tpublic function __toString() {";
-                $property = "throw new THttpException(500, 'Not implemented yet.');";
+                $code="\tpublic function __toString() {";
+                $property="throw new THttpException(500, 'Not implemented yet.');";
                 try
                 {
-                        foreach ($tableInfo->getColumns() as $column)
+                        foreach($tableInfo->getColumns() as $column)
                         {
-                                if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
-                                elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+                                if(isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
+                                elseif($column->PdoType==PDO::PARAM_STR && $column->DBType!="date")
                                 {
-                                        $property = str_replace($this->uqChars, "", $column->ColumnName);
+                                        $property=str_replace($this->uqChars, "", $column->ColumnName);
                                         break;
                                 }
                         }
-                } catch (Exception $ex)
+                } catch(Exception $ex)
                 {
                         Prado::trace($ex->getMessage());
                 }
-                $code .= "\n\t\treturn \$this->$property;";
-                $code .= "\n\t}";
+                $code.="\n\t\treturn \$this->$property;";
+                $code.="\n\t}";
                 return $code;
         }
 
         protected function generateClass($properties, $tablename, $classname, $toString)
         {
-                $props = implode("\n", $properties);
-                $relations = $this->_renderRelations($tablename);
-                $date = date('Y-m-d h:i:s');
-                $env_user = getenv("username");
+                $props=implode("\n", $properties);
+                $relations=$this->_renderRelations($tablename);
+                $date=date('Y-m-d h:i:s');
+                $env_user=getenv("username");
                 return <<<EOD
 <?php
 /**

framework/Wsat/TWsatBaseGenerator.php

Spacing +17 added lines, -17 removed lines

@@ -27,31 +27,31 @@ 
 
     function __construct()
     {
-        if (!class_exists("TActiveRecordManager", false))
+        if(!class_exists("TActiveRecordManager", false))
             throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
-        $ar_manager = TActiveRecordManager::getInstance();
-        $_conn = $ar_manager->getDbConnection();
-        $_conn->Active = true;
-        $this->_dbMetaData = TDbMetaData::getInstance($_conn);
+        $ar_manager=TActiveRecordManager::getInstance();
+        $_conn=$ar_manager->getDbConnection();
+        $_conn->Active=true;
+        $this->_dbMetaData=TDbMetaData::getInstance($_conn);
     }
 
     public function setOpFile($op_file_namespace)
     {
-        $op_file = Prado::getPathOfNamespace($op_file_namespace);
-        if (empty($op_file))
+        $op_file=Prado::getPathOfNamespace($op_file_namespace);
+        if(empty($op_file))
             throw new Exception("You need to fix your output folder namespace.");
-        if (!is_dir($op_file))
+        if(!is_dir($op_file))
             mkdir($op_file, 0777, true);
-        $this->_opFile = $op_file;
+        $this->_opFile=$op_file;
     }
 
     public function renderAllTablesInformation()
     {
-        foreach ($this->getAllTableNames() as $table_name)
+        foreach($this->getAllTableNames() as $table_name)
         {
-            echo $table_name . "<br>";
-            $tableInfo = $this->_dbMetaData->getTableInfo($table_name);
-            echo "Table info:" . "<br>";
+            echo $table_name."<br>";
+            $tableInfo=$this->_dbMetaData->getTableInfo($table_name);
+            echo "Table info:"."<br>";
             echo "<pre>";
             print_r($tableInfo);
             echo "</pre>";
@@ -60,9 +60,9 @@ 
 
     public function getAllTableNames()
     {
-        $tableNames = $this->_dbMetaData->findTableNames();
-        $index = array_search('pradocache', $tableNames);
-        if ($index)
+        $tableNames=$this->_dbMetaData->findTableNames();
+        $index=array_search('pradocache', $tableNames);
+        if($index)
             array_splice($tableNames, $index, 1);
         return $tableNames;
     }
@@ -76,7 +76,7 @@ 
 
     protected function eq($data)
     {
-        return '"' . $data . '"';
+        return '"'.$data.'"';
     }
 
 }

framework/Wsat/TWsatScaffoldingGenerator.php

Spacing +35 added lines, -35 removed lines

@@ -17,9 +17,9 @@ 
     /**
      * Const View Types for generation
      */
-    const LIST_TYPE = 0;
-    const ADD_TYPE = 1;
-    const SHOW_TYPE = 2;
+    const LIST_TYPE=0;
+    const ADD_TYPE=1;
+    const SHOW_TYPE=2;
 
     /**
      * Bootstrap option
@@ -46,34 +46,34 @@ 
     // <editor-fold defaultstate="collapsed" desc="Page Generation">
     public function generate($tableName, $viewType)
     {
-        switch ($viewType)
+        switch($viewType)
         {
             default:
             case self::LIST_TYPE:
-                $unitName = "list" . ucfirst($tableName);
+                $unitName="list".ucfirst($tableName);
                 break;
 
             case self::ADD_TYPE:
-                $unitName = "add" . ucfirst($tableName);
+                $unitName="add".ucfirst($tableName);
                 break;
 
             case self::SHOW_TYPE:
-                $unitName = "show" . ucfirst($tableName);
+                $unitName="show".ucfirst($tableName);
                 break;
         }
 
-        $class = $this->generateClass($unitName);
-        $outputClass = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".php";
+        $class=$this->generateClass($unitName);
+        $outputClass=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".php";
         file_put_contents($outputClass, $class);
 
-        $outputPage = $this->_opFile . DIRECTORY_SEPARATOR . $unitName . ".page";
-        $page = $this->generatePage($tableName, $viewType);
+        $outputPage=$this->_opFile.DIRECTORY_SEPARATOR.$unitName.".page";
+        $page=$this->generatePage($tableName, $viewType);
         file_put_contents($outputPage, $page);
     }
 
-    private function generatePage($tableName, $type, $tContentId = "Content")
+    private function generatePage($tableName, $type, $tContentId="Content")
     {
-        $pageContent = $this->getPageContent($tableName, $type);
+        $pageContent=$this->getPageContent($tableName, $type);
         return <<<EOD
 <com:TContent ID="$tContentId">   
                      
@@ -85,30 +85,30 @@ 
 
     private function getPageContent($tableName, $type)
     {
-        $code = "";
-        $tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-        switch ($type)
+        $code="";
+        $tableInfo=$this->_dbMetaData->getTableInfo($tableName);
+        switch($type)
         {
             case self::LIST_TYPE:
                 break;
             case self::ADD_TYPE:
-                foreach ($tableInfo->getColumns() as $colField => $colMetadata)
+                foreach($tableInfo->getColumns() as $colField => $colMetadata)
                 {
-                    if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
+                    if(!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
                     {
-                        $code .= $this->generateControl($colMetadata);
-                        $code .= $this->generateValidators($colMetadata);
-                        $code .= "\n";
+                        $code.=$this->generateControl($colMetadata);
+                        $code.=$this->generateValidators($colMetadata);
+                        $code.="\n";
                     }
                 }
-                foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
+                foreach($tableInfo->getForeignKeys() as $colField => $colMetadata)
                 {
-                    $colField = $this->eq($colMetadata["table"]);
-                    $code .= "\t<com:TTextBox ID=$colField />\n";
-                    $code .= "\n";
+                    $colField=$this->eq($colMetadata["table"]);
+                    $code.="\t<com:TTextBox ID=$colField />\n";
+                    $code.="\n";
                     //  TWsatBaseGenerator::pr($tableInfo);
                 }
-                $code .= "\t<com:TButton Text=\"Accept\" />\n";
+                $code.="\t<com:TButton Text=\"Accept\" />\n";
 
             case self::SHOW_TYPE:
                 break;
@@ -118,22 +118,22 @@ 
 
     private function generateControl($colMetadata)
     {
-        $controlType = "TTextBox";
-        switch ($colMetadata->DbType)
+        $controlType="TTextBox";
+        switch($colMetadata->DbType)
         {
             
         }
-        $controlId = $colMetadata->ColumnId;
+        $controlId=$colMetadata->ColumnId;
         return "\t<com:$controlType ID=\"$controlId\" />\n";
     }
 
     private function generateValidators($colMetadata)
     {
-        $controlId = $colMetadata->ColumnId;
-        $code = "";
-        if (!$colMetadata->AllowNull)
+        $controlId=$colMetadata->ColumnId;
+        $code="";
+        if(!$colMetadata->AllowNull)
         {
-            $code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
+            $code.="\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
         }
         return $code;
     }
@@ -143,8 +143,8 @@ 
     // <editor-fold defaultstate="collapsed" desc="Code Behind Generation">
     private function generateClass($classname)
     {
-        $date = date('Y-m-d h:i:s');
-        $env_user = getenv("username");
+        $date=date('Y-m-d h:i:s');
+        $env_user=getenv("username");
         return <<<EOD
 <?php
 /**

framework/Wsat/pages/layout/TWsatLayout.php

Spacing +5 added lines, -5 removed lines

@@ -16,11 +16,11 @@ 
 
         private function validateSecurity()
         {
-                if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
+                if($this->Session["wsat_password"]!==$this->getService()->getPassword())
                 {
-                        if (!$this->getPage() instanceof TWsatLogin)
+                        if(!$this->getPage() instanceof TWsatLogin)
                         {
-                                $url = $this->Service->constructUrl('TWsatLogin');
+                                $url=$this->Service->constructUrl('TWsatLogin');
                                 $this->Response->redirect($url);
                         }
                 }
@@ -28,8 +28,8 @@ 
 
         public function logout()
         {
-                $this->Session["wsat_password"] = "";
-                $url = $this->Service->constructUrl('TWsatLogin');
+                $this->Session["wsat_password"]="";
+                $url=$this->Service->constructUrl('TWsatLogin');
                 $this->Response->redirect($url);
         }
 

framework/Wsat/pages/TWsatLogin.php

Spacing +6 added lines, -6 removed lines

@@ -14,19 +14,19 @@
 
         public function login()
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
-                        $this->Session["wsat_password"] = $this->getService()->getPassword();
-                        $url = $this->Service->constructUrl('TWsatHome');
+                        $this->Session["wsat_password"]=$this->getService()->getPassword();
+                        $url=$this->Service->constructUrl('TWsatHome');
                         $this->Response->redirect($url);
                 }
         }
 
         public function validatePassword($sender, $param)
         {
-                $config_pass = $this->Service->Password;
-                $user_pass = $this->password->Text;
-                $param->IsValid = $user_pass === $config_pass;
+                $config_pass=$this->Service->Password;
+                $user_pass=$this->password->Text;
+                $param->IsValid=$user_pass===$config_pass;
         }
 
 }
\ No newline at end of file

framework/Wsat/pages/TWsatScaffolding.php

Spacing +17 added lines, -17 removed lines

@@ -22,13 +22,13 @@ 
 
         private function startVisual()
         {
-                $scf_generator = new TWsatScaffoldingGenerator();
-                foreach ($scf_generator->getAllTableNames() as $tableName)
+                $scf_generator=new TWsatScaffoldingGenerator();
+                foreach($scf_generator->getAllTableNames() as $tableName)
                 {
-                        $dynChb = new TCheckBox();
-                        $dynChb->ID = "cb_$tableName";
-                        $dynChb->Text = ucfirst($tableName);
-                        $dynChb->Checked = true;
+                        $dynChb=new TCheckBox();
+                        $dynChb->ID="cb_$tableName";
+                        $dynChb->Text=ucfirst($tableName);
+                        $dynChb->Checked=true;
                         $this->registerObject("cb_$tableName", $dynChb);
                         $this->tableNames->getControls()->add($dynChb);
                         $this->tableNames->getControls()->add("</br>");
@@ -41,30 +41,30 @@ 
          */
         public function generate($sender)
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
                         try
                         {
-                                $scf_generator = new TWsatScaffoldingGenerator();
+                                $scf_generator=new TWsatScaffoldingGenerator();
                                 $scf_generator->setOpFile($this->output_folder->Text);
-                                foreach ($scf_generator->getAllTableNames() as $tableName)
+                                foreach($scf_generator->getAllTableNames() as $tableName)
                                 {
-                                        $id = "cb_$tableName";
-                                        $obj = $this->tableNames->findControl($id);
+                                        $id="cb_$tableName";
+                                        $obj=$this->tableNames->findControl($id);
                                         if($obj!==null && $obj->Checked)
                                         {
                                                 $scf_generator->generateCRUD($tableName);
                                         }
                                 }
                                 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
+                                $this->feedback_panel->CssClass="green_panel";
+                                $this->generation_msg->Text="The code has been generated successfully.";
+                        } catch(Exception $ex)
                         {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
+                                $this->feedback_panel->CssClass="red_panel";
+                                $this->generation_msg->Text=$ex->getMessage();
                         }
-                        $this->feedback_panel->Visible = true;
+                        $this->feedback_panel->Visible=true;
                 }
 
                 //   $scf_generator->renderAllTablesInformation();

framework/Wsat/pages/TWsatGenerateAR.php

Spacing +14 added lines, -14 removed lines

@@ -16,36 +16,36 @@
 
         public function generate($sender)
         {
-                if ($this->IsValid)
+                if($this->IsValid)
                 {
-                        $tableName = $this->table_name->Text;
-                        $outputFolderNs = $this->output_folder->Text;
-                        $classPrefix = $this->class_prefix->Text;
-                        $classSuffix = $this->class_suffix->Text;
+                        $tableName=$this->table_name->Text;
+                        $outputFolderNs=$this->output_folder->Text;
+                        $classPrefix=$this->class_prefix->Text;
+                        $classSuffix=$this->class_suffix->Text;
 
                         try
                         {
-                                $ar_generator = new TWsatARGenerator();
+                                $ar_generator=new TWsatARGenerator();
                                 $ar_generator->setOpFile($outputFolderNs);
                                 $ar_generator->setClasPrefix($classPrefix);
                                 $ar_generator->setClassSufix($classSuffix);
 
-                                if ($this->build_rel->Checked)
+                                if($this->build_rel->Checked)
                                         $ar_generator->buildRelations();
 
-                                if ($tableName != "*")
+                                if($tableName!="*")
                                         $ar_generator->generate($tableName);
                                 else
                                         $ar_generator->generateAll();
 
-                                $this->feedback_panel->CssClass = "green_panel";
-                                $this->generation_msg->Text = "The code has been generated successfully.";
-                        } catch (Exception $ex)
+                                $this->feedback_panel->CssClass="green_panel";
+                                $this->generation_msg->Text="The code has been generated successfully.";
+                        } catch(Exception $ex)
                         {
-                                $this->feedback_panel->CssClass = "red_panel";
-                                $this->generation_msg->Text = $ex->getMessage();
+                                $this->feedback_panel->CssClass="red_panel";
+                                $this->generation_msg->Text=$ex->getMessage();
                         }
-                        $this->feedback_panel->Visible = true;
+                        $this->feedback_panel->Visible=true;
                 }
         }
 

framework/Wsat/TWsatService.php

Spacing +9 added lines, -9 removed lines

@@ -36,14 +36,14 @@ 
 class TWsatService extends TPageService
 {
 
-        private $_pass = '';
+        private $_pass='';
 
         public function init($config)
         {
-                if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
+                if($this->getApplication()->getMode()===TApplicationMode::Performance || $this->getApplication()->getMode()===TApplicationMode::Normal)
                         throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
 
-                if (empty($this->_pass))
+                if(empty($this->_pass))
                         throw new TConfigurationException("You need to specify the Password attribute.");
 
                 $this->setDefaultPage("TWsatHome");
@@ -53,16 +53,16 @@ 
 
         public function getBasePath()
         {
-                $basePath = Prado::getPathOfNamespace("System.Wsat.pages");
+                $basePath=Prado::getPathOfNamespace("System.Wsat.pages");
                 return realpath($basePath);
         }
 
         private function _startThemeManager()
         {
-                $themeManager = new TThemeManager;
-                $themeManager->BasePath = "System.Wsat.themes";
-                $url = Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
-                $themeManager->BaseUrl = "$url/themes";
+                $themeManager=new TThemeManager;
+                $themeManager->BasePath="System.Wsat.themes";
+                $url=Prado::getApplication()->getAssetManager()->publishFilePath(Prado::getPathOfNamespace('System.Wsat'));
+                $themeManager->BaseUrl="$url/themes";
 
                 $themeManager->init(null);
                 $this->setThemeManager($themeManager);
@@ -75,7 +75,7 @@ 
 
         public function setPassword($_pass)
         {
-                $this->_pass = $_pass;
+                $this->_pass=$_pass;
         }
 
 }
\ No newline at end of file