pradosoft / prado

bin/prado-cli.php

Doc Comments +40 added lines

@@ -145,6 +145,10 @@ 
 	 */
 	public abstract function performAction($args);
 
+	/**
+	 * @param string $dir
+	 * @param integer $mask
+	 */
 	protected function createDirectory($dir, $mask)
 	{
 		if(!is_dir($dir))
@@ -156,6 +160,9 @@ 
 			chmod($dir, $mask);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected function createFile($filename, $content)
 	{
 		if(!is_file($filename))
@@ -304,6 +311,9 @@ 
 ';
 	}
 
+	/**
+	 * @param string $appName
+	 */
 	protected function renderConfigFile($appName)
 	{
 		return <<<EOD
@@ -500,6 +510,9 @@ 
 		require_once($TEST_TOOLS.'/simpletest/reporter.php');
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	protected function runUnitTests($dir, $args)
 	{
 		$app_dir = $this->getAppDir($dir);
@@ -538,6 +551,9 @@ 
 		return realpath($dir.'/tests/unit/');
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	protected function getUnitTestCases($dir,$args)
 	{
 		$matches = null;
@@ -549,6 +565,9 @@ 
 		return $test;
 	}
 
+	/**
+	 * @param GroupTest $test
+	 */
 	protected function addTests($test,$path,$recursive=true,$match=null)
 	{
 		$dir=opendir($path);
@@ -565,6 +584,9 @@ 
 		closedir($dir);
 	}
 
+	/**
+	 * @param string $entry
+	 */
 	protected function hasMatch($match,$entry)
 	{
 		$file = strtolower(substr($entry,0,strrpos($entry,'.')));
@@ -630,6 +652,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getActiveRecordConfig($app_dir)
 	{
 		if(false === ($xml=$this->getXmlFile($app_dir)))
@@ -645,6 +670,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $app_dir
+	 */
 	protected function getOutputFile($app_dir, $namespace)
 	{
 		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
@@ -659,6 +687,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param TActiveRecordConfig $config
+	 */
 	protected function generateActiveRecord($config, $tablename, $output)
 	{
 		$manager = TActiveRecordManager::getInstance();
@@ -706,6 +737,9 @@ 
 		return $prop;
 	}
 
+	/**
+	 * @param string $class
+	 */
 	protected function generateClass($properties, $tablename, $class)
 	{
 		$props = implode("\n", $properties);
@@ -799,6 +833,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $app_dir
+     */
     protected function getActiveRecordConfig($app_dir) {
         if (false === ($xml = $this->getXmlFile($app_dir)))
             return false;
@@ -842,6 +879,9 @@ 
 			}
 	    }
 
+	    /**
+	     * @param string $l
+	     */
 	    public function generate($l)
 	    {
 			$input = explode(" ", trim($l));

Indentation +94 added lines, -94 removed lines

@@ -740,89 +740,89 @@ 
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction {
 
-    protected $action = 'generateAll';
-    protected $parameters = array('output');
-    protected $optional = array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
-    protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
-    private $_soap = false;
-    private $_prefix = '';
-    private $_postfix = '';
-    private $_overwrite = false;
-
-    public function performAction($args) {
-        $app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
-        $this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
-        $this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
-        $this->_prefix = count($args) > 5 ? $args[5] : '';
-        $this->_postfix = count($args) > 6 ? $args[6] : '';
-
-        if ($app_dir !== false) {
-            $config = $this->getActiveRecordConfig($app_dir);
-
-            $manager = TActiveRecordManager::getInstance();
-            $con = $manager->getDbConnection();
-            $con->Active = true;
-            $command = $con->createCommand("Show Tables");
-            $dataReader = $command->query();
-            $dataReader->bindColumn(1, $table);
-            $generator = new PHP_Shell_Extensions_ActiveRecord();
-            $tables = array();
-            while ($dataReader->read() !== false) {
-                $tables[] = $table;
-            }
-            $con->Active = False;
-            foreach ($tables as $key => $table) {
-                $output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
-                if ($config !== false && $output !== false) {
-                    $generator->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
-                }
-            }
-        }
-        return true;
-    }
-
-    protected function getAppDir($dir=".") {
-        if (is_dir($dir))
-            return realpath($dir);
-        if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-            return $app_dir;
-        echo '** Unable to find directory "' . $dir . "\".\n";
-        return false;
-    }
-
-    protected function getXmlFile($app_dir) {
-        if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
-            return $xml;
-        if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
-            return $xml;
-        echo '** Unable to find application.xml in ' . $app_dir . "\n";
-        return false;
-    }
-
-    protected function getActiveRecordConfig($app_dir) {
-        if (false === ($xml = $this->getXmlFile($app_dir)))
-            return false;
-        if (false !== ($app = $this->initializePradoApplication($app_dir))) {
-            Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-            foreach ($app->getModules() as $module)
-                if ($module instanceof TActiveRecordConfig)
-                    return $module;
-            echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
-        }
-        return false;
-    }
-
-    protected function getOutputFile($app_dir, $namespace) {
-        if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
-            return $namespace;
-        $file = Prado::getPathOfNamespace($namespace, "");
-        if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-            if (strpos($path, $app_dir) === 0)
-                return $file;
-        }
-        echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
-        return false;
-    }
+	protected $action = 'generateAll';
+	protected $parameters = array('output');
+	protected $optional = array('directory', 'soap', 'overwrite', 'prefix', 'postfix');
+	protected $description = "Generate Active Record skeleton for all Tables to <output> file using application.xml in [directory]. May also generate [soap] properties.\nGenerated Classes are named like the Table with optional [Prefix] and/or [Postfix]. [Overwrite] is used to overwrite existing Files.";
+	private $_soap = false;
+	private $_prefix = '';
+	private $_postfix = '';
+	private $_overwrite = false;
+
+	public function performAction($args) {
+		$app_dir = count($args) > 2 ? $this->getAppDir($args[2]) : $this->getAppDir();
+		$this->_soap = count($args) > 3 ? ($args[3] == "soap" || $args[3] == "true" ? true : false) : false;
+		$this->_overwrite = count($args) > 4 ? ($args[4] == "overwrite" || $args[4] == "true" ? true : false) : false;
+		$this->_prefix = count($args) > 5 ? $args[5] : '';
+		$this->_postfix = count($args) > 6 ? $args[6] : '';
+
+		if ($app_dir !== false) {
+			$config = $this->getActiveRecordConfig($app_dir);
+
+			$manager = TActiveRecordManager::getInstance();
+			$con = $manager->getDbConnection();
+			$con->Active = true;
+			$command = $con->createCommand("Show Tables");
+			$dataReader = $command->query();
+			$dataReader->bindColumn(1, $table);
+			$generator = new PHP_Shell_Extensions_ActiveRecord();
+			$tables = array();
+			while ($dataReader->read() !== false) {
+				$tables[] = $table;
+			}
+			$con->Active = False;
+			foreach ($tables as $key => $table) {
+				$output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
+				if ($config !== false && $output !== false) {
+					$generator->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+				}
+			}
+		}
+		return true;
+	}
+
+	protected function getAppDir($dir=".") {
+		if (is_dir($dir))
+			return realpath($dir);
+		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+			return $app_dir;
+		echo '** Unable to find directory "' . $dir . "\".\n";
+		return false;
+	}
+
+	protected function getXmlFile($app_dir) {
+		if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
+			return $xml;
+		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
+			return $xml;
+		echo '** Unable to find application.xml in ' . $app_dir . "\n";
+		return false;
+	}
+
+	protected function getActiveRecordConfig($app_dir) {
+		if (false === ($xml = $this->getXmlFile($app_dir)))
+			return false;
+		if (false !== ($app = $this->initializePradoApplication($app_dir))) {
+			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
+			foreach ($app->getModules() as $module)
+				if ($module instanceof TActiveRecordConfig)
+					return $module;
+			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
+		}
+		return false;
+	}
+
+	protected function getOutputFile($app_dir, $namespace) {
+		if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
+			return $namespace;
+		$file = Prado::getPathOfNamespace($namespace, "");
+		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
+			if (strpos($path, $app_dir) === 0)
+				return $file;
+		}
+		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		return false;
+	}
 
 }
 
@@ -830,20 +830,20 @@ 
 if(class_exists('PHP_Shell_Commands', false))
 {
 	class PHP_Shell_Extensions_ActiveRecord implements PHP_Shell_Extension {
-	    public function register()
-	    {
+		public function register()
+		{
 
-	        $cmd = PHP_Shell_Commands::getInstance();
+			$cmd = PHP_Shell_Commands::getInstance();
 			if(Prado::getApplication() !== null)
 			{
-		        $cmd->registerCommand('#^generate#', $this, 'generate', 'generate <table> <output> [soap]',
-		            'Generate Active Record skeleton for <table> to <output> file using'.PHP_EOL.
-		            '    application.xml in [directory]. May also generate [soap] properties.');
+				$cmd->registerCommand('#^generate#', $this, 'generate', 'generate <table> <output> [soap]',
+					'Generate Active Record skeleton for <table> to <output> file using'.PHP_EOL.
+					'    application.xml in [directory]. May also generate [soap] properties.');
 			}
-	    }
+		}
 
-	    public function generate($l)
-	    {
+		public function generate($l)
+		{
 			$input = explode(" ", trim($l));
 			if(count($input) > 2)
 			{
@@ -860,12 +860,12 @@ 
 			{
 				echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 			}
-	    }
+		}
 	}
 
 	$__shell_exts = PHP_Shell_Extensions::getInstance();
 	$__shell_exts->registerExtensions(array(
-		    "active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
+			"active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
 
 	include_once(realpath(dirname(dirname(__FILE__))).'/framework/3rdParty/PhpShell/php-shell-cmd.php');
 }

Spacing +147 added lines, -147 removed lines

@@ -9,12 +9,12 @@ 
  * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
  */
 
-if(!isset($_SERVER['argv']) || php_sapi_name()!=='cli')
+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');
+require_once($frameworkPath . 'prado.php');
 
 //stub application class
 class PradoShellApplication extends TApplication
@@ -28,13 +28,13 @@ 
 restore_exception_handler();
 
 //config PHP shell
-if(count($_SERVER['argv']) > 1 && strtolower($_SERVER['argv'][1])==='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);
+		if (!$shell->has_semicolon) echo Prado::varDump($var);
 	}
-	include_once($frameworkPath.'/3rdParty/PhpShell/php-shell-init.php');
+	include_once($frameworkPath . '/3rdParty/PhpShell/php-shell-init.php');
 }
 
 
@@ -64,7 +64,7 @@ 
 	/**
 	 * @var array command action classes
 	 */
-	protected $_actions=array();
+	protected $_actions = array();
 
 	/**
 	 * @param string action class name
@@ -80,14 +80,14 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
+		if ($instance === null)
 			$instance = new self;
 		return $instance;
 	}
 
 	public static function printGreeting()
 	{
-		echo "Command line tools for Prado ".Prado::getVersion().".\n";
+		echo "Command line tools for Prado " . Prado::getVersion() . ".\n";
 	}
 
 	/**
@@ -96,12 +96,12 @@ 
 	 */
 	public function run($args)
 	{
-		if(count($args) > 1)
+		if (count($args) > 1)
 			array_shift($args);
 		$valid = false;
-		foreach($this->_actions as $class => $action)
+		foreach ($this->_actions as $class => $action)
 		{
-			if($action->isValidAction($args))
+			if ($action->isValidAction($args))
 			{
 				$valid |= $action->performAction($args);
 				break;
@@ -111,7 +111,7 @@ 
 				$valid = false;
 			}
 		}
-		if(!$valid)
+		if (!$valid)
 			$this->printHelp();
 	}
 
@@ -125,7 +125,7 @@ 
 		echo "usage: php prado-cli.php action <parameter> [optional]\n";
 		echo "example: php prado-cli.php -c mysite\n\n";
 		echo "actions:\n";
-		foreach($this->_actions as $action)
+		foreach ($this->_actions as $action)
 			echo $action->renderHelp();
 	}
 }
@@ -147,18 +147,18 @@ 
 
 	protected function createDirectory($dir, $mask)
 	{
-		if(!is_dir($dir))
+		if (!is_dir($dir))
 		{
 			mkdir($dir);
 			echo "creating $dir\n";
 		}
-		if(is_dir($dir))
+		if (is_dir($dir))
 			chmod($dir, $mask);
 	}
 
 	protected function createFile($filename, $content)
 	{
-		if(!is_file($filename))
+		if (!is_file($filename))
 		{
 			file_put_contents($filename, $content);
 			echo "creating $filename\n";
@@ -168,22 +168,22 @@ 
 	public function isValidAction($args)
 	{
 		return strtolower($args[0]) === $this->action &&
-				count($args)-1 >= count($this->parameters);
+				count($args) - 1 >= count($this->parameters);
 	}
 
 	public function renderHelp()
 	{
 		$params = array();
-		foreach($this->parameters as $v)
-			$params[] = '<'.$v.'>';
+		foreach ($this->parameters as $v)
+			$params[] = '<' . $v . '>';
 		$parameters = join($params, ' ');
 		$options = array();
-		foreach($this->optional as $v)
-			$options[] = '['.$v.']';
-		$optional = (strlen($parameters) ? ' ' : ''). join($options, ' ');
-		$description='';
-		foreach(explode("\n", wordwrap($this->description,65)) as $line)
-			$description .= '    '.$line."\n";
+		foreach ($this->optional as $v)
+			$options[] = '[' . $v . ']';
+		$optional = (strlen($parameters) ? ' ' : '') . join($options, ' ');
+		$description = '';
+		foreach (explode("\n", wordwrap($this->description, 65)) as $line)
+			$description .= '    ' . $line . "\n";
 		return <<<EOD
   {$this->action} {$parameters}{$optional}
 {$description}
@@ -193,17 +193,17 @@ 
 
 	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)
+			if (Prado::getApplication() === null)
 			{
 				$app = new PradoShellApplication($app_dir);
 				$app->run();
-				$dir = substr(str_replace(realpath('./'),'',$app_dir),1);
-				$initialized=true;
+				$dir = substr(str_replace(realpath('./'), '', $app_dir), 1);
+				$initialized = true;
 				PradoCommandLineInterpreter::printGreeting();
-				echo '** Loaded PRADO appplication in directory "'.$dir."\".\n";
+				echo '** Loaded PRADO appplication in directory "' . $dir . "\".\n";
 			}
 
 			return Prado::getApplication();
@@ -211,9 +211,9 @@ 
 		else
 		{
 			PradoCommandLineInterpreter::printGreeting();
-			echo '+'.str_repeat('-',77)."+\n";
-			echo '** Unable to load PRADO application in directory "'.$directory."\".\n";
-			echo '+'.str_repeat('-',77)."+\n";
+			echo '+' . str_repeat('-', 77) . "+\n";
+			echo '** Unable to load PRADO application in directory "' . $directory . "\".\n";
+			echo '+' . str_repeat('-', 77) . "+\n";
 		}
 		return false;
 	}
@@ -245,31 +245,31 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if(strlen(trim($dir)) == 0)
+		if (strlen(trim($dir)) == 0)
 			return;
 
 		$rootPath = realpath(dirname(trim($dir)));
 
-		if(basename($dir)!=='.')
-			$basePath = $rootPath.DIRECTORY_SEPARATOR.basename($dir);
+		if (basename($dir) !== '.')
+			$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
 		else
 			$basePath = $rootPath;
 		$appName = basename($basePath);
-		$assetPath = $basePath.DIRECTORY_SEPARATOR.'assets';
-		$protectedPath  = $basePath.DIRECTORY_SEPARATOR.'protected';
-		$runtimePath = $basePath.DIRECTORY_SEPARATOR.'protected'.DIRECTORY_SEPARATOR.'runtime';
-		$pagesPath = $protectedPath.DIRECTORY_SEPARATOR.'pages';
+		$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';
+		$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,10 +279,10 @@ 
 
 	protected function renderIndexFile()
 	{
-		$framework = realpath(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR.'prado.php';
+		$framework = realpath(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'framework' . DIRECTORY_SEPARATOR . 'prado.php';
 return '<?php
 
-$frameworkPath=\''.$framework.'\';
+$frameworkPath=\''.$framework . '\';
 
 // The following directory checks may be removed if performance is required
 $basePath=dirname(__FILE__);
@@ -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);
+		$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,10 +415,10 @@ 
 
 	protected function renderUnitTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))).'/tests/test_tools/unit_tests.php';
+		$tester = realpath(dirname(dirname(__FILE__))) . '/tests/test_tools/unit_tests.php';
 return '<?php
 
-include_once \''.$tester.'\';
+include_once \''.$tester . '\';
 
 $app_directory = "../protected";
 $test_cases = dirname(__FILE__)."/unit";
@@ -430,10 +430,10 @@ 
 
 	protected function renderFunctionalTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))).'/tests/test_tools/functional_tests.php';
+		$tester = realpath(dirname(dirname(__FILE__))) . '/tests/test_tools/functional_tests.php';
 return '<?php
 
-include_once \''.$tester.'\';
+include_once \''.$tester . '\';
 
 $test_cases = dirname(__FILE__)."/functional";
 
@@ -459,7 +459,7 @@ 
 
 	public function performAction($args)
 	{
-		if(count($args) > 1)
+		if (count($args) > 1)
 			$app = $this->initializePradoApplication($args[1]);
 		return true;
 	}
@@ -483,94 +483,94 @@ 
 	public function performAction($args)
 	{
 		$dir = realpath($args[1]);
-		if($dir !== false && is_dir($dir))
-			$this->runUnitTests($dir,$args);
+		if ($dir !== false && is_dir($dir))
+			$this->runUnitTests($dir, $args);
 		else
-			echo '** Unable to find directory "'.$args[1]."\".\n";
+			echo '** Unable to find directory "' . $args[1] . "\".\n";
 		return true;
 	}
 
 	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');
-		require_once($TEST_TOOLS.'/simpletest/mock_objects.php');
-		require_once($TEST_TOOLS.'/simpletest/reporter.php');
+		require_once($TEST_TOOLS . '/simpletest/unit_tester.php');
+		require_once($TEST_TOOLS . '/simpletest/web_tester.php');
+		require_once($TEST_TOOLS . '/simpletest/mock_objects.php');
+		require_once($TEST_TOOLS . '/simpletest/reporter.php');
 	}
 
 	protected function runUnitTests($dir, $args)
 	{
 		$app_dir = $this->getAppDir($dir);
-		if($app_dir !== false)
-			$this->initializePradoApplication($app_dir.'/../');
+		if ($app_dir !== false)
+			$this->initializePradoApplication($app_dir . '/../');
 
 		$this->initializeTestRunner();
 		$test_dir = $this->getTestDir($dir);
-		if($test_dir !== false)
+		if ($test_dir !== false)
 		{
-			$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 = $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);
-			echo '** Unable to find test directory "'.$running_dir.'/unit" or "'.$running_dir.'/tests/unit".'."\n";
+			$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');
+		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/');
+		return realpath($dir . '/tests/unit/');
 	}
 
-	protected function getUnitTestCases($dir,$args)
+	protected function getUnitTestCases($dir, $args)
 	{
 		$matches = null;
-		if(count($args) > 2)
-			$matches = array_slice($args,2);
-		$test=new GroupTest(' ');
-		$this->addTests($test,$dir,true,$matches);
-		$test->setLabel(implode(' ',$this->matches));
+		if (count($args) > 2)
+			$matches = array_slice($args, 2);
+		$test = new GroupTest(' ');
+		$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)
+		$dir = opendir($path);
+		while (($entry = readdir($dir)) !== false)
 		{
-			if(is_file($path.'/'.$entry) && (preg_match('/[^\s]*test[^\s]*\.php/', strtolower($entry))))
+			if (is_file($path . '/' . $entry) && (preg_match('/[^\s]*test[^\s]*\.php/', strtolower($entry))))
 			{
-				if($match==null||($match!=null && $this->hasMatch($match,$entry)))
-					$test->addTestFile($path.'/'.$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);
+			if ($entry !== '.' && $entry !== '..' && is_dir($path . '/' . $entry) && $recursive)
+				$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,'.')));
-		foreach($match as $m)
+		$file = strtolower(substr($entry, 0, strrpos($entry, '.')));
+		foreach ($match as $m)
 		{
-			if(strtolower($m) === $file)
+			if (strtolower($m) === $file)
 			{
 				$this->matches[] = $m;
 				return true;
@@ -592,89 +592,89 @@ 
 	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;
+	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)
+		if ($app_dir !== false)
 		{
 			$config = $this->getActiveRecordConfig($app_dir);
 			$output = $this->getOutputFile($app_dir, $args[2]);
-			if(is_file($output))
+			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;
 	}
 
-	protected function getAppDir($dir=".")
+	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, ".php");
-		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
+		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
 		{
-			if(strpos($path, $app_dir)===0)
+			if (strpos($path, $app_dir) === 0)
 				return $file;
 		}
-		echo '** Output file '.$file.' must be within directory '.$app_dir."\n";
+		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
 		return false;
 	}
 
 	protected function generateActiveRecord($config, $tablename, $output)
 	{
 		$manager = TActiveRecordManager::getInstance();
-		if($connection = $manager->getDbConnection()) {
+		if ($connection = $manager->getDbConnection()) {
 			$gateway = $manager->getRecordGateway();
 			$tableInfo = $gateway->getTableInfo($manager->getDbConnection(), $tablename);
-			if(count($tableInfo->getColumns()) === 0)
+			if (count($tableInfo->getColumns()) === 0)
 			{
-				echo '** Unable to find table or view "'.$tablename.'" in "'.$manager->getDbConnection()->getConnectionString()."\".\n";
+				echo '** Unable to find table or view "' . $tablename . '" in "' . $manager->getDbConnection()->getConnectionString() . "\".\n";
 				return false;
 			}
 			else
 			{
 				$properties = array();
-				foreach($tableInfo->getColumns() as $field=>$column)
-					$properties[] = $this->generateProperty($field,$column);
+				foreach ($tableInfo->getColumns() as $field=>$column)
+					$properties[] = $this->generateProperty($field, $column);
 			}
 
 			$classname = basename($output, '.php');
@@ -682,16 +682,16 @@ 
 			echo "  Writing class $classname to file $output\n";
 			file_put_contents($output, $class);
 		} else {
-			echo '** Unable to connect to database with ConnectionID=\''.$config->getConnectionID()."'. Please check your settings in application.xml and ensure your database connection is set up first.\n";
+			echo '** Unable to connect to database with ConnectionID=\'' . $config->getConnectionID() . "'. Please check your settings in application.xml and ensure your database connection is set up first.\n";
 		}
 	}
 
-	protected function generateProperty($field,$column)
+	protected function generateProperty($field, $column)
 	{
 		$prop = '';
-		$name = '$'.$field;
+		$name = '$' . $field;
 		$type = $column->getPHPType();
-		if($this->_soap)
+		if ($this->_soap)
 		{
 			$prop .= <<<EOD
 
@@ -781,7 +781,7 @@ 
         return true;
     }
 
-    protected function getAppDir($dir=".") {
+    protected function getAppDir($dir = ".") {
         if (is_dir($dir))
             return realpath($dir);
         if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
@@ -827,17 +827,17 @@ 
 }
 
 //run PHP shell
-if(class_exists('PHP_Shell_Commands', false))
+if (class_exists('PHP_Shell_Commands', false))
 {
 	class PHP_Shell_Extensions_ActiveRecord implements PHP_Shell_Extension {
 	    public function register()
 	    {
 
 	        $cmd = PHP_Shell_Commands::getInstance();
-			if(Prado::getApplication() !== null)
+			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.
+		            'Generate Active Record skeleton for <table> to <output> file using' . PHP_EOL .
 		            '    application.xml in [directory]. May also generate [soap] properties.');
 			}
 	    }
@@ -845,14 +845,14 @@ 
 	    public function generate($l)
 	    {
 			$input = explode(" ", trim($l));
-			if(count($input) > 2)
+			if (count($input) > 2)
 			{
 				$app_dir = '.';
-				if(Prado::getApplication()!==null)
+				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');
+				$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);
 			}
@@ -867,5 +867,5 @@ 
 	$__shell_exts->registerExtensions(array(
 		    "active-record"        => new PHP_Shell_Extensions_ActiveRecord)); /* the :set command */
 
-	include_once(realpath(dirname(dirname(__FILE__))).'/framework/3rdParty/PhpShell/php-shell-cmd.php');
+	include_once(realpath(dirname(dirname(__FILE__))) . '/framework/3rdParty/PhpShell/php-shell-cmd.php');
 }

Braces +133 added lines, -96 removed lines

@@ -9,8 +9,9 @@ 
  * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
  */
 
-if(!isset($_SERVER['argv']) || php_sapi_name()!=='cli')
+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;
 
@@ -32,7 +33,9 @@ 
 {
 	function __shell_print_var($shell,$var)
 	{
-		if(!$shell->has_semicolon) echo Prado::varDump($var);
+		if(!$shell->has_semicolon) {
+			echo Prado::varDump($var);
+		}
 	}
 	include_once($frameworkPath.'/3rdParty/PhpShell/php-shell-init.php');
 }
@@ -80,8 +83,9 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
-			$instance = new self;
+		if($instance === null) {
+					$instance = new self;
+		}
 		return $instance;
 	}
 
@@ -96,8 +100,9 @@ 
 	 */
 	public function run($args)
 	{
-		if(count($args) > 1)
-			array_shift($args);
+		if(count($args) > 1) {
+					array_shift($args);
+		}
 		$valid = false;
 		foreach($this->_actions as $class => $action)
 		{
@@ -105,14 +110,14 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
 		}
-		if(!$valid)
-			$this->printHelp();
+		if(!$valid) {
+					$this->printHelp();
+		}
 	}
 
 	/**
@@ -125,8 +130,9 @@ 
 		echo "usage: php prado-cli.php action <parameter> [optional]\n";
 		echo "example: php prado-cli.php -c mysite\n\n";
 		echo "actions:\n";
-		foreach($this->_actions as $action)
-			echo $action->renderHelp();
+		foreach($this->_actions as $action) {
+					echo $action->renderHelp();
+		}
 	}
 }
 
@@ -152,8 +158,9 @@ 
 			mkdir($dir);
 			echo "creating $dir\n";
 		}
-		if(is_dir($dir))
-			chmod($dir, $mask);
+		if(is_dir($dir)) {
+					chmod($dir, $mask);
+		}
 	}
 
 	protected function createFile($filename, $content)
@@ -174,16 +181,19 @@ 
 	public function renderHelp()
 	{
 		$params = array();
-		foreach($this->parameters as $v)
-			$params[] = '<'.$v.'>';
+		foreach($this->parameters as $v) {
+					$params[] = '<'.$v.'>';
+		}
 		$parameters = join($params, ' ');
 		$options = array();
-		foreach($this->optional as $v)
-			$options[] = '['.$v.']';
+		foreach($this->optional as $v) {
+					$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}
@@ -207,8 +217,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+'.str_repeat('-',77)."+\n";
@@ -245,15 +254,17 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if(strlen(trim($dir)) == 0)
-			return;
+		if(strlen(trim($dir)) == 0) {
+					return;
+		}
 
 		$rootPath = realpath(dirname(trim($dir)));
 
-		if(basename($dir)!=='.')
-			$basePath = $rootPath.DIRECTORY_SEPARATOR.basename($dir);
-		else
-			$basePath = $rootPath;
+		if(basename($dir)!=='.') {
+					$basePath = $rootPath.DIRECTORY_SEPARATOR.basename($dir);
+		} else {
+					$basePath = $rootPath;
+		}
 		$appName = basename($basePath);
 		$assetPath = $basePath.DIRECTORY_SEPARATOR.'assets';
 		$protectedPath  = $basePath.DIRECTORY_SEPARATOR.'protected';
@@ -392,8 +403,9 @@ 
 
 	protected function createTestFixtures($dir)
 	{
-		if(strlen(trim($dir)) == 0)
-			return;
+		if(strlen(trim($dir)) == 0) {
+					return;
+		}
 
 		$rootPath = realpath(dirname(trim($dir)));
 		$basePath = $rootPath.'/'.basename($dir);
@@ -459,8 +471,9 @@ 
 
 	public function performAction($args)
 	{
-		if(count($args) > 1)
-			$app = $this->initializePradoApplication($args[1]);
+		if(count($args) > 1) {
+					$app = $this->initializePradoApplication($args[1]);
+		}
 		return true;
 	}
 }
@@ -483,10 +496,11 @@ 
 	public function performAction($args)
 	{
 		$dir = realpath($args[1]);
-		if($dir !== false && is_dir($dir))
-			$this->runUnitTests($dir,$args);
-		else
-			echo '** Unable to find directory "'.$args[1]."\".\n";
+		if($dir !== false && is_dir($dir)) {
+					$this->runUnitTests($dir,$args);
+		} else {
+					echo '** Unable to find directory "'.$args[1]."\".\n";
+		}
 		return true;
 	}
 
@@ -503,8 +517,9 @@ 
 	protected function runUnitTests($dir, $args)
 	{
 		$app_dir = $this->getAppDir($dir);
-		if($app_dir !== false)
-			$this->initializePradoApplication($app_dir.'/../');
+		if($app_dir !== false) {
+					$this->initializePradoApplication($app_dir.'/../');
+		}
 
 		$this->initializeTestRunner();
 		$test_dir = $this->getTestDir($dir);
@@ -514,8 +529,7 @@ 
 			$running_dir = substr(str_replace(realpath('./'),'',$test_dir),1);
 			echo 'Running unit tests in directory "'.$running_dir."\":\n";
 			$test->run(new TextReporter());
-		}
-		else
+		} else
 		{
 			$running_dir = substr(str_replace(realpath('./'),'',$dir),1);
 			echo '** Unable to find test directory "'.$running_dir.'/unit" or "'.$running_dir.'/tests/unit".'."\n";
@@ -525,24 +539,27 @@ 
 	protected function getAppDir($dir)
 	{
 		$app_dir = realpath($dir.'/protected');
-		if($app_dir !== false && is_dir($app_dir))
-			return $app_dir;
+		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))
-			return $test_dir;
+		if($test_dir !== false && is_dir($test_dir)) {
+					return $test_dir;
+		}
 		return realpath($dir.'/tests/unit/');
 	}
 
 	protected function getUnitTestCases($dir,$args)
 	{
 		$matches = null;
-		if(count($args) > 2)
-			$matches = array_slice($args,2);
+		if(count($args) > 2) {
+					$matches = array_slice($args,2);
+		}
 		$test=new GroupTest(' ');
 		$this->addTests($test,$dir,true,$matches);
 		$test->setLabel(implode(' ',$this->matches));
@@ -556,11 +573,13 @@ 
 		{
 			if(is_file($path.'/'.$entry) && (preg_match('/[^\s]*test[^\s]*\.php/', strtolower($entry))))
 			{
-				if($match==null||($match!=null && $this->hasMatch($match,$entry)))
-					$test->addTestFile($path.'/'.$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);
 			}
-			if($entry!=='.' && $entry!=='..' && is_dir($path.'/'.$entry) && $recursive)
-				$this->addTests($test,$path.'/'.$entry,$recursive,$match);
 		}
 		closedir($dir);
 	}
@@ -602,44 +621,51 @@ 
 		{
 			$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)
-				$this->generateActiveRecord($config, $args[1], $output);
+			if(is_file($output)) {
+							echo "** File $output already exists, skiping. \n";
+			} else if($config !== false && $output !== false) {
+							$this->generateActiveRecord($config, $args[1], $output);
+			}
 		}
 		return true;
 	}
 
 	protected function getAppDir($dir=".")
 	{
-		if(is_dir($dir))
-			return realpath($dir);
-		if(false !== ($app_dir = realpath($dir.'/protected/')) && is_dir($app_dir))
-			return $app_dir;
+		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;
+		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 === ($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)
+			foreach($app->getModules() as $module) {
+							if($module instanceof TActiveRecordConfig)
 					return $module;
+			}
 			echo '** Unable to find TActiveRecordConfig module in '.$xml."\n";
 		}
 		return false;
@@ -647,13 +673,15 @@ 
 
 	protected function getOutputFile($app_dir, $namespace)
 	{
-		if(is_file($namespace) && strpos($namespace, $app_dir)===0)
-				return $namespace;
+		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))
 		{
-			if(strpos($path, $app_dir)===0)
-				return $file;
+			if(strpos($path, $app_dir)===0) {
+							return $file;
+			}
 		}
 		echo '** Output file '.$file.' must be within directory '.$app_dir."\n";
 		return false;
@@ -669,12 +697,12 @@ 
 			{
 				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)
-					$properties[] = $this->generateProperty($field,$column);
+				foreach($tableInfo->getColumns() as $field=>$column) {
+									$properties[] = $this->generateProperty($field,$column);
+				}
 			}
 
 			$classname = basename($output, '.php');
@@ -782,43 +810,51 @@ 
     }
 
     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;
+        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;
+        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 === ($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)
+            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;
+        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;
+            if (strpos($path, $app_dir) === 0) {
+                            return $file;
+            }
         }
         echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
         return false;
@@ -848,15 +884,16 @@ 
 			if(count($input) > 2)
 			{
 				$app_dir = '.';
-				if(Prado::getApplication()!==null)
-					$app_dir = dirname(Prado::getApplication()->getBasePath());
+				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');
+				if(count($input)>3) {
+									$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";
 			}

buildscripts/Benchmark/Profiler.php

Doc Comments +4 added lines, -1 removed lines

@@ -233,6 +233,7 @@ 
      * Returns formatted profiling information.
      *
      * @param  string output format (auto, plain or html), default auto
+     * @param string $format
      * @see    display()
      * @access private
      */
@@ -363,6 +364,7 @@ 
      * Enters code section.
      *
      * @param  string  name of the code section
+     * @param string $name
      * @see    start(), leaveSection()
      * @access public
      */
@@ -398,6 +400,7 @@ 
      * Leaves code section.
      *
      * @param  string  name of the marker to be set
+     * @param string $name
      * @see     stop(), enterSection()
      * @access public
      */
@@ -436,7 +439,7 @@ 
     /**
      * Wrapper for microtime().
      *
-     * @return float
+     * @return string
      * @access private
      * @since  1.3.0
      */

Indentation +363 added lines, -363 removed lines

@@ -77,371 +77,371 @@
  * @since     1.2.0
  */
 class Benchmark_Profiler extends PEAR {
-    /**
-     * Contains the total ex. time of each section
-     *
-     * @var    array
-     * @access private
-     */
-    var $_sections = array();
-
-    /**
-     * Calling stack
-     *
-     * @var    array
-     * @access private
-     */
-    var $_stack = array();
-
-    /**
-     * Notes how often a section was entered
-     *
-     * @var    array
-     * @access private
-     */
-    var $_numberOfCalls = array();
-
-    /**
-     * Notes for each section how much time is spend in sub-sections
-     *
-     * @var    array
-     * @access private
-     */
-    var $_subSectionsTime = array();
-
-    /**
-     * Notes for each section how often it calls which section
-     *
-     * @var    array
-     * @access private
-     */
-    var $_calls = array();
-
-    /**
-     * Notes for each section how often it was called by which section
-     *
-     * @var    array
-     * @access private
-     */
-    var $_callers = array();
-
-    /**
-     * Auto-starts and stops profiler
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_auto = FALSE;
-
-    /**
-     * Max marker name length for non-html output
-     *
-     * @var    integer
-     * @access private
-     */
-    var $_maxStringLength = 0;
-
-    /**
-     * Constructor, starts profiling recording
-     *
-     * @access public
-     */
-    function Benchmark_Profiler($auto = FALSE) {
-        $this->_auto = $auto;
-
-        if ($this->_auto) {
-            $this->start();
-        }
-
-        $this->PEAR();
-    }
-
-    /**
-     * Destructor, stops profiling recording
-     *
-     * @access private
-     */
-    function _Benchmark_Profiler() {
-        if (isset($this->_auto) && $this->_auto) {
-            $this->stop();
-            $this->display();
-        }
-    }
-
-    /**
-     * Returns profiling informations for a given section.
-     *
-     * @param  string $section
-     * @return array
-     * @access public
-     */
-    function getSectionInformations($section = 'Global') {
-        if (isset($this->_sections[$section])) {
-            $calls = array();
-
-            if (isset($this->_calls[$section])) {
-                $calls = $this->_calls[$section];
-            }
-
-            $callers = array();
-
-            if (isset($this->_callers[$section])) {
-                $callers = $this->_callers[$section];
-            }
-
-            $informations = array();
-
-            $informations['time']       = $this->_sections[$section];
-            if (isset($this->_sections['Global'])) {
-                $informations['percentage'] = number_format(100 * $this->_sections[$section] / $this->_sections['Global'], 2, '.', '');
-            } else {
-                $informations['percentage'] = 'N/A';
-            }
-            $informations['calls']      = $calls;
-            $informations['num_calls']  = $this->_numberOfCalls[$section];
-            $informations['callers']    = $callers;
-
-      	    if (isset($this->_subSectionsTime[$section])) {
-                $informations['netto_time'] = $this->_sections[$section] - $this->_subSectionsTime[$section];
-      	    } else {
-                $informations['netto_time'] = $this->_sections[$section];
-      	    }
-
-            return $informations;
-        } else {
-            $this->raiseError("The section '$section' does not exists.\n", NULL, PEAR_ERROR_TRIGGER, E_USER_WARNING);
-        }
-    }
-
-    /**
-     * Returns profiling informations for all sections.
-     *
-     * @return array
-     * @access public
-     */
-    function getAllSectionsInformations() {
-        $informations = array();
-
-        foreach($this->_sections as $section => $time) {
-            $informations[$section] = $this->getSectionInformations($section);
-        }
-
-        return $informations;
-    }
-
-    /**
-     * Returns formatted profiling information.
-     *
-     * @param  string output format (auto, plain or html), default auto
-     * @see    display()
-     * @access private
-     */
-    function _getOutput($format) {
+	/**
+	 * Contains the total ex. time of each section
+	 *
+	 * @var    array
+	 * @access private
+	 */
+	var $_sections = array();
+
+	/**
+	 * Calling stack
+	 *
+	 * @var    array
+	 * @access private
+	 */
+	var $_stack = array();
+
+	/**
+	 * Notes how often a section was entered
+	 *
+	 * @var    array
+	 * @access private
+	 */
+	var $_numberOfCalls = array();
+
+	/**
+	 * Notes for each section how much time is spend in sub-sections
+	 *
+	 * @var    array
+	 * @access private
+	 */
+	var $_subSectionsTime = array();
+
+	/**
+	 * Notes for each section how often it calls which section
+	 *
+	 * @var    array
+	 * @access private
+	 */
+	var $_calls = array();
+
+	/**
+	 * Notes for each section how often it was called by which section
+	 *
+	 * @var    array
+	 * @access private
+	 */
+	var $_callers = array();
+
+	/**
+	 * Auto-starts and stops profiler
+	 *
+	 * @var    boolean
+	 * @access private
+	 */
+	var $_auto = FALSE;
+
+	/**
+	 * Max marker name length for non-html output
+	 *
+	 * @var    integer
+	 * @access private
+	 */
+	var $_maxStringLength = 0;
+
+	/**
+	 * Constructor, starts profiling recording
+	 *
+	 * @access public
+	 */
+	function Benchmark_Profiler($auto = FALSE) {
+		$this->_auto = $auto;
+
+		if ($this->_auto) {
+			$this->start();
+		}
+
+		$this->PEAR();
+	}
+
+	/**
+	 * Destructor, stops profiling recording
+	 *
+	 * @access private
+	 */
+	function _Benchmark_Profiler() {
+		if (isset($this->_auto) && $this->_auto) {
+			$this->stop();
+			$this->display();
+		}
+	}
+
+	/**
+	 * Returns profiling informations for a given section.
+	 *
+	 * @param  string $section
+	 * @return array
+	 * @access public
+	 */
+	function getSectionInformations($section = 'Global') {
+		if (isset($this->_sections[$section])) {
+			$calls = array();
+
+			if (isset($this->_calls[$section])) {
+				$calls = $this->_calls[$section];
+			}
+
+			$callers = array();
+
+			if (isset($this->_callers[$section])) {
+				$callers = $this->_callers[$section];
+			}
+
+			$informations = array();
+
+			$informations['time']       = $this->_sections[$section];
+			if (isset($this->_sections['Global'])) {
+				$informations['percentage'] = number_format(100 * $this->_sections[$section] / $this->_sections['Global'], 2, '.', '');
+			} else {
+				$informations['percentage'] = 'N/A';
+			}
+			$informations['calls']      = $calls;
+			$informations['num_calls']  = $this->_numberOfCalls[$section];
+			$informations['callers']    = $callers;
+
+	  		if (isset($this->_subSectionsTime[$section])) {
+				$informations['netto_time'] = $this->_sections[$section] - $this->_subSectionsTime[$section];
+	  		} else {
+				$informations['netto_time'] = $this->_sections[$section];
+	  		}
+
+			return $informations;
+		} else {
+			$this->raiseError("The section '$section' does not exists.\n", NULL, PEAR_ERROR_TRIGGER, E_USER_WARNING);
+		}
+	}
+
+	/**
+	 * Returns profiling informations for all sections.
+	 *
+	 * @return array
+	 * @access public
+	 */
+	function getAllSectionsInformations() {
+		$informations = array();
+
+		foreach($this->_sections as $section => $time) {
+			$informations[$section] = $this->getSectionInformations($section);
+		}
+
+		return $informations;
+	}
+
+	/**
+	 * Returns formatted profiling information.
+	 *
+	 * @param  string output format (auto, plain or html), default auto
+	 * @see    display()
+	 * @access private
+	 */
+	function _getOutput($format) {
         
-        /* Quickly find out the maximun length: Ineffecient, but will do for now! */
-        $informations = $this->getAllSectionsInformations();
-        $names = array_keys($informations);
+		/* Quickly find out the maximun length: Ineffecient, but will do for now! */
+		$informations = $this->getAllSectionsInformations();
+		$names = array_keys($informations);
         
-        $maxLength = 0;
-        foreach ($names as $name)
-        {
-            if ($maxLength < strlen($name)) {
-                $maxLength = strlen($name);
-            }
-        }
-        $this->_maxStringLength = $maxLength;
-
-        if ($format == 'auto') {
-            if (function_exists('version_compare') &&
-                version_compare(phpversion(), '4.1', 'ge')) {
-                $format = isset($_SERVER['SERVER_PROTOCOL']) ? 'html' : 'plain';
-            } else {
-                global $HTTP_SERVER_VARS;
-                $format = isset($HTTP_SERVER_VARS['SERVER_PROTOCOL']) ? 'html' : 'plain';
-            }
-        }
-
-        if ($format == 'html') {
-            $out = '<table style="border: 1px solid #000000; ">'."\n";
-            $out .=
-                '<tr><td>&nbsp;</td><td align="center"><b>total ex. time</b></td>'.
-                '<td align="center"><b>netto ex. time</b></td>'.
-                '<td align="center"><b>#calls</b></td><td align="center"><b>%</b></td>'.
-                '<td align="center"><b>calls</b></td><td align="center"><b>callers</b></td></tr>'.
-                "\n";
-        } else {
-            $dashes = $out = str_pad("\n", ($this->_maxStringLength + 75), '-', STR_PAD_LEFT);
-            $out .= str_pad('Section', $this->_maxStringLength + 10);
-            $out .= str_pad("Total Ex Time", 22);
-            $out .= str_pad("Netto Ex Time", 22);
-            $out .= str_pad("#Calls", 10);
-            $out .= "Percentage\n";
-            $out .= $dashes;
-        }
+		$maxLength = 0;
+		foreach ($names as $name)
+		{
+			if ($maxLength < strlen($name)) {
+				$maxLength = strlen($name);
+			}
+		}
+		$this->_maxStringLength = $maxLength;
+
+		if ($format == 'auto') {
+			if (function_exists('version_compare') &&
+				version_compare(phpversion(), '4.1', 'ge')) {
+				$format = isset($_SERVER['SERVER_PROTOCOL']) ? 'html' : 'plain';
+			} else {
+				global $HTTP_SERVER_VARS;
+				$format = isset($HTTP_SERVER_VARS['SERVER_PROTOCOL']) ? 'html' : 'plain';
+			}
+		}
+
+		if ($format == 'html') {
+			$out = '<table style="border: 1px solid #000000; ">'."\n";
+			$out .=
+				'<tr><td>&nbsp;</td><td align="center"><b>total ex. time</b></td>'.
+				'<td align="center"><b>netto ex. time</b></td>'.
+				'<td align="center"><b>#calls</b></td><td align="center"><b>%</b></td>'.
+				'<td align="center"><b>calls</b></td><td align="center"><b>callers</b></td></tr>'.
+				"\n";
+		} else {
+			$dashes = $out = str_pad("\n", ($this->_maxStringLength + 75), '-', STR_PAD_LEFT);
+			$out .= str_pad('Section', $this->_maxStringLength + 10);
+			$out .= str_pad("Total Ex Time", 22);
+			$out .= str_pad("Netto Ex Time", 22);
+			$out .= str_pad("#Calls", 10);
+			$out .= "Percentage\n";
+			$out .= $dashes;
+		}
            
-        foreach($informations as $name => $values) {
-            $percentage = $values['percentage'];
-            $calls_str = "";
-
-            foreach($values['calls'] as $key => $val) {
-                if ($calls_str) {
-                    $calls_str .= ", ";
-                }
-
-                $calls_str .= "$key ($val)";
-            }
-
-            $callers_str = "";
-
-            foreach($values['callers'] as $key => $val) {
-                if ($callers_str) {
-                    $callers_str .= ", ";
-    		        }
-
-                $callers_str .= "$key ($val)";
-            }
-
-            if ($format == 'html') {
-                $out .= "<tr><td><b>$name</b></td><td>{$values['time']}</td><td>{$values['netto_time']}</td><td>{$values['num_calls']}</td>";
-                if (is_numeric($values['percentage'])) {
-                    $out .= "<td align=\"right\">{$values['percentage']}%</td>\n";
-                } else {
-                    $out .= "<td align=\"right\">{$values['percentage']}</td>\n";
-                }
-                $out .= "<td>$calls_str</td><td>$callers_str</td></tr>";
-            } else {
-                $out .= str_pad($name, $this->_maxStringLength + 10);
-                $out .= str_pad($values['time'], 22);
-                $out .= str_pad($values['netto_time'], 22);
-                $out .= str_pad($values['num_calls'], 10);
-                if (is_numeric($values['percentage'])) {
-                    $out .= str_pad($values['percentage']."%\n", 8, ' ', STR_PAD_LEFT);
-                } else {
-                    $out .= str_pad($values['percentage']."\n", 8, ' ', STR_PAD_LEFT);
-                }
-            }
-        }
+		foreach($informations as $name => $values) {
+			$percentage = $values['percentage'];
+			$calls_str = "";
+
+			foreach($values['calls'] as $key => $val) {
+				if ($calls_str) {
+					$calls_str .= ", ";
+				}
+
+				$calls_str .= "$key ($val)";
+			}
+
+			$callers_str = "";
+
+			foreach($values['callers'] as $key => $val) {
+				if ($callers_str) {
+					$callers_str .= ", ";
+					}
+
+				$callers_str .= "$key ($val)";
+			}
+
+			if ($format == 'html') {
+				$out .= "<tr><td><b>$name</b></td><td>{$values['time']}</td><td>{$values['netto_time']}</td><td>{$values['num_calls']}</td>";
+				if (is_numeric($values['percentage'])) {
+					$out .= "<td align=\"right\">{$values['percentage']}%</td>\n";
+				} else {
+					$out .= "<td align=\"right\">{$values['percentage']}</td>\n";
+				}
+				$out .= "<td>$calls_str</td><td>$callers_str</td></tr>";
+			} else {
+				$out .= str_pad($name, $this->_maxStringLength + 10);
+				$out .= str_pad($values['time'], 22);
+				$out .= str_pad($values['netto_time'], 22);
+				$out .= str_pad($values['num_calls'], 10);
+				if (is_numeric($values['percentage'])) {
+					$out .= str_pad($values['percentage']."%\n", 8, ' ', STR_PAD_LEFT);
+				} else {
+					$out .= str_pad($values['percentage']."\n", 8, ' ', STR_PAD_LEFT);
+				}
+			}
+		}
         
-        if ($format == 'html') {
-            return $out . '</table>';
-        } else {
-            return $out;
-        }
-    }
-
-    /**
-     * Returns formatted profiling information.
-     *
-     * @param  string output format (auto, plain or html), default auto
-     * @access public
-     */
-    function display($format = 'auto') {
-        echo $this->_getOutput($format);
-    }
-
-    /**
-     * Enters "Global" section.
-     *
-     * @see    enterSection(), stop()
-     * @access public
-     */
-    function start() {
-        $this->enterSection('Global');
-    }
-
-    /**
-     * Leaves "Global" section.
-     *
-     * @see    leaveSection(), start()
-     * @access public
-     */
-    function stop() {
-        $this->leaveSection('Global');
-    }
-
-    /**
-     * Enters code section.
-     *
-     * @param  string  name of the code section
-     * @see    start(), leaveSection()
-     * @access public
-     */
-    function enterSection($name) {
-        if (count($this->_stack)) {
-            if (isset($this->_callers[$name][$this->_stack[count($this->_stack) - 1]["name"]])) {
-                $this->_callers[$name][$this->_stack[count($this->_stack) - 1]["name"]]++;
-            } else {
-                $this->_callers[$name][$this->_stack[count($this->_stack) - 1]["name"]] = 1;
-            }
-
-            if (isset($this->_calls[$this->_stack[count($this->_stack) - 1]["name"]][$name])) {
-                $this->_calls[$this->_stack[count($this->_stack) - 1]["name"]][$name]++;
-            } else {
-                $this->_calls[$this->_stack[count($this->_stack) - 1]["name"]][$name] = 1;
-            }
-        } else {
-            if ($name != 'Global') {
-                $this->raiseError("tried to enter section ".$name." but profiling was not started\n", NULL, PEAR_ERROR_DIE);
-            }
-        }
-
-        if (isset($this->_numberOfCalls[$name])) {
-            $this->_numberOfCalls[$name]++;
-        } else {
-            $this->_numberOfCalls[$name] = 1;
-        }
-
-        array_push($this->_stack, array("name" => $name, "time" => $this->_getMicrotime()));
-    }
-
-    /**
-     * Leaves code section.
-     *
-     * @param  string  name of the marker to be set
-     * @see     stop(), enterSection()
-     * @access public
-     */
-    function leaveSection($name) {
-        $microtime = $this->_getMicrotime();
-
-        if (!count($this->_stack)) {
-            $this->raiseError("tried to leave section ".$name." but profiling was not started\n", NULL, PEAR_ERROR_DIE);
-        }
-
-        $x = array_pop($this->_stack);
-
-        if ($x["name"] != $name) {
-            $this->raiseError("reached end of section $name but expecting end of " . $x["name"]."\n", NULL, PEAR_ERROR_DIE);
-        }
-
-        if (isset($this->_sections[$name])) {
-            $this->_sections[$name] += $microtime - $x["time"];
-        } else {
-            $this->_sections[$name] = $microtime - $x["time"];
-        }
-
-        $parent = array_pop($this->_stack);
-
-      	if (isset($parent)) {
-            if (isset($this->_subSectionsTime[$parent['name']])) {
-                $this->_subSectionsTime[$parent['name']] += $microtime - $x['time'];
-            } else {
-                $this->_subSectionsTime[$parent['name']] = $microtime - $x['time'];
-            }
-
-            array_push($this->_stack, $parent);
-        }
-    }
-
-    /**
-     * Wrapper for microtime().
-     *
-     * @return float
-     * @access private
-     * @since  1.3.0
-     */
-    function _getMicrotime() {
-        $microtime = explode(' ', microtime());
-        return $microtime[1] . substr($microtime[0], 1);
-    }
+		if ($format == 'html') {
+			return $out . '</table>';
+		} else {
+			return $out;
+		}
+	}
+
+	/**
+	 * Returns formatted profiling information.
+	 *
+	 * @param  string output format (auto, plain or html), default auto
+	 * @access public
+	 */
+	function display($format = 'auto') {
+		echo $this->_getOutput($format);
+	}
+
+	/**
+	 * Enters "Global" section.
+	 *
+	 * @see    enterSection(), stop()
+	 * @access public
+	 */
+	function start() {
+		$this->enterSection('Global');
+	}
+
+	/**
+	 * Leaves "Global" section.
+	 *
+	 * @see    leaveSection(), start()
+	 * @access public
+	 */
+	function stop() {
+		$this->leaveSection('Global');
+	}
+
+	/**
+	 * Enters code section.
+	 *
+	 * @param  string  name of the code section
+	 * @see    start(), leaveSection()
+	 * @access public
+	 */
+	function enterSection($name) {
+		if (count($this->_stack)) {
+			if (isset($this->_callers[$name][$this->_stack[count($this->_stack) - 1]["name"]])) {
+				$this->_callers[$name][$this->_stack[count($this->_stack) - 1]["name"]]++;
+			} else {
+				$this->_callers[$name][$this->_stack[count($this->_stack) - 1]["name"]] = 1;
+			}
+
+			if (isset($this->_calls[$this->_stack[count($this->_stack) - 1]["name"]][$name])) {
+				$this->_calls[$this->_stack[count($this->_stack) - 1]["name"]][$name]++;
+			} else {
+				$this->_calls[$this->_stack[count($this->_stack) - 1]["name"]][$name] = 1;
+			}
+		} else {
+			if ($name != 'Global') {
+				$this->raiseError("tried to enter section ".$name." but profiling was not started\n", NULL, PEAR_ERROR_DIE);
+			}
+		}
+
+		if (isset($this->_numberOfCalls[$name])) {
+			$this->_numberOfCalls[$name]++;
+		} else {
+			$this->_numberOfCalls[$name] = 1;
+		}
+
+		array_push($this->_stack, array("name" => $name, "time" => $this->_getMicrotime()));
+	}
+
+	/**
+	 * Leaves code section.
+	 *
+	 * @param  string  name of the marker to be set
+	 * @see     stop(), enterSection()
+	 * @access public
+	 */
+	function leaveSection($name) {
+		$microtime = $this->_getMicrotime();
+
+		if (!count($this->_stack)) {
+			$this->raiseError("tried to leave section ".$name." but profiling was not started\n", NULL, PEAR_ERROR_DIE);
+		}
+
+		$x = array_pop($this->_stack);
+
+		if ($x["name"] != $name) {
+			$this->raiseError("reached end of section $name but expecting end of " . $x["name"]."\n", NULL, PEAR_ERROR_DIE);
+		}
+
+		if (isset($this->_sections[$name])) {
+			$this->_sections[$name] += $microtime - $x["time"];
+		} else {
+			$this->_sections[$name] = $microtime - $x["time"];
+		}
+
+		$parent = array_pop($this->_stack);
+
+	  	if (isset($parent)) {
+			if (isset($this->_subSectionsTime[$parent['name']])) {
+				$this->_subSectionsTime[$parent['name']] += $microtime - $x['time'];
+			} else {
+				$this->_subSectionsTime[$parent['name']] = $microtime - $x['time'];
+			}
+
+			array_push($this->_stack, $parent);
+		}
+	}
+
+	/**
+	 * Wrapper for microtime().
+	 *
+	 * @return float
+	 * @access private
+	 * @since  1.3.0
+	 */
+	function _getMicrotime() {
+		$microtime = explode(' ', microtime());
+		return $microtime[1] . substr($microtime[0], 1);
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -191,7 +191,7 @@ 
 
             $informations = array();
 
-            $informations['time']       = $this->_sections[$section];
+            $informations['time'] = $this->_sections[$section];
             if (isset($this->_sections['Global'])) {
                 $informations['percentage'] = number_format(100 * $this->_sections[$section] / $this->_sections['Global'], 2, '.', '');
             } else {
@@ -222,7 +222,7 @@ 
     function getAllSectionsInformations() {
         $informations = array();
 
-        foreach($this->_sections as $section => $time) {
+        foreach ($this->_sections as $section => $time) {
             $informations[$section] = $this->getSectionInformations($section);
         }
 
@@ -262,12 +262,12 @@ 
         }
 
         if ($format == 'html') {
-            $out = '<table style="border: 1px solid #000000; ">'."\n";
+            $out = '<table style="border: 1px solid #000000; ">' . "\n";
             $out .=
-                '<tr><td>&nbsp;</td><td align="center"><b>total ex. time</b></td>'.
-                '<td align="center"><b>netto ex. time</b></td>'.
-                '<td align="center"><b>#calls</b></td><td align="center"><b>%</b></td>'.
-                '<td align="center"><b>calls</b></td><td align="center"><b>callers</b></td></tr>'.
+                '<tr><td>&nbsp;</td><td align="center"><b>total ex. time</b></td>' .
+                '<td align="center"><b>netto ex. time</b></td>' .
+                '<td align="center"><b>#calls</b></td><td align="center"><b>%</b></td>' .
+                '<td align="center"><b>calls</b></td><td align="center"><b>callers</b></td></tr>' .
                 "\n";
         } else {
             $dashes = $out = str_pad("\n", ($this->_maxStringLength + 75), '-', STR_PAD_LEFT);
@@ -279,11 +279,11 @@ 
             $out .= $dashes;
         }
            
-        foreach($informations as $name => $values) {
+        foreach ($informations as $name => $values) {
             $percentage = $values['percentage'];
             $calls_str = "";
 
-            foreach($values['calls'] as $key => $val) {
+            foreach ($values['calls'] as $key => $val) {
                 if ($calls_str) {
                     $calls_str .= ", ";
                 }
@@ -293,7 +293,7 @@ 
 
             $callers_str = "";
 
-            foreach($values['callers'] as $key => $val) {
+            foreach ($values['callers'] as $key => $val) {
                 if ($callers_str) {
                     $callers_str .= ", ";
     		        }
@@ -315,9 +315,9 @@ 
                 $out .= str_pad($values['netto_time'], 22);
                 $out .= str_pad($values['num_calls'], 10);
                 if (is_numeric($values['percentage'])) {
-                    $out .= str_pad($values['percentage']."%\n", 8, ' ', STR_PAD_LEFT);
+                    $out .= str_pad($values['percentage'] . "%\n", 8, ' ', STR_PAD_LEFT);
                 } else {
-                    $out .= str_pad($values['percentage']."\n", 8, ' ', STR_PAD_LEFT);
+                    $out .= str_pad($values['percentage'] . "\n", 8, ' ', STR_PAD_LEFT);
                 }
             }
         }
@@ -381,7 +381,7 @@ 
             }
         } else {
             if ($name != 'Global') {
-                $this->raiseError("tried to enter section ".$name." but profiling was not started\n", NULL, PEAR_ERROR_DIE);
+                $this->raiseError("tried to enter section " . $name . " but profiling was not started\n", NULL, PEAR_ERROR_DIE);
             }
         }
 
@@ -405,13 +405,13 @@ 
         $microtime = $this->_getMicrotime();
 
         if (!count($this->_stack)) {
-            $this->raiseError("tried to leave section ".$name." but profiling was not started\n", NULL, PEAR_ERROR_DIE);
+            $this->raiseError("tried to leave section " . $name . " but profiling was not started\n", NULL, PEAR_ERROR_DIE);
         }
 
         $x = array_pop($this->_stack);
 
         if ($x["name"] != $name) {
-            $this->raiseError("reached end of section $name but expecting end of " . $x["name"]."\n", NULL, PEAR_ERROR_DIE);
+            $this->raiseError("reached end of section $name but expecting end of " . $x["name"] . "\n", NULL, PEAR_ERROR_DIE);
         }
 
         if (isset($this->_sections[$name])) {

buildscripts/Benchmark/Timer.php

Doc Comments +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
     /**
      * Wrapper for microtime().
      *
-     * @return float
+     * @return string
      * @access private
      * @since  1.3.0
      */

Indentation +230 added lines, -230 removed lines

@@ -58,262 +58,262 @@
  * @package   Benchmark
  */
 class Benchmark_Timer extends PEAR {
-    /**
-     * Contains the markers.
-     *
-     * @var    array
-     * @access private
-     */
-    var $markers = array();
+	/**
+	 * Contains the markers.
+	 *
+	 * @var    array
+	 * @access private
+	 */
+	var $markers = array();
 
-    /**
-     * Auto-start and stop timer.
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $auto = FALSE;
+	/**
+	 * Auto-start and stop timer.
+	 *
+	 * @var    boolean
+	 * @access private
+	 */
+	var $auto = FALSE;
 
-    /**
-     * Max marker name length for non-html output.
-     *
-     * @var    integer
-     * @access private
-     */
-    var $maxStringLength = 0;
+	/**
+	 * Max marker name length for non-html output.
+	 *
+	 * @var    integer
+	 * @access private
+	 */
+	var $maxStringLength = 0;
 
-    /**
-     * Constructor.
-     *
-     * @param  boolean $auto
-     * @access public
-     */
-    function Benchmark_Timer($auto = FALSE) {
-        $this->auto = $auto;
+	/**
+	 * Constructor.
+	 *
+	 * @param  boolean $auto
+	 * @access public
+	 */
+	function Benchmark_Timer($auto = FALSE) {
+		$this->auto = $auto;
 
-        if ($this->auto) {
-            $this->start();
-        }
+		if ($this->auto) {
+			$this->start();
+		}
 
-        $this->PEAR();
-    }
+		$this->PEAR();
+	}
 
-    /**
-     * Destructor.
-     *
-     * @access private
-     */
-    function _Benchmark_Timer() {
-        if ($this->auto) {
-            $this->stop();
-            $this->display();
-        }
-    }
+	/**
+	 * Destructor.
+	 *
+	 * @access private
+	 */
+	function _Benchmark_Timer() {
+		if ($this->auto) {
+			$this->stop();
+			$this->display();
+		}
+	}
 
-    /**
-     * Set "Start" marker.
-     *
-     * @see    setMarker(), stop()
-     * @access public
-     */
-    function start() {
-        $this->setMarker('Start');
-    }
+	/**
+	 * Set "Start" marker.
+	 *
+	 * @see    setMarker(), stop()
+	 * @access public
+	 */
+	function start() {
+		$this->setMarker('Start');
+	}
 
-    /**
-     * Set "Stop" marker.
-     *
-     * @see    setMarker(), start()
-     * @access public
-     */
-    function stop() {
-        $this->setMarker('Stop');
-    }
+	/**
+	 * Set "Stop" marker.
+	 *
+	 * @see    setMarker(), start()
+	 * @access public
+	 */
+	function stop() {
+		$this->setMarker('Stop');
+	}
 
-    /**
-     * Set marker.
-     *
-     * @param  string  $name Name of the marker to be set.
-     * @see    start(), stop()
-     * @access public
-     */
-    function setMarker($name) {
-        $this->markers[$name] = $this->_getMicrotime();
-    }
+	/**
+	 * Set marker.
+	 *
+	 * @param  string  $name Name of the marker to be set.
+	 * @see    start(), stop()
+	 * @access public
+	 */
+	function setMarker($name) {
+		$this->markers[$name] = $this->_getMicrotime();
+	}
 
-    /**
-     * Returns the time elapsed betweens two markers.
-     *
-     * @param  string  $start        start marker, defaults to "Start"
-     * @param  string  $end          end marker, defaults to "Stop"
-     * @return double  $time_elapsed time elapsed between $start and $end
-     * @access public
-     */
-    function timeElapsed($start = 'Start', $end = 'Stop') {
-        if ($end == 'Stop' && !isset($this->markers['Stop'])) {
-            $this->markers['Stop'] = $this->_getMicrotime();
-        }
+	/**
+	 * Returns the time elapsed betweens two markers.
+	 *
+	 * @param  string  $start        start marker, defaults to "Start"
+	 * @param  string  $end          end marker, defaults to "Stop"
+	 * @return double  $time_elapsed time elapsed between $start and $end
+	 * @access public
+	 */
+	function timeElapsed($start = 'Start', $end = 'Stop') {
+		if ($end == 'Stop' && !isset($this->markers['Stop'])) {
+			$this->markers['Stop'] = $this->_getMicrotime();
+		}
 
-        if (extension_loaded('bcmath')) {
-            return bcsub($this->markers[$end], $this->markers[$start], 6);
-        } else {
-            return $this->markers[$end] - $this->markers[$start];
-        }
-    }
+		if (extension_loaded('bcmath')) {
+			return bcsub($this->markers[$end], $this->markers[$start], 6);
+		} else {
+			return $this->markers[$end] - $this->markers[$start];
+		}
+	}
 
-    /**
-     * Returns profiling information.
-     *
-     * $profiling[x]['name']  = name of marker x
-     * $profiling[x]['time']  = time index of marker x
-     * $profiling[x]['diff']  = execution time from marker x-1 to this marker x
-     * $profiling[x]['total'] = total execution time up to marker x
-     *
-     * @return array
-     * @access public
-     */
-    function getProfiling() {
-        $i = $total = 0;
-        $result = array();
-        $temp = reset($this->markers);
-        $this->maxStringLength = 0;
+	/**
+	 * Returns profiling information.
+	 *
+	 * $profiling[x]['name']  = name of marker x
+	 * $profiling[x]['time']  = time index of marker x
+	 * $profiling[x]['diff']  = execution time from marker x-1 to this marker x
+	 * $profiling[x]['total'] = total execution time up to marker x
+	 *
+	 * @return array
+	 * @access public
+	 */
+	function getProfiling() {
+		$i = $total = 0;
+		$result = array();
+		$temp = reset($this->markers);
+		$this->maxStringLength = 0;
 
-        foreach ($this->markers as $marker => $time) {
-            if (extension_loaded('bcmath')) {
-                $diff  = bcsub($time, $temp, 6);
-                $total = bcadd($total, $diff, 6);
-            } else {
-                $diff  = $time - $temp;
-                $total = $total + $diff;
-            }
+		foreach ($this->markers as $marker => $time) {
+			if (extension_loaded('bcmath')) {
+				$diff  = bcsub($time, $temp, 6);
+				$total = bcadd($total, $diff, 6);
+			} else {
+				$diff  = $time - $temp;
+				$total = $total + $diff;
+			}
 
-            $result[$i]['name']  = $marker;
-            $result[$i]['time']  = $time;
-            $result[$i]['diff']  = $diff;
-            $result[$i]['total'] = $total;
+			$result[$i]['name']  = $marker;
+			$result[$i]['time']  = $time;
+			$result[$i]['diff']  = $diff;
+			$result[$i]['total'] = $total;
 
-            $this->maxStringLength = (strlen($marker) > $this->maxStringLength ? strlen($marker) + 1 : $this->maxStringLength);
+			$this->maxStringLength = (strlen($marker) > $this->maxStringLength ? strlen($marker) + 1 : $this->maxStringLength);
 
-            $temp = $time;
-            $i++;
-        }
+			$temp = $time;
+			$i++;
+		}
 
-        $result[0]['diff'] = '-';
-        $result[0]['total'] = '-';
-        $this->maxStringLength = (strlen('total') > $this->maxStringLength ? strlen('total') : $this->maxStringLength);
-        $this->maxStringLength += 2;
+		$result[0]['diff'] = '-';
+		$result[0]['total'] = '-';
+		$this->maxStringLength = (strlen('total') > $this->maxStringLength ? strlen('total') : $this->maxStringLength);
+		$this->maxStringLength += 2;
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Return formatted profiling information.
-     *
-     * @param  boolean  $showTotal   Optionnaly includes total in output, default no
-     * @param  string  $format   output format (auto, plain or html), default auto
-     * @return string
-     * @see    getProfiling()
-     * @access public
-     */
-    function getOutput($showTotal = FALSE, $format = 'auto') {
-        if ($format == 'auto') {
-            if (function_exists('version_compare') &&
-                version_compare(phpversion(), '4.1', 'ge'))
-            {
-                $format = isset($_SERVER['SERVER_PROTOCOL']) ? 'html' : 'plain';
-            } else {
-                global $HTTP_SERVER_VARS;
-                $format = isset($HTTP_SERVER_VARS['SERVER_PROTOCOL']) ? 'html' : 'plain';
-	    }
-        }
+	/**
+	 * Return formatted profiling information.
+	 *
+	 * @param  boolean  $showTotal   Optionnaly includes total in output, default no
+	 * @param  string  $format   output format (auto, plain or html), default auto
+	 * @return string
+	 * @see    getProfiling()
+	 * @access public
+	 */
+	function getOutput($showTotal = FALSE, $format = 'auto') {
+		if ($format == 'auto') {
+			if (function_exists('version_compare') &&
+				version_compare(phpversion(), '4.1', 'ge'))
+			{
+				$format = isset($_SERVER['SERVER_PROTOCOL']) ? 'html' : 'plain';
+			} else {
+				global $HTTP_SERVER_VARS;
+				$format = isset($HTTP_SERVER_VARS['SERVER_PROTOCOL']) ? 'html' : 'plain';
+		}
+		}
 
-        $total  = $this->TimeElapsed();
-        $result = $this->getProfiling();
-        $dashes = '';
+		$total  = $this->TimeElapsed();
+		$result = $this->getProfiling();
+		$dashes = '';
 
-        if ($format == 'html') {
-            $out = '<table border="1">'."\n";
-            $out .= '<tr><td>&nbsp;</td><td align="center"><b>time index</b></td><td align="center"><b>ex time</b></td><td align="center"><b>%</b></td>'.
-            ($showTotal ?
-              '<td align="center"><b>elapsed</b></td><td align="center"><b>%</b></td>'
-               : '')."</tr>\n";
-        } else {
-            $dashes = $out = str_pad("\n",
-                $this->maxStringLength + ($showTotal ? 70 : 45), '-', STR_PAD_LEFT);
-            $out .= str_pad('marker', $this->maxStringLength) .
-                    str_pad("time index", 22) .
-                    str_pad("ex time", 16) .
-                    str_pad("perct ", 8) .
-                    ($showTotal ? ' '.str_pad("elapsed", 16)."perct" : '')."\n" .
-                    $dashes;
-        }
+		if ($format == 'html') {
+			$out = '<table border="1">'."\n";
+			$out .= '<tr><td>&nbsp;</td><td align="center"><b>time index</b></td><td align="center"><b>ex time</b></td><td align="center"><b>%</b></td>'.
+			($showTotal ?
+			  '<td align="center"><b>elapsed</b></td><td align="center"><b>%</b></td>'
+			   : '')."</tr>\n";
+		} else {
+			$dashes = $out = str_pad("\n",
+				$this->maxStringLength + ($showTotal ? 70 : 45), '-', STR_PAD_LEFT);
+			$out .= str_pad('marker', $this->maxStringLength) .
+					str_pad("time index", 22) .
+					str_pad("ex time", 16) .
+					str_pad("perct ", 8) .
+					($showTotal ? ' '.str_pad("elapsed", 16)."perct" : '')."\n" .
+					$dashes;
+		}
 
-        foreach ($result as $k => $v) {
-            $perc = (($v['diff'] * 100) / $total);
-            $tperc = (($v['total'] * 100) / $total);
+		foreach ($result as $k => $v) {
+			$perc = (($v['diff'] * 100) / $total);
+			$tperc = (($v['total'] * 100) / $total);
 
-            if ($format == 'html') {
-                $out .= "<tr><td><b>" . $v['name'] .
-                       "</b></td><td>" . $v['time'] .
-                       "</td><td>" . $v['diff'] .
-                       "</td><td align=\"right\">" . number_format($perc, 2, '.', '') .
-                       "%</td>".
-                       ($showTotal ?
-                            "<td>" . $v['total'] .
-                            "</td><td align=\"right\">" .
-                            number_format($tperc, 2, '.', '') .
-                            "%</td>" : '').
-                       "</tr>\n";
-            } else {
-                $out .= str_pad($v['name'], $this->maxStringLength, ' ') .
-                        str_pad($v['time'], 22) .
-                        str_pad($v['diff'], 14) .
-                        str_pad(number_format($perc, 2, '.', '')."%",8, ' ', STR_PAD_LEFT) .
-                        ($showTotal ? '   '.
-                            str_pad($v['total'], 14) .
-                            str_pad(number_format($tperc, 2, '.', '')."%",
-                                             8, ' ', STR_PAD_LEFT) : '').
-                        "\n";
-            }
+			if ($format == 'html') {
+				$out .= "<tr><td><b>" . $v['name'] .
+					   "</b></td><td>" . $v['time'] .
+					   "</td><td>" . $v['diff'] .
+					   "</td><td align=\"right\">" . number_format($perc, 2, '.', '') .
+					   "%</td>".
+					   ($showTotal ?
+							"<td>" . $v['total'] .
+							"</td><td align=\"right\">" .
+							number_format($tperc, 2, '.', '') .
+							"%</td>" : '').
+					   "</tr>\n";
+			} else {
+				$out .= str_pad($v['name'], $this->maxStringLength, ' ') .
+						str_pad($v['time'], 22) .
+						str_pad($v['diff'], 14) .
+						str_pad(number_format($perc, 2, '.', '')."%",8, ' ', STR_PAD_LEFT) .
+						($showTotal ? '   '.
+							str_pad($v['total'], 14) .
+							str_pad(number_format($tperc, 2, '.', '')."%",
+											 8, ' ', STR_PAD_LEFT) : '').
+						"\n";
+			}
 
-            $out .= $dashes;
-        }
+			$out .= $dashes;
+		}
 
-        if ($format == 'html') {
-            $out .= "<tr style='background: silver;'><td><b>total</b></td><td>-</td><td>${total}</td><td>100.00%</td>".($showTotal ? "<td>-</td><td>-</td>" : "")."</tr>\n";
-            $out .= "</table>\n";
-        } else {
-            $out .= str_pad('total', $this->maxStringLength);
-            $out .= str_pad('-', 22);
-            $out .= str_pad($total, 15);
-            $out .= "100.00%\n";
-            $out .= $dashes;
-        }
+		if ($format == 'html') {
+			$out .= "<tr style='background: silver;'><td><b>total</b></td><td>-</td><td>${total}</td><td>100.00%</td>".($showTotal ? "<td>-</td><td>-</td>" : "")."</tr>\n";
+			$out .= "</table>\n";
+		} else {
+			$out .= str_pad('total', $this->maxStringLength);
+			$out .= str_pad('-', 22);
+			$out .= str_pad($total, 15);
+			$out .= "100.00%\n";
+			$out .= $dashes;
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
-    /**
-     * Prints the information returned by getOutput().
-     *
-     * @param  boolean  $showTotal   Optionnaly includes total in output, default no
-     * @param  string  $format   output format (auto, plain or html), default auto
-     * @see    getOutput()
-     * @access public
-     */
-    function display($showTotal = FALSE, $format = 'auto') {
-        print $this->getOutput($showTotal, $format);
-    }
+	/**
+	 * Prints the information returned by getOutput().
+	 *
+	 * @param  boolean  $showTotal   Optionnaly includes total in output, default no
+	 * @param  string  $format   output format (auto, plain or html), default auto
+	 * @see    getOutput()
+	 * @access public
+	 */
+	function display($showTotal = FALSE, $format = 'auto') {
+		print $this->getOutput($showTotal, $format);
+	}
 
-    /**
-     * Wrapper for microtime().
-     *
-     * @return float
-     * @access private
-     * @since  1.3.0
-     */
-    function _getMicrotime() {
-        $microtime = explode(' ', microtime());
-        return $microtime[1] . substr($microtime[0], 1);
-    }
+	/**
+	 * Wrapper for microtime().
+	 *
+	 * @return float
+	 * @access private
+	 * @since  1.3.0
+	 */
+	function _getMicrotime() {
+		$microtime = explode(' ', microtime());
+		return $microtime[1] . substr($microtime[0], 1);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -232,11 +232,11 @@ 
         $dashes = '';
 
         if ($format == 'html') {
-            $out = '<table border="1">'."\n";
-            $out .= '<tr><td>&nbsp;</td><td align="center"><b>time index</b></td><td align="center"><b>ex time</b></td><td align="center"><b>%</b></td>'.
+            $out = '<table border="1">' . "\n";
+            $out .= '<tr><td>&nbsp;</td><td align="center"><b>time index</b></td><td align="center"><b>ex time</b></td><td align="center"><b>%</b></td>' .
             ($showTotal ?
               '<td align="center"><b>elapsed</b></td><td align="center"><b>%</b></td>'
-               : '')."</tr>\n";
+               : '') . "</tr>\n";
         } else {
             $dashes = $out = str_pad("\n",
                 $this->maxStringLength + ($showTotal ? 70 : 45), '-', STR_PAD_LEFT);
@@ -244,7 +244,7 @@ 
                     str_pad("time index", 22) .
                     str_pad("ex time", 16) .
                     str_pad("perct ", 8) .
-                    ($showTotal ? ' '.str_pad("elapsed", 16)."perct" : '')."\n" .
+                    ($showTotal ? ' ' . str_pad("elapsed", 16) . "perct" : '') . "\n" .
                     $dashes;
         }
 
@@ -257,22 +257,22 @@ 
                        "</b></td><td>" . $v['time'] .
                        "</td><td>" . $v['diff'] .
                        "</td><td align=\"right\">" . number_format($perc, 2, '.', '') .
-                       "%</td>".
+                       "%</td>" .
                        ($showTotal ?
                             "<td>" . $v['total'] .
                             "</td><td align=\"right\">" .
                             number_format($tperc, 2, '.', '') .
-                            "%</td>" : '').
+                            "%</td>" : '') .
                        "</tr>\n";
             } else {
                 $out .= str_pad($v['name'], $this->maxStringLength, ' ') .
                         str_pad($v['time'], 22) .
                         str_pad($v['diff'], 14) .
-                        str_pad(number_format($perc, 2, '.', '')."%",8, ' ', STR_PAD_LEFT) .
-                        ($showTotal ? '   '.
+                        str_pad(number_format($perc, 2, '.', '') . "%", 8, ' ', STR_PAD_LEFT) .
+                        ($showTotal ? '   ' .
                             str_pad($v['total'], 14) .
-                            str_pad(number_format($tperc, 2, '.', '')."%",
-                                             8, ' ', STR_PAD_LEFT) : '').
+                            str_pad(number_format($tperc, 2, '.', '') . "%",
+                                             8, ' ', STR_PAD_LEFT) : '') .
                         "\n";
             }
 
@@ -280,7 +280,7 @@ 
         }
 
         if ($format == 'html') {
-            $out .= "<tr style='background: silver;'><td><b>total</b></td><td>-</td><td>${total}</td><td>100.00%</td>".($showTotal ? "<td>-</td><td>-</td>" : "")."</tr>\n";
+            $out .= "<tr style='background: silver;'><td><b>total</b></td><td>-</td><td>${total}</td><td>100.00%</td>" . ($showTotal ? "<td>-</td><td>-</td>" : "") . "</tr>\n";
             $out .= "</table>\n";
         } else {
             $out .= str_pad('total', $this->maxStringLength);

buildscripts/classtree/build.php

Doc Comments +12 added lines

@@ -67,6 +67,9 @@ 
 		$this->displayTreeInternal(array_keys($this->_baseClasses),0);
 	}
 
+	/**
+	 * @param integer $level
+	 */
 	public function displayTreeInternal($classNames,$level)
 	{
 		foreach($classNames as $className)
@@ -153,6 +156,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $path
+	 */
 	protected function isValidPath($path)
 	{
 		if(is_dir($path))
@@ -161,6 +167,9 @@ 
 			return basename($path)!==basename($path,'.php') && !isset($this->_exclusions[basename($path)]);
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function getSourceFiles($path)
 	{
 		$files=array();
@@ -227,6 +236,9 @@ 
 
 	}
 
+	/**
+	 * @param PradoVTMDocument $doc
+	 */
 	private	function processObjectType($objectType,$objectInfo,$prefix,$doc)
 	{
 		foreach($objectInfo['Properties'] as $name=>$property)

Spacing +111 added lines, -111 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-$basePath=dirname(__FILE__);
-$frameworkPath=realpath($basePath.'/../../framework');
-require_once($frameworkPath.'/prado.php');
-require_once($basePath.'/DWExtension.php');
+$basePath = dirname(__FILE__);
+$frameworkPath = realpath($basePath . '/../../framework');
+require_once($frameworkPath . '/prado.php');
+require_once($basePath . '/DWExtension.php');
 
 //the manager class sets up some dependency paths
 Prado::using('System.Data.SqlMap.TSqlMapManager');
 
-$exclusions=array(
+$exclusions = array(
 	'pradolite.php',
 	'prado-cli.php',
 	'JSMin.php',
@@ -17,93 +17,93 @@ 
 	'/Testing',
 	'/Web/UI/WebControls/assets',
 	);
-$a=new ClassTreeBuilder($frameworkPath,$exclusions);
+$a = new ClassTreeBuilder($frameworkPath, $exclusions);
 $a->buildTree();
-$a->saveToFile($basePath.'/classes.data');
+$a->saveToFile($basePath . '/classes.data');
 $a->saveAsDWExtension($basePath);
 
 class ClassTreeBuilder
 {
-	const REGEX_RULES='/^\s*(abstract\s+)?class\s+(\w+)(\s+extends\s+(\w+)\s*|\s*)/msS';
+	const REGEX_RULES = '/^\s*(abstract\s+)?class\s+(\w+)(\s+extends\s+(\w+)\s*|\s*)/msS';
 	private $_frameworkPath;
 	private $_exclusions;
-	private $_classes=array();
+	private $_classes = array();
 
-	public function __construct($frameworkPath,$exclusions)
+	public function __construct($frameworkPath, $exclusions)
 	{
-		$this->_frameworkPath=realpath($frameworkPath);
-		$this->_exclusions=array();
-		foreach($exclusions as $exclusion)
+		$this->_frameworkPath = realpath($frameworkPath);
+		$this->_exclusions = array();
+		foreach ($exclusions as $exclusion)
 		{
-			if($exclusion[0]==='/')
-				$this->_exclusions[realpath($frameworkPath.'/'.$exclusion)]=true;
+			if ($exclusion[0] === '/')
+				$this->_exclusions[realpath($frameworkPath . '/' . $exclusion)] = true;
 			else
-				$this->_exclusions[$exclusion]=true;
+				$this->_exclusions[$exclusion] = true;
 		}
 	}
 
 	public function buildTree()
 	{
-		$sourceFiles=$this->getSourceFiles($this->_frameworkPath);
-		foreach($sourceFiles as $sourceFile)
+		$sourceFiles = $this->getSourceFiles($this->_frameworkPath);
+		foreach ($sourceFiles as $sourceFile)
 			$this->parseFile($sourceFile);
 		ksort($this->_classes);
-		foreach(array_keys($this->_classes) as $className)
+		foreach (array_keys($this->_classes) as $className)
 		{
-			$parentClass=$this->_classes[$className]['ParentClass'];
-			if(isset($this->_classes[$parentClass]))
-				$this->_classes[$parentClass]['ChildClasses'][]=$className;
+			$parentClass = $this->_classes[$className]['ParentClass'];
+			if (isset($this->_classes[$parentClass]))
+				$this->_classes[$parentClass]['ChildClasses'][] = $className;
 		}
-		echo "\nClass tree built successfully. Total ".count($this->_classes)." classes found.\n";
+		echo "\nClass tree built successfully. Total " . count($this->_classes) . " classes found.\n";
 	}
 
 	public function saveToFile($fileName)
 	{
-		file_put_contents($fileName,serialize($this->_classes));
+		file_put_contents($fileName, serialize($this->_classes));
 	}
 
 	public function displayTree()
 	{
-		$this->displayTreeInternal(array_keys($this->_baseClasses),0);
+		$this->displayTreeInternal(array_keys($this->_baseClasses), 0);
 	}
 
-	public function displayTreeInternal($classNames,$level)
+	public function displayTreeInternal($classNames, $level)
 	{
-		foreach($classNames as $className)
+		foreach ($classNames as $className)
 		{
-			echo str_repeat(' ',$level*4);
-			echo $className.':'.$this->_classes[$className]->Package."\n";
-			$this->displayTreeInternal(array_keys($this->_classes[$className]->ChildClasses),$level+1);
+			echo str_repeat(' ', $level * 4);
+			echo $className . ':' . $this->_classes[$className]->Package . "\n";
+			$this->displayTreeInternal(array_keys($this->_classes[$className]->ChildClasses), $level + 1);
 		}
 	}
 
 	protected function parseFile($sourceFile)
 	{
 		include_once($sourceFile);
-		$classFile=strtr(substr($sourceFile,strlen($this->_frameworkPath)),'\\','/');
+		$classFile = strtr(substr($sourceFile, strlen($this->_frameworkPath)), '\\', '/');
 		echo "Parsing $classFile...\n";
-		$content=file_get_contents($sourceFile);
-		if(preg_match('/@package\s+([\w\.]+)\s*/msS',$content,$matches)>0)
-			$package=$matches[1];
+		$content = file_get_contents($sourceFile);
+		if (preg_match('/@package\s+([\w\.]+)\s*/msS', $content, $matches) > 0)
+			$package = $matches[1];
 		else
-			$package='';
-		$n=preg_match_all(self::REGEX_RULES,$content,$matches,PREG_SET_ORDER);
-		for($i=0;$i<$n;++$i)
+			$package = '';
+		$n = preg_match_all(self::REGEX_RULES, $content, $matches, PREG_SET_ORDER);
+		for ($i = 0; $i < $n; ++$i)
 		{
-			$className=$matches[$i][2];
-			if(isset($this->_classes[$className]))
-				throw new Exception("Class $className is defined in both $sourceFile and ".$this->_classes[$className]->ClassFile);
-			$c=new TComponentReflection($className);
-			$properties=$c->getProperties();
+			$className = $matches[$i][2];
+			if (isset($this->_classes[$className]))
+				throw new Exception("Class $className is defined in both $sourceFile and " . $this->_classes[$className]->ClassFile);
+			$c = new TComponentReflection($className);
+			$properties = $c->getProperties();
 			$this->parseMethodComments($properties);
-			$events=$c->getEvents();
+			$events = $c->getEvents();
 			$this->parseMethodComments($events);
-			$methods=$c->getMethods();
+			$methods = $c->getMethods();
 			$this->parseMethodComments($methods);
-			$this->_classes[$className]=array(
+			$this->_classes[$className] = array(
 				'ClassFile'=>$classFile,
 				'Package'=>$package,
-				'ParentClass'=>isset($matches[$i][4])?$matches[$i][4]:'',
+				'ParentClass'=>isset($matches[$i][4]) ? $matches[$i][4] : '',
 				'ChildClasses'=>array(),
 				'Properties'=>$properties,
 				'Events'=>$events,
@@ -113,69 +113,69 @@ 
 
 	protected function parseMethodComments(&$methods)
 	{
-		foreach(array_keys($methods) as $key)
+		foreach (array_keys($methods) as $key)
 		{
-			$method=&$methods[$key];
-			$comments=$method['comments'];
-			$s='';
-			foreach(explode("\n",$comments) as $line)
+			$method = &$methods[$key];
+			$comments = $method['comments'];
+			$s = '';
+			foreach (explode("\n", $comments) as $line)
 			{
-				$line=trim($line);
-				$line=trim($line,'/*');
-				$s.=' '.$line;
+				$line = trim($line);
+				$line = trim($line, '/*');
+				$s .= ' ' . $line;
 			}
-			$s=trim($s);
-			$s=preg_replace('/\{@link.*?([\w\(\)]+)\}/i','$1',$s);
-			$pos1=strpos($s,'@');
-			$pos2=strpos($s,'.');
-			if($pos1===false)
+			$s = trim($s);
+			$s = preg_replace('/\{@link.*?([\w\(\)]+)\}/i', '$1', $s);
+			$pos1 = strpos($s, '@');
+			$pos2 = strpos($s, '.');
+			if ($pos1 === false)
 			{
-				if($pos2!==false)
-					$method['comments']=substr($s,0,$pos2);
+				if ($pos2 !== false)
+					$method['comments'] = substr($s, 0, $pos2);
 				else
-					$method['comments']=$s;
+					$method['comments'] = $s;
 			}
-			else if($pos1>0)
+			else if ($pos1 > 0)
 			{
-				if($pos2 && $pos2<$pos1)	// use the first line as comment
-					$method['comments']=substr($s,0,$pos2);
+				if ($pos2 && $pos2 < $pos1)	// use the first line as comment
+					$method['comments'] = substr($s, 0, $pos2);
 				else
-					$method['comments']=substr($s,0,$pos1);
+					$method['comments'] = substr($s, 0, $pos1);
 			}
 			else
 			{
-				$matches=array();
-				if(preg_match('/@return\s+[\w\|]+\s+([^\.]*)/',$s,$matches)>0)
-					$method['comments']=$matches[1];
+				$matches = array();
+				if (preg_match('/@return\s+[\w\|]+\s+([^\.]*)/', $s, $matches) > 0)
+					$method['comments'] = $matches[1];
 				else
-					$method['comments']='';
+					$method['comments'] = '';
 			}
 		}
 	}
 
 	protected function isValidPath($path)
 	{
-		if(is_dir($path))
+		if (is_dir($path))
 			return !isset($this->_exclusions[basename($path)]) && !isset($this->_exclusions[$path]);
 		else
-			return basename($path)!==basename($path,'.php') && !isset($this->_exclusions[basename($path)]);
+			return basename($path) !== basename($path, '.php') && !isset($this->_exclusions[basename($path)]);
 	}
 
 	public function getSourceFiles($path)
 	{
-		$files=array();
-		$folder=opendir($path);
-		while($file=readdir($folder))
+		$files = array();
+		$folder = opendir($path);
+		while ($file = readdir($folder))
 		{
-			if($file==='.' || $file==='..')
+			if ($file === '.' || $file === '..')
 				continue;
-			$fullPath=realpath($path.'/'.$file);
-			if($this->isValidPath($fullPath))
+			$fullPath = realpath($path . '/' . $file);
+			if ($this->isValidPath($fullPath))
 			{
-				if(is_file($fullPath))
-					$files[]=$fullPath;
+				if (is_file($fullPath))
+					$files[] = $fullPath;
 				else
-					$files=array_merge($files,$this->getSourceFiles($fullPath));
+					$files = array_merge($files, $this->getSourceFiles($fullPath));
 			}
 		}
 		closedir($folder);
@@ -184,71 +184,71 @@ 
 
 	public function saveAsDWExtension($basePath)
 	{
-		$tagPath=$basePath.'/Configuration/TagLibraries/PRADO';
+		$tagPath = $basePath . '/Configuration/TagLibraries/PRADO';
 
 		// prepare the directory to save tag lib
-		@mkdir($basePath.'/Configuration');
-		@mkdir($basePath.'/Configuration/TagLibraries');
-		@mkdir($basePath.'/Configuration/TagLibraries/PRADO');
+		@mkdir($basePath . '/Configuration');
+		@mkdir($basePath . '/Configuration/TagLibraries');
+		@mkdir($basePath . '/Configuration/TagLibraries/PRADO');
 
 		$docMXI = new PradoMXIDocument(Prado::getVersion());
 		$tagChooser = new PradoTagChooser;
 
 		$controlClass = new ReflectionClass('TControl');
 
-		foreach($this->_classes as $className=>$classInfo)
+		foreach ($this->_classes as $className=>$classInfo)
 		{
 			$class = new ReflectionClass($className);
-			if($class->isInstantiable() && ($className==='TControl' || $class->isSubclassOf($controlClass)))
+			if ($class->isInstantiable() && ($className === 'TControl' || $class->isSubclassOf($controlClass)))
 			{
 				$docMXI->addTag($className);
 				$tagChooser->addElement($className);
 				$docVTM = new PradoVTMDocument($className);
-				foreach($classInfo['Properties'] as $name=>$property)
+				foreach ($classInfo['Properties'] as $name=>$property)
 				{
-					$type=$property['type'];
-					if(isset($this->_classes[$type]) && ($type==='TFont' || strrpos($type,'Style')===strlen($type)-5 && $type!=='TStyle'))
-						$this->processObjectType($type,$this->_classes[$type],$name,$docVTM);
-					if($property['readonly'] || $property['protected'])
+					$type = $property['type'];
+					if (isset($this->_classes[$type]) && ($type === 'TFont' || strrpos($type, 'Style') === strlen($type) - 5 && $type !== 'TStyle'))
+						$this->processObjectType($type, $this->_classes[$type], $name, $docVTM);
+					if ($property['readonly'] || $property['protected'])
 						continue;
-					if(($type=$this->checkType($className,$name,$property['type']))!=='')
-						$docVTM->addAttribute($name,$type);
+					if (($type = $this->checkType($className, $name, $property['type'])) !== '')
+						$docVTM->addAttribute($name, $type);
 				}
-				foreach($classInfo['Events'] as $name=>$event)
+				foreach ($classInfo['Events'] as $name=>$event)
 				{
 					$docVTM->addEvent($name);
 				}
-				file_put_contents($tagPath.'/'.$className.'.vtm',$docVTM->getXML());
+				file_put_contents($tagPath . '/' . $className . '.vtm', $docVTM->getXML());
 			}
 		}
 
-		file_put_contents($basePath.'/PRADO.mxi',$docMXI->getXML());
-		file_put_contents($tagPath.'/TagChooser.xml',$tagChooser->getXML());
+		file_put_contents($basePath . '/PRADO.mxi', $docMXI->getXML());
+		file_put_contents($tagPath . '/TagChooser.xml', $tagChooser->getXML());
 
 	}
 
-	private	function processObjectType($objectType,$objectInfo,$prefix,$doc)
+	private	function processObjectType($objectType, $objectInfo, $prefix, $doc)
 	{
-		foreach($objectInfo['Properties'] as $name=>$property)
+		foreach ($objectInfo['Properties'] as $name=>$property)
 		{
-			if($property['type']==='TFont')
-				$this->processObjectType('TFont',$this->_classes['TFont'],$prefix.'.'.$name,$doc);
-			if($property['readonly'] || $property['protected'])
+			if ($property['type'] === 'TFont')
+				$this->processObjectType('TFont', $this->_classes['TFont'], $prefix . '.' . $name, $doc);
+			if ($property['readonly'] || $property['protected'])
 				continue;
-			if(($type=$this->checkType($objectType,$name,$property['type']))!=='')
-				$doc->addAttribute($prefix.'.'.$name,$type);
+			if (($type = $this->checkType($objectType, $name, $property['type'])) !== '')
+				$doc->addAttribute($prefix . '.' . $name, $type);
 		}
 	}
 
-	private	function checkType($className,$propertyName,$type)
+	private	function checkType($className, $propertyName, $type)
 	{
-		if(strrpos($propertyName,'Color')===strlen($propertyName)-5)
+		if (strrpos($propertyName, 'Color') === strlen($propertyName) - 5)
 			return 'color';
-		if($propertyName==='Style')
+		if ($propertyName === 'Style')
 			return 'style';
-		if($type==='boolean')
-			return array('true','false');
-		if($type==='string' || $type==='integer' || $type==='ITemplate')
+		if ($type === 'boolean')
+			return array('true', 'false');
+		if ($type === 'string' || $type === 'integer' || $type === 'ITemplate')
 			return 'text';
 		return '';
 	}

Braces +79 added lines, -59 removed lines

@@ -35,24 +35,27 @@ 
 		$this->_exclusions=array();
 		foreach($exclusions as $exclusion)
 		{
-			if($exclusion[0]==='/')
-				$this->_exclusions[realpath($frameworkPath.'/'.$exclusion)]=true;
-			else
-				$this->_exclusions[$exclusion]=true;
+			if($exclusion[0]==='/') {
+							$this->_exclusions[realpath($frameworkPath.'/'.$exclusion)]=true;
+			} else {
+							$this->_exclusions[$exclusion]=true;
+			}
 		}
 	}
 
 	public function buildTree()
 	{
 		$sourceFiles=$this->getSourceFiles($this->_frameworkPath);
-		foreach($sourceFiles as $sourceFile)
-			$this->parseFile($sourceFile);
+		foreach($sourceFiles as $sourceFile) {
+					$this->parseFile($sourceFile);
+		}
 		ksort($this->_classes);
 		foreach(array_keys($this->_classes) as $className)
 		{
 			$parentClass=$this->_classes[$className]['ParentClass'];
-			if(isset($this->_classes[$parentClass]))
-				$this->_classes[$parentClass]['ChildClasses'][]=$className;
+			if(isset($this->_classes[$parentClass])) {
+							$this->_classes[$parentClass]['ChildClasses'][]=$className;
+			}
 		}
 		echo "\nClass tree built successfully. Total ".count($this->_classes)." classes found.\n";
 	}
@@ -83,16 +86,18 @@ 
 		$classFile=strtr(substr($sourceFile,strlen($this->_frameworkPath)),'\\','/');
 		echo "Parsing $classFile...\n";
 		$content=file_get_contents($sourceFile);
-		if(preg_match('/@package\s+([\w\.]+)\s*/msS',$content,$matches)>0)
-			$package=$matches[1];
-		else
-			$package='';
+		if(preg_match('/@package\s+([\w\.]+)\s*/msS',$content,$matches)>0) {
+					$package=$matches[1];
+		} else {
+					$package='';
+		}
 		$n=preg_match_all(self::REGEX_RULES,$content,$matches,PREG_SET_ORDER);
 		for($i=0;$i<$n;++$i)
 		{
 			$className=$matches[$i][2];
-			if(isset($this->_classes[$className]))
-				throw new Exception("Class $className is defined in both $sourceFile and ".$this->_classes[$className]->ClassFile);
+			if(isset($this->_classes[$className])) {
+							throw new Exception("Class $className is defined in both $sourceFile and ".$this->_classes[$className]->ClassFile);
+			}
 			$c=new TComponentReflection($className);
 			$properties=$c->getProperties();
 			$this->parseMethodComments($properties);
@@ -130,35 +135,38 @@ 
 			$pos2=strpos($s,'.');
 			if($pos1===false)
 			{
-				if($pos2!==false)
-					$method['comments']=substr($s,0,$pos2);
-				else
-					$method['comments']=$s;
-			}
-			else if($pos1>0)
+				if($pos2!==false) {
+									$method['comments']=substr($s,0,$pos2);
+				} else {
+									$method['comments']=$s;
+				}
+			} else if($pos1>0)
 			{
-				if($pos2 && $pos2<$pos1)	// use the first line as comment
+				if($pos2 && $pos2<$pos1) {
+					// use the first line as comment
 					$method['comments']=substr($s,0,$pos2);
-				else
-					$method['comments']=substr($s,0,$pos1);
-			}
-			else
+				} else {
+									$method['comments']=substr($s,0,$pos1);
+				}
+			} else
 			{
 				$matches=array();
-				if(preg_match('/@return\s+[\w\|]+\s+([^\.]*)/',$s,$matches)>0)
-					$method['comments']=$matches[1];
-				else
-					$method['comments']='';
+				if(preg_match('/@return\s+[\w\|]+\s+([^\.]*)/',$s,$matches)>0) {
+									$method['comments']=$matches[1];
+				} else {
+									$method['comments']='';
+				}
 			}
 		}
 	}
 
 	protected function isValidPath($path)
 	{
-		if(is_dir($path))
-			return !isset($this->_exclusions[basename($path)]) && !isset($this->_exclusions[$path]);
-		else
-			return basename($path)!==basename($path,'.php') && !isset($this->_exclusions[basename($path)]);
+		if(is_dir($path)) {
+					return !isset($this->_exclusions[basename($path)]) && !isset($this->_exclusions[$path]);
+		} else {
+					return basename($path)!==basename($path,'.php') && !isset($this->_exclusions[basename($path)]);
+		}
 	}
 
 	public function getSourceFiles($path)
@@ -167,15 +175,17 @@ 
 		$folder=opendir($path);
 		while($file=readdir($folder))
 		{
-			if($file==='.' || $file==='..')
-				continue;
+			if($file==='.' || $file==='..') {
+							continue;
+			}
 			$fullPath=realpath($path.'/'.$file);
 			if($this->isValidPath($fullPath))
 			{
-				if(is_file($fullPath))
-					$files[]=$fullPath;
-				else
-					$files=array_merge($files,$this->getSourceFiles($fullPath));
+				if(is_file($fullPath)) {
+									$files[]=$fullPath;
+				} else {
+									$files=array_merge($files,$this->getSourceFiles($fullPath));
+				}
 			}
 		}
 		closedir($folder);
@@ -207,12 +217,15 @@ 
 				foreach($classInfo['Properties'] as $name=>$property)
 				{
 					$type=$property['type'];
-					if(isset($this->_classes[$type]) && ($type==='TFont' || strrpos($type,'Style')===strlen($type)-5 && $type!=='TStyle'))
-						$this->processObjectType($type,$this->_classes[$type],$name,$docVTM);
-					if($property['readonly'] || $property['protected'])
-						continue;
-					if(($type=$this->checkType($className,$name,$property['type']))!=='')
-						$docVTM->addAttribute($name,$type);
+					if(isset($this->_classes[$type]) && ($type==='TFont' || strrpos($type,'Style')===strlen($type)-5 && $type!=='TStyle')) {
+											$this->processObjectType($type,$this->_classes[$type],$name,$docVTM);
+					}
+					if($property['readonly'] || $property['protected']) {
+											continue;
+					}
+					if(($type=$this->checkType($className,$name,$property['type']))!=='') {
+											$docVTM->addAttribute($name,$type);
+					}
 				}
 				foreach($classInfo['Events'] as $name=>$event)
 				{
@@ -231,25 +244,32 @@ 
 	{
 		foreach($objectInfo['Properties'] as $name=>$property)
 		{
-			if($property['type']==='TFont')
-				$this->processObjectType('TFont',$this->_classes['TFont'],$prefix.'.'.$name,$doc);
-			if($property['readonly'] || $property['protected'])
-				continue;
-			if(($type=$this->checkType($objectType,$name,$property['type']))!=='')
-				$doc->addAttribute($prefix.'.'.$name,$type);
+			if($property['type']==='TFont') {
+							$this->processObjectType('TFont',$this->_classes['TFont'],$prefix.'.'.$name,$doc);
+			}
+			if($property['readonly'] || $property['protected']) {
+							continue;
+			}
+			if(($type=$this->checkType($objectType,$name,$property['type']))!=='') {
+							$doc->addAttribute($prefix.'.'.$name,$type);
+			}
 		}
 	}
 
 	private	function checkType($className,$propertyName,$type)
 	{
-		if(strrpos($propertyName,'Color')===strlen($propertyName)-5)
-			return 'color';
-		if($propertyName==='Style')
-			return 'style';
-		if($type==='boolean')
-			return array('true','false');
-		if($type==='string' || $type==='integer' || $type==='ITemplate')
-			return 'text';
+		if(strrpos($propertyName,'Color')===strlen($propertyName)-5) {
+					return 'color';
+		}
+		if($propertyName==='Style') {
+					return 'style';
+		}
+		if($type==='boolean') {
+					return array('true','false');
+		}
+		if($type==='string' || $type==='integer' || $type==='ITemplate') {
+					return 'text';
+		}
 		return '';
 	}
 }

buildscripts/classtree/DWExtension.php

Doc Comments +3 added lines

@@ -100,6 +100,9 @@
 	private $_filesElement;
 	private $_document;
 
+	/**
+	 * @param string $version
+	 */
 	public function __construct($version)
 	{
 		$this->_document = new DOMDocument('1.0', 'utf-8');

Spacing +42 added lines, -42 removed lines

@@ -23,15 +23,15 @@ 
 
 		//--- add <tag>
 		$tag = $this->_document->createElement('tag');
-		$tag->setAttribute('name',$controlName);
-		$tag->setAttribute('casesensitive','yes');
+		$tag->setAttribute('name', $controlName);
+		$tag->setAttribute('casesensitive', 'yes');
 		$this->_document->appendChild($tag);
 
 		//--- add <tagformat>
 		$tagFormat = $this->_document->createElement('tagformat');
-		$tagFormat->setAttribute('nlbeforetag','1');
-		$tagFormat->setAttribute('nlaftertag','1');
-		$tagFormat->setAttribute('indentcontents','yes');
+		$tagFormat->setAttribute('nlbeforetag', '1');
+		$tagFormat->setAttribute('nlaftertag', '1');
+		$tagFormat->setAttribute('indentcontents', 'yes');
 		$tag->appendChild($tagFormat);
 
 		//--- add <tagdialog file="Control.htm" />
@@ -52,33 +52,33 @@ 
 	{
 		//--- add <attrib>
 		$attrib = $this->_document->createElement('attrib');
-		$attrib->setAttribute('name',$attribName);
+		$attrib->setAttribute('name', $attribName);
 		if (is_array($attribType))
 		{
-			$attrib->setAttribute('type','Enumerated');
+			$attrib->setAttribute('type', 'Enumerated');
 			foreach ($attribType as $value)
 			{
 				$option = $this->_document->createElement('attriboption');
-				$option->setAttribute('value',$value);
-				$option->setAttribute('caption','');
+				$option->setAttribute('value', $value);
+				$option->setAttribute('caption', '');
 				$attrib->appendChild($option);
 			}
 		}
-		else if($attribType!=='')
+		else if ($attribType !== '')
 		{
-			$attrib->setAttribute('type',$attribType);
+			$attrib->setAttribute('type', $attribType);
 		}
-		$attrib->setAttribute('casesensitive','yes');
+		$attrib->setAttribute('casesensitive', 'yes');
 		$this->_attributes->appendChild($attrib);
 	}
 
 	public function addEvent($eventName)
 	{
 		//--- add <attrib>
-		$this->addAttribute($eventName,'');
+		$this->addAttribute($eventName, '');
 		//--- add <event>
 		$event = $this->_document->createElement('event');
-		$event->setAttribute('name',$eventName);
+		$event->setAttribute('name', $eventName);
 		$this->_attributes->appendChild($event);
 	}
 
@@ -111,16 +111,16 @@ 
 		$this->_document->formatOutput = true;
 		//--- add root element
 		$rootElement = $this->_document->createElement('macromedia-extension');
-		$rootElement->setAttribute('name','PRADO Taglib');
-		$rootElement->setAttribute('version',$version);
-		$rootElement->setAttribute('type','Suite');
-		$rootElement->setAttribute('requires-restart','true');
+		$rootElement->setAttribute('name', 'PRADO Taglib');
+		$rootElement->setAttribute('version', $version);
+		$rootElement->setAttribute('type', 'Suite');
+		$rootElement->setAttribute('requires-restart', 'true');
 		$this->_document->appendChild($rootElement);
 		//--- add <author>
 		$element = $this->_document->createElement('author');
-		$element->setAttribute('name','Stanislav Yordanov, Qiang Xue');
+		$element->setAttribute('name', 'Stanislav Yordanov, Qiang Xue');
 		$rootElement->appendChild($element);
-		$time = date('F j, Y, h:i:s a',time());
+		$time = date('F j, Y, h:i:s a', time());
 		//--- add <description>
 		$description = <<<EOD
 PRADO $version Tag Library
@@ -138,9 +138,9 @@ 
 		$rootElement->appendChild($productsElement);
 		//--- add <product>
 		$product = $this->_document->createElement('product');
-		$product->setAttribute('name','Dreamweaver');
-		$product->setAttribute('version','6');
-		$product->setAttribute('primary','false');
+		$product->setAttribute('name', 'Dreamweaver');
+		$product->setAttribute('version', '6');
+		$product->setAttribute('primary', 'false');
 		$productsElement->appendChild($product);
 		//--- add <ui-access>
 		$element = $this->_document->createElement('ui-access');
@@ -160,29 +160,29 @@ 
 		$tagLibChangeElement->appendChild($tagLibInsertElement);
 		//--- add <taglibrary>
 		$this->_tagLibraryElement = $element = $this->_document->createElement('taglibrary');
-		$element->setAttribute('doctypes','HTML,DWTemplate');
-		$element->setAttribute('id','DWTagLibrary_PRADO_tags');
-		$element->setAttribute('name','PRADO tags');
-		$element->setAttribute('prefix','<com:');
-		$element->setAttribute('tagchooser','PRADO/TagChooser.xml');
+		$element->setAttribute('doctypes', 'HTML,DWTemplate');
+		$element->setAttribute('id', 'DWTagLibrary_PRADO_tags');
+		$element->setAttribute('name', 'PRADO tags');
+		$element->setAttribute('prefix', '<com:');
+		$element->setAttribute('tagchooser', 'PRADO/TagChooser.xml');
 		$tagLibInsertElement->appendChild($element);
 
 		$element = $this->_document->createElement('file');
-		$element->setAttribute('name','Configuration/TagLibraries/PRADO/TagChooser.xml');
-		$element->setAttribute('destination','$dreamweaver/Configuration/TagLibraries/PRADO/TagChooser.xml');
+		$element->setAttribute('name', 'Configuration/TagLibraries/PRADO/TagChooser.xml');
+		$element->setAttribute('destination', '$dreamweaver/Configuration/TagLibraries/PRADO/TagChooser.xml');
 		$this->_filesElement->appendChild($element);
 	}
 
 	public function addTag($tagName)
 	{
 		$element = $this->_document->createElement('file');
-		$element->setAttribute('name','Configuration/TagLibraries/PRADO/'.$tagName.'.vtm');
-		$element->setAttribute('destination','$dreamweaver/Configuration/TagLibraries/PRADO/'.$tagName.'.vtm');
+		$element->setAttribute('name', 'Configuration/TagLibraries/PRADO/' . $tagName . '.vtm');
+		$element->setAttribute('destination', '$dreamweaver/Configuration/TagLibraries/PRADO/' . $tagName . '.vtm');
 		$this->_filesElement->appendChild($element);
 
 		$element = $this->_document->createElement('tagref');
-		$element->setAttribute('file','PRADO/'.$tagName.'.vtm');
-		$element->setAttribute('name',$tagName);
+		$element->setAttribute('file', 'PRADO/' . $tagName . '.vtm');
+		$element->setAttribute('name', $tagName);
 		$this->_tagLibraryElement->appendChild($element);
 	}
 
@@ -220,23 +220,23 @@ 
 		$this->_document->standalone = true;
 		$this->_document->formatOutput = true;
 		$tclibrary = $this->_document->createElement('tclibrary');
-		$tclibrary->setAttribute('name','PRADO tags');
-		$tclibrary->setAttribute('desc','A collection of all PRADO tags.');
-		$tclibrary->setAttribute('reference','PRADO');
+		$tclibrary->setAttribute('name', 'PRADO tags');
+		$tclibrary->setAttribute('desc', 'A collection of all PRADO tags.');
+		$tclibrary->setAttribute('reference', 'PRADO');
 		$this->_document->appendChild($tclibrary);
 
 		$this->_category = $this->_document->createElement('category');
-		$this->_category->setAttribute('name','General');
-		$this->_category->setAttribute('icon','Configuration/TagLibraries/Icons/Elements.gif');
+		$this->_category->setAttribute('name', 'General');
+		$this->_category->setAttribute('icon', 'Configuration/TagLibraries/Icons/Elements.gif');
 		$tclibrary->appendChild($this->_category);
 	}
 
 	public function addElement($elementName)
 	{
 		$element = $this->_document->createElement('element');
-		$element->setAttribute('name','com:'.$elementName);
-		$element->setAttribute('value','<com:'.$elementName.'>');
-		$element->setAttribute('reference','PRADO,COM:'.strtoupper($elementName));
+		$element->setAttribute('name', 'com:' . $elementName);
+		$element->setAttribute('value', '<com:' . $elementName . '>');
+		$element->setAttribute('reference', 'PRADO,COM:' . strtoupper($elementName));
 		$this->_category->appendChild($element);
 	}
 

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
 				$option->setAttribute('caption','');
 				$attrib->appendChild($option);
 			}
-		}
-		else if($attribType!=='')
+		} else if($attribType!=='')
 		{
 			$attrib->setAttribute('type',$attribType);
 		}

buildscripts/index/api_index.php

Doc Comments +3 added lines

@@ -10,6 +10,9 @@
 	private $_index;	
 	private $_api;
 	
+	/**
+	 * @param string $api
+	 */
 	public function __construct($index_file, $api)
 	{
 		$this->_api = $api;

Spacing +13 added lines, -13 removed lines

@@ -23,7 +23,7 @@ 
 		echo "Building search index...\n";
 		$files = $this->get_files($this->_api);
 		$count = 0;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			$content = $this->get_details($file, $this->_api);
 			
@@ -31,7 +31,7 @@ 
 			
 			$title = $content['class'];
 			
-			echo "  Adding ".$title."\n";
+			echo "  Adding " . $title . "\n";
 			
 			//unsearchable text
 			$doc->addField(Zend_Search_Lucene_Field::UnIndexed('link', $content['link']));
@@ -39,9 +39,9 @@ 
 			//$doc->addField(Zend_Search_Lucene_Field::UnIndexed('text', $content['content']));
 			
 			//searchable
-			$body = strtolower($this->sanitize($content['content'])).' '.strtolower($title);			
-			$doc->addField(Zend_Search_Lucene_Field::Keyword('page', strtolower(str_replace('.',' ',$title))));
-			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents',$body));
+			$body = strtolower($this->sanitize($content['content'])) . ' ' . strtolower($title);			
+			$doc->addField(Zend_Search_Lucene_Field::Keyword('page', strtolower(str_replace('.', ' ', $title))));
+			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents', $body));
 			$this->_index->addDocument($doc);
 			$count++;
 		}
@@ -51,7 +51,7 @@ 
 
 	function sanitize($input) 
 	{
-		return htmlentities(strip_tags( $input ));
+		return htmlentities(strip_tags($input));
 	}	
 
 	function get_files($path)
@@ -61,8 +61,8 @@ 
 		$files = array();
 		while (false !== ($entry = $d->read()))
 		{
-			$filepath = $path.'/'.$entry;
-			if(is_file($filepath) && strpos($entry, 'class-')===0)
+			$filepath = $path . '/' . $entry;
+			if (is_file($filepath) && strpos($entry, 'class-') === 0)
 				$files[] = realpath($filepath);
 		}
 		$d->close();
@@ -72,13 +72,13 @@ 
 	function get_doc_content($file)
 	{
 		$content = file_get_contents($file);
-		$html = preg_replace('/<h1>/','~~~', $content);
+		$html = preg_replace('/<h1>/', '~~~', $content);
 		$html = preg_replace('/<![^~]+/m', '', $html);
 		$html = preg_replace('/<div class="credit">[\s\w\W\S]+/m', '', $html);
-		$html = preg_replace('/&nbsp;|~+|\s{2,}/',' ',$html);
-		$html = preg_replace('/\s{2,}/',' ',$html);
+		$html = preg_replace('/&nbsp;|~+|\s{2,}/', ' ', $html);
+		$html = preg_replace('/\s{2,}/', ' ', $html);
 		$text = strip_tags($html);
-		$text = str_replace(' , ',', ',$text);
+		$text = str_replace(' , ', ', ', $text);
 		return $text;
 	}
 	
@@ -89,7 +89,7 @@ 
 		$replace = array('', '', '');
 		$path = str_replace($find, $replace, $file);
 		$result['class'] = $path;
-		$result['link'] = self::API_URL.$file;
+		$result['link'] = self::API_URL . $file;
 		return $result;
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -62,8 +62,9 @@
 		while (false !== ($entry = $d->read()))
 		{
 			$filepath = $path.'/'.$entry;
-			if(is_file($filepath) && strpos($entry, 'class-')===0)
-				$files[] = realpath($filepath);
+			if(is_file($filepath) && strpos($entry, 'class-')===0) {
+							$files[] = realpath($filepath);
+			}
 		}
 		$d->close();
 		return $files;

buildscripts/index/quickstart_index.php

Doc Comments +8 added lines

@@ -8,6 +8,10 @@ 
 	private $_base;
 	private $_source;
 
+	/**
+	 * @param string $base
+	 * @param string $source
+	 */
 	public function __construct($index_file, $base, $source)
 	{
 		$this->_index = new Zend_Search_Lucene($index_file, true);
@@ -37,6 +41,10 @@ 
 		echo "\n {$count} files indexed.\n";
 	}
 
+	/**
+	 * @param string $content
+	 * @param integer $mtime
+	 */
 	public function add($content, $section, $mtime)
 	{
 		foreach($this->split_headings($content) as $headers)

Spacing +14 added lines, -14 removed lines

@@ -21,14 +21,14 @@ 
 		echo "Building search index...\n";
 		$pages = include($this->_source);
 		$count = 0;
-		foreach($pages as $chapter => $sections)
+		foreach ($pages as $chapter => $sections)
 		{
-			foreach($sections as $section)
+			foreach ($sections as $section)
 			{
 				echo "    Adding $section\n";
-				$page = $this->_base.'/'.$section;
+				$page = $this->_base . '/' . $section;
 				$file_content = file_get_contents($page);
-				$this->add($file_content,$section, filemtime($page));
+				$this->add($file_content, $section, filemtime($page));
 				$count++;
 			}
 		}
@@ -39,11 +39,11 @@ 
 
 	public function add($content, $section, $mtime)
 	{
-		foreach($this->split_headings($content) as $headers)
+		foreach ($this->split_headings($content) as $headers)
 		{
 			$doc = new Zend_Search_Lucene_Document();
-			$link = "index.php?page=".preg_replace('/\/|\\\/', '.', $section);
-			$link = str_replace('.page', '', $link).'#'.$headers['section'];
+			$link = "index.php?page=" . preg_replace('/\/|\\\/', '.', $section);
+			$link = str_replace('.page', '', $link) . '#' . $headers['section'];
 
 			//unsearchable text
 			$doc->addField(Zend_Search_Lucene_Field::UnIndexed('link', $link));
@@ -53,15 +53,15 @@ 
 
 			//searchable text
 			$doc->addField(Zend_Search_Lucene_Field::Keyword('page', strtolower($headers['title'])));
-			$body = strtolower($this->sanitize($headers['content'])).' '.strtolower($headers['title']);
-			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents',$body));
+			$body = strtolower($this->sanitize($headers['content'])) . ' ' . strtolower($headers['title']);
+			$doc->addField(Zend_Search_Lucene_Field::Unstored('contents', $body));
 			$this->_index->addDocument($doc);
 		}
 	}
 
 	function sanitize($input)
 	{
-		return htmlentities(strip_tags( $input ));
+		return htmlentities(strip_tags($input));
 	}
 
 	public function index()
@@ -82,14 +82,14 @@ 
 		$html = preg_replace('/<h3([^>]*)>([^<]*)<\/h3>/', '<hh$1>$2</hh>', $html);
 
 
-		$sections = preg_split('/<hh[^>]*>([^<]+)<\/hh>/', $html,-1);
+		$sections = preg_split('/<hh[^>]*>([^<]+)<\/hh>/', $html, -1);
 		$headers = array();
 		preg_match_all('/<hh([^>]*)>([^<]+)<\/hh>/', $html, $headers);
 		$contents = array();
-		for($i = 1, $t = count($sections); $i < $t; $i++)
+		for ($i = 1, $t = count($sections); $i < $t; $i++)
 		{
-			$content['title'] = trim($this->sanitize($headers[2][$i-1]));
-			$content['section'] = str_replace('"', '',trim($headers[1][$i-1],'"'));
+			$content['title'] = trim($this->sanitize($headers[2][$i - 1]));
+			$content['section'] = str_replace('"', '', trim($headers[1][$i - 1], '"'));
 			$content['content'] = trim($this->sanitize($sections[$i]));
 			$contents[] = $content;
 		}

buildscripts/texbuilder/Page2Tex.php

Doc Comments +3 added lines

@@ -71,6 +71,9 @@
 		}
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	function include_figure($info, $filename)
 	{
 		$width = sprintf('%0.2f', $info[0]/(135/2.54));

Indentation +2 added lines, -2 removed lines

@@ -167,10 +167,10 @@
 
 		//DocLink
 		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^."]*)"\s+Text="([^"]+)"\s*\/>/',
-	                        '\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$3}', $html);
+							'\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$3}', $html);
 
 		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^.]*)"\s+\/>/',
-	                        '\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$1.$2 API Reference}', $html);
+							'\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$1.$2 API Reference}', $html);
 
 		//text modifiers
 		$html = preg_replace('/<(b|strong)[^>]*>([^<]*)<\/(b|strong)>/', '\textbf{$2}', $html);

Spacing +72 added lines, -72 removed lines

@@ -4,16 +4,16 @@ 
 {
 	private $_current_page;
 	private static $header_count = 0;
-	private static $p_count=0;
-	private static $hil_count=0;
-	private $page_count=0;
+	private static $p_count = 0;
+	private static $hil_count = 0;
+	private $page_count = 0;
 	private $_base;
 	private $_dir;
 
-	private $_verb_find = array('\$','\%', '\{', '\}', "\t",'``','`');
-	private $_verb_replace = array('$', '%', '{','}', "     ",'"','\'');
+	private $_verb_find = array('\$', '\%', '\{', '\}', "\t", '``', '`');
+	private $_verb_replace = array('$', '%', '{', '}', "     ", '"', '\'');
 
-	function __construct($base, $dir, $current='')
+	function __construct($base, $dir, $current = '')
 	{
 		$this->_base = $base;
 		$this->_current_page = $current;
@@ -22,21 +22,21 @@ 
 
 	function setCurrentPage($current)
 	{
-		self::$header_count = self::$header_count+1000;
+		self::$header_count = self::$header_count + 1000;
 		$this->_current_page = $current;
 	}
 
 	function escape_verbatim($matches)
 	{
-		return "\begin{small}\begin{verbatim}".
-				str_replace($this->_verb_find, $this->_verb_replace, $matches[1]).
-				'\end{verbatim}\end{small}'."\n";
+		return "\begin{small}\begin{verbatim}" .
+				str_replace($this->_verb_find, $this->_verb_replace, $matches[1]) .
+				'\end{verbatim}\end{small}' . "\n";
 	}
 
 	function escape_verb($matches)
 	{
 		$text = str_replace($this->_verb_find, $this->_verb_replace, $matches[1]);
-		return '\begin{small}\verb<'.$text.'< \end{small}';
+		return '\begin{small}\verb<' . $text . '< \end{small}';
 	}
 
 	function include_image($matches)
@@ -44,11 +44,11 @@ 
 
 		$current_path = $this->_current_page;
 
-		$image = dirname($current_path).'/'.trim($matches[1]);
+		$image = dirname($current_path) . '/' . trim($matches[1]);
 
 		$file = realpath($image);
 		$info = getimagesize($file);
-		switch($info[2])
+		switch ($info[2])
 		{
 			case 1:
 				$im = imagecreatefromgif($file);
@@ -58,13 +58,13 @@ 
 		}
 		$base = $this->_base;
 
-		if(isset($im))
+		if (isset($im))
 		{
 			$prefix = strtolower(str_replace(realpath($base), '', $file));
-			$filename = preg_replace('/\\\|\//', '_', substr($prefix,1));
-			$filename = substr($filename, 0, strrpos($filename,'.')).'.png';
-			$newfile = $this->_dir.'/'.$filename;
-			imagepng($im,$newfile);
+			$filename = preg_replace('/\\\|\//', '_', substr($prefix, 1));
+			$filename = substr($filename, 0, strrpos($filename, '.')) . '.png';
+			$newfile = $this->_dir . '/' . $filename;
+			imagepng($im, $newfile);
 			imagedestroy($im);
 
 			return $this->include_figure($info, $filename);
@@ -73,12 +73,12 @@ 
 
 	function include_figure($info, $filename)
 	{
-		$width = sprintf('%0.2f', $info[0]/(135/2.54));
+		$width = sprintf('%0.2f', $info[0] / (135 / 2.54));
 		return '
 	\begin{figure}[!ht]
 		\centering
-			\includegraphics[width='.$width.'cm]{'.$filename.'}
-		\label{fig:'.$filename.'}
+			\includegraphics[width='.$width . 'cm]{' . $filename . '}
+		\label{fig:'.$filename . '}
 	\end{figure}
 	';
 	}
@@ -86,12 +86,12 @@ 
 	function anchor($matches)
 	{
 		$page = $this->get_current_path();
-		return '\hypertarget{'.$page.'/'.strtolower($matches[1]).'}{}';
+		return '\hypertarget{' . $page . '/' . strtolower($matches[1]) . '}{}';
 	}
 
 	function texttt($matches)
 	{
-		$text ='\texttt{'.str_replace(array('#','_','&amp;'),array('\#','\_','\&'), $matches[1]).'}';
+		$text = '\texttt{' . str_replace(array('#', '_', '&amp;'), array('\#', '\_', '\&'), $matches[1]) . '}';
 		//$text = preg_replace('/([^\\\\])&([^;]+)/', '$1\&$2', $text);
 		return $text;
 	}
@@ -100,39 +100,39 @@ 
 	{
 		$current_path = $this->_current_page;
 		$base = $this->_base;
-		$page = strtolower(substr(str_replace($base, '', $current_path),1));
+		$page = strtolower(substr(str_replace($base, '', $current_path), 1));
 		return $page;
 	}
 
 	function make_link($matches)
 	{
-		if(is_int(strpos($matches[1], '#')))
+		if (is_int(strpos($matches[1], '#')))
 		{
-			if(strpos($matches[1],'?') ===false)
+			if (strpos($matches[1], '?') === false)
 			{
-				if(strpos($matches[1],'http://')===false)
+				if (strpos($matches[1], 'http://') === false)
 				{
-					$target = $this->get_current_path().'/'.substr($matches[1],1);
-					return '\hyperlink{'.$target.'}{'.$matches[2].'}';
+					$target = $this->get_current_path() . '/' . substr($matches[1], 1);
+					return '\hyperlink{' . $target . '}{' . $matches[2] . '}';
 				}
 			}
 			else
 			{
 				$page = strtolower(str_replace('?page=', '', $matches[1]));
-				$page = str_replace('.','/',$page);
-				$page = str_replace('#','.page/',$page);
-				return '\hyperlink{'.$page.'}{'.$matches[2].'}';
+				$page = str_replace('.', '/', $page);
+				$page = str_replace('#', '.page/', $page);
+				return '\hyperlink{' . $page . '}{' . $matches[2] . '}';
 			}
 		}
-		else if(is_int(strpos($matches[1],'?')))
+		else if (is_int(strpos($matches[1], '?')))
 		{
-			$page = str_replace('?page=','',$matches[1]);
-			return '\hyperlink{'.$page.'}{'.$matches[2].'}';
+			$page = str_replace('?page=', '', $matches[1]);
+			return '\hyperlink{' . $page . '}{' . $matches[2] . '}';
 		}
-		return '\href{'.str_replace('#','\\#',$matches[1]).'}{'.$matches[2].'}';
+		return '\href{' . str_replace('#', '\\#', $matches[1]) . '}{' . $matches[2] . '}';
 	}
 
-	function parse_html($page,$html)
+	function parse_html($page, $html)
 	{
 		$html = preg_replace('/<\/?com:TContent[^>]*>/', '', $html);
 		$html = preg_replace('/<\/?p [^>]*>/', '', $html);
@@ -152,14 +152,14 @@ 
 		//codes
 		$html = str_replace('$', '\$', $html);
 
-		$html = preg_replace_callback('/<com:TTextHighlighter[^>]*>((.|\n)*?)<\/com:TTextHighlighter\s*>/', array($this,'escape_verbatim'), $html);
+		$html = preg_replace_callback('/<com:TTextHighlighter[^>]*>((.|\n)*?)<\/com:TTextHighlighter\s*>/', array($this, 'escape_verbatim'), $html);
 //		$html = preg_replace('/<\/com:TTextHighlighter>/', '`2`', $html);
 //		$html = preg_replace_callback('/(`1`)([^`]*)(`2`)/m', array($this,'escape_verbatim'), $html);
-		$html = preg_replace_callback('/(<div class="source">)((.|\n)*?)(<\/div>)/', array($this,'escape_verbatim'), $html);
-		$html = preg_replace_callback('/(<pre>)([^<]*)(<\/pre>)/', array($this,'escape_verbatim'), $html);
+		$html = preg_replace_callback('/(<div class="source">)((.|\n)*?)(<\/div>)/', array($this, 'escape_verbatim'), $html);
+		$html = preg_replace_callback('/(<pre>)([^<]*)(<\/pre>)/', array($this, 'escape_verbatim'), $html);
 
 		//<code>
-		$html = preg_replace_callback('/<code>([^<]*)<\/code>/', array($this,'escape_verb'), $html);
+		$html = preg_replace_callback('/<code>([^<]*)<\/code>/', array($this, 'escape_verb'), $html);
 
 		//runbar
 		$html = preg_replace('/<com:RunBar\s+PagePath="([^"]*)"\s+\/>/',
@@ -175,13 +175,13 @@ 
 		//text modifiers
 		$html = preg_replace('/<(b|strong)[^>]*>([^<]*)<\/(b|strong)>/', '\textbf{$2}', $html);
 		$html = preg_replace('/<i [^>]*>([^<]*)+?<\/i>/', '\emph{$1}', $html);
-		$html = preg_replace_callback('/<tt>([^<]*)<\/tt>/', array($this,'texttt'), $html);
+		$html = preg_replace_callback('/<tt>([^<]*)<\/tt>/', array($this, 'texttt'), $html);
 
 		//links
 		$html = preg_replace_callback('/<a[^>]+href="([^"]*)"[^>]*>([^<]*)<\/a>/',
-								array($this,'make_link'), $html);
+								array($this, 'make_link'), $html);
 		//anchor
-		$html = preg_replace_callback('/<a[^>]+name="([^"]*)"[^>]*><\/a>/', array($this,'anchor'), $html);
+		$html = preg_replace_callback('/<a[^>]+name="([^"]*)"[^>]*><\/a>/', array($this, 'anchor'), $html);
 
 		//description <dl>
 		$html = preg_replace('/<dt>([^<]*)<\/dt>/', '\item[$1]', $html);
@@ -230,20 +230,20 @@ 
 	function tabular($matches)
 	{
 		$options = array();
-		foreach(explode(',', $matches[1]) as $string)
+		foreach (explode(',', $matches[1]) as $string)
 		{
 			$sub = explode('=', trim($string));
 			$options[trim($sub[0])] = trim($sub[1]);
 		}
 
-		$widths = explode(' ',preg_replace('/\(|\)/', '', $options['width']));
+		$widths = explode(' ', preg_replace('/\(|\)/', '', $options['width']));
 		$this->_tabular_widths = $widths;
 
 		$this->_tabular_total = count($widths);
 		$this->_tabular_col = 0;
 
-		$begin = '\begin{table}[!hpt]\centering '."\n".' \begin{tabular}{'.$options['align'].'}\hline';
-		$end = '\end{tabular} '."\n".'\end{table}'."\n";
+		$begin = '\begin{table}[!hpt]\centering ' . "\n" . ' \begin{tabular}{' . $options['align'] . '}\hline';
+		$end = '\end{tabular} ' . "\n" . '\end{table}' . "\n";
 		$table = preg_replace('/<\/tr>/', '\\\\\\\\ \hline', $matches[2]);
 		$table = preg_replace('/<tr>/', '', $table);
 		$table = preg_replace('/<th>([^<]+)<\/th>/', '\textbf{$1} &', $table);
@@ -251,95 +251,95 @@ 
 		$table = preg_replace('/<br \/>/', ' \\\\\\\\', $table);
 
 		$table = preg_replace('/&\s*\\\\\\\\/', '\\\\\\\\', $table);
-		return $begin.$table.$end;
+		return $begin . $table . $end;
 	}
 
 	function table_column($matches)
 	{
 		$width = $this->_tabular_widths[$this->_tabular_col];
-		if($this->_tabular_col >= $this->_tabular_total-1)
+		if ($this->_tabular_col >= $this->_tabular_total - 1)
 			$this->_tabular_col = 0;
 		else
 			$this->_tabular_col++;
-		return '\begin{minipage}{'.$width.'\textwidth}\vspace{3mm}'.
-			$matches[1].'\vspace{3mm}\end{minipage} & ';
+		return '\begin{minipage}{' . $width . '\textwidth}\vspace{3mm}' .
+			$matches[1] . '\vspace{3mm}\end{minipage} & ';
 	}
 
 	function mbox($matches)
 	{
-		return "\n\begin{mybox}\n".$matches[1]."\n".'\end{mybox}'."\n";
+		return "\n\begin{mybox}\n" . $matches[1] . "\n" . '\end{mybox}' . "\n";
 	}
 
 	function get_chapter_label($chapter)
 	{
-		return '\hypertarget{'.str_replace(' ', '', $chapter).'}{}';
+		return '\hypertarget{' . str_replace(' ', '', $chapter) . '}{}';
 	}
 
 	function get_section_label($section)
 	{
 		$section = str_replace('.page', '', $section);
-		return '\hypertarget{'.str_replace('/', '.', $section).'}{}';
+		return '\hypertarget{' . str_replace('/', '.', $section) . '}{}';
 	}
 
 
 	function set_header_id($content, $j)
 	{
-		$this->page_count=$j;
-		$content = preg_replace_callback('/<h1>/', array($this,"h1"), $content);
-		$content = preg_replace_callback('/<h2>/', array($this,"h2"), $content);
-		$content = preg_replace_callback('/<h3>/', array($this,"h3"), $content);
+		$this->page_count = $j;
+		$content = preg_replace_callback('/<h1>/', array($this, "h1"), $content);
+		$content = preg_replace_callback('/<h2>/', array($this, "h2"), $content);
+		$content = preg_replace_callback('/<h3>/', array($this, "h3"), $content);
 		$content = $this->set_block_content_id($content);
 		return $content;
 	}
 
 	function h1($matches)
 	{
-		$page = $this->page_count*1000;
-		return "<h1 id=\"".($page + (++self::$header_count))."\">";
+		$page = $this->page_count * 1000;
+		return "<h1 id=\"" . ($page + (++self::$header_count)) . "\">";
 	}
 
 	function h2($matches)
 	{
-		$page = $this->page_count*1000;
-		return "<h2 id=\"".($page + (++self::$header_count))."\">";
+		$page = $this->page_count * 1000;
+		return "<h2 id=\"" . ($page + (++self::$header_count)) . "\">";
 	}
 
 	function h3($matches)
 	{
-		$page = $this->page_count*1000;
-		return "<h3 id=\"".($page + (++self::$header_count))."\">";
+		$page = $this->page_count * 1000;
+		return "<h3 id=\"" . ($page + (++self::$header_count)) . "\">";
 	}
 
 	function set_block_content_id($content)
 	{
-		$content = preg_replace_callback('/<p>/',  array($this, 'add_p'), $content);
+		$content = preg_replace_callback('/<p>/', array($this, 'add_p'), $content);
 		$content = preg_replace_callback('/<com:TTextHighlighter([^>]+)>/', array($this, 'hil'), $content);
 		return $content;
 	}
 
 	function hil($matches)
 	{
-		$id = ($this->page_count*10000) + (++self::$hil_count);
-		if(preg_match('/id="code-\d+"/i', $matches[1]))
+		$id = ($this->page_count * 10000) + (++self::$hil_count);
+		if (preg_match('/id="code-\d+"/i', $matches[1]))
 		{
 			$code = preg_replace('/id="code-(\d+)"/', 'id="code_$1"', $matches[0]);
 			//var_dump($code);
 			return $code;
 		}
-		else if(preg_match('/id="[^"]+"/i', $matches[1]))
+		else if (preg_match('/id="[^"]+"/i', $matches[1]))
 		{
 			return $matches[0];
 		}
 		else
 		{
-			$changes = str_replace('"source"', '"source block-content" id="code-'.$id.'"', $matches[0]);
+			$changes = str_replace('"source"', '"source block-content" id="code-' . $id . '"', $matches[0]);
 			return $changes;
 		}
 	}
 
 	function add_p($matches)
 	{
-		 $page = $this->page_count*10000;
-		 return "<p id=\"".($page + (++self::$p_count))."\" class=\"block-content\">";
+		 $page = $this->page_count * 10000;
+		 return "<p id=\"" . ($page + (++self::$p_count)) . "\" class=\"block-content\">";
 	}
 }

Braces +9 added lines, -12 removed lines

@@ -115,16 +115,14 @@ 
 					$target = $this->get_current_path().'/'.substr($matches[1],1);
 					return '\hyperlink{'.$target.'}{'.$matches[2].'}';
 				}
-			}
-			else
+			} else
 			{
 				$page = strtolower(str_replace('?page=', '', $matches[1]));
 				$page = str_replace('.','/',$page);
 				$page = str_replace('#','.page/',$page);
 				return '\hyperlink{'.$page.'}{'.$matches[2].'}';
 			}
-		}
-		else if(is_int(strpos($matches[1],'?')))
+		} else if(is_int(strpos($matches[1],'?')))
 		{
 			$page = str_replace('?page=','',$matches[1]);
 			return '\hyperlink{'.$page.'}{'.$matches[2].'}';
@@ -257,10 +255,11 @@ 
 	function table_column($matches)
 	{
 		$width = $this->_tabular_widths[$this->_tabular_col];
-		if($this->_tabular_col >= $this->_tabular_total-1)
-			$this->_tabular_col = 0;
-		else
-			$this->_tabular_col++;
+		if($this->_tabular_col >= $this->_tabular_total-1) {
+					$this->_tabular_col = 0;
+		} else {
+					$this->_tabular_col++;
+		}
 		return '\begin{minipage}{'.$width.'\textwidth}\vspace{3mm}'.
 			$matches[1].'\vspace{3mm}\end{minipage} & ';
 	}
@@ -325,12 +324,10 @@ 
 			$code = preg_replace('/id="code-(\d+)"/', 'id="code_$1"', $matches[0]);
 			//var_dump($code);
 			return $code;
-		}
-		else if(preg_match('/id="[^"]+"/i', $matches[1]))
+		} else if(preg_match('/id="[^"]+"/i', $matches[1]))
 		{
 			return $matches[0];
-		}
-		else
+		} else
 		{
 			$changes = str_replace('"source"', '"source block-content" id="code-'.$id.'"', $matches[0]);
 			return $changes;

demos/blog-tutorial/samples/day5/blog/protected/pages/posts/ListPost.php

Doc Comments +1 added lines

@@ -48,6 +48,7 @@
 
 	/**
 	 * Fetches posts from database with offset and limit.
+	 * @param double $offset
 	 */
 	protected function getPosts($offset, $limit)
 	{

Spacing +13 added lines, -13 removed lines

@@ -10,10 +10,10 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if(!$this->IsPostBack)  // if the page is requested the first time
+		if (!$this->IsPostBack)  // if the page is requested the first time
 		{
 			// get the total number of posts available
-			$this->Repeater->VirtualItemCount=PostRecord::finder()->count();
+			$this->Repeater->VirtualItemCount = PostRecord::finder()->count();
 			// populates post data into the repeater
 			$this->populateData();
 		}
@@ -24,10 +24,10 @@ 
 	 * This method is invoked when the user clicks on a page button
 	 * and thus changes the page of posts to display.
 	 */
-	public function pageChanged($sender,$param)
+	public function pageChanged($sender, $param)
 	{
 		// change the current page index to the new one
-		$this->Repeater->CurrentPageIndex=$param->NewPageIndex;
+		$this->Repeater->CurrentPageIndex = $param->NewPageIndex;
 		// re-populate data into the repeater
 		$this->populateData();
 	}
@@ -38,11 +38,11 @@ 
 	 */
 	protected function populateData()
 	{
-		$offset=$this->Repeater->CurrentPageIndex*$this->Repeater->PageSize;
-		$limit=$this->Repeater->PageSize;
-		if($offset+$limit>$this->Repeater->VirtualItemCount)
-			$limit=$this->Repeater->VirtualItemCount-$offset;
-		$this->Repeater->DataSource=$this->getPosts($offset,$limit);
+		$offset = $this->Repeater->CurrentPageIndex * $this->Repeater->PageSize;
+		$limit = $this->Repeater->PageSize;
+		if ($offset + $limit > $this->Repeater->VirtualItemCount)
+			$limit = $this->Repeater->VirtualItemCount - $offset;
+		$this->Repeater->DataSource = $this->getPosts($offset, $limit);
 		$this->Repeater->dataBind();
 	}
 
@@ -52,10 +52,10 @@ 
 	protected function getPosts($offset, $limit)
 	{
 		// Construts a query criteria
-		$criteria=new TActiveRecordCriteria;
-		$criteria->OrdersBy['create_time']='desc';
-		$criteria->Limit=$limit;
-		$criteria->Offset=$offset;
+		$criteria = new TActiveRecordCriteria;
+		$criteria->OrdersBy['create_time'] = 'desc';
+		$criteria->Limit = $limit;
+		$criteria->Offset = $offset;
 		// query for the posts with the above criteria and with author information
 		return PostRecord::finder()->withAuthor()->findAll($criteria);
 	}

Braces +6 added lines, -3 removed lines

@@ -10,10 +10,12 @@ 
 	public function onInit($param)
 	{
 		parent::onInit($param);
-		if(!$this->IsPostBack)  // if the page is requested the first time
+		if(!$this->IsPostBack) {
+			// if the page is requested the first time
 		{
 			// get the total number of posts available
 			$this->Repeater->VirtualItemCount=PostRecord::finder()->count();
+		}
 			// populates post data into the repeater
 			$this->populateData();
 		}
@@ -40,8 +42,9 @@ 
 	{
 		$offset=$this->Repeater->CurrentPageIndex*$this->Repeater->PageSize;
 		$limit=$this->Repeater->PageSize;
-		if($offset+$limit>$this->Repeater->VirtualItemCount)
-			$limit=$this->Repeater->VirtualItemCount-$offset;
+		if($offset+$limit>$this->Repeater->VirtualItemCount) {
+					$limit=$this->Repeater->VirtualItemCount-$offset;
+		}
 		$this->Repeater->DataSource=$this->getPosts($offset,$limit);
 		$this->Repeater->dataBind();
 	}