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));

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/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)

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');

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;

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)

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));

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)
 	{

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();
 	}

demos/blog/protected/Common/BlogUserManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Returns a user instance given the user name.
 	 * @param string user name, null if it is a guest.
-	 * @return TUser the user instance, null if the specified username is not in the user database.
+	 * @return BlogUser|null the user instance, null if the specified username is not in the user database.
 	 */
 	public function getUser($username=null)
 	{

Braces +10 added lines, -9 removed lines

@@ -33,9 +33,9 @@ 
 	 */
 	public function getUser($username=null)
 	{
-		if($username===null)
-			return new BlogUser($this);
-		else
+		if($username===null) {
+					return new BlogUser($this);
+		} else
 		{
 			$username=strtolower($username);
 			$db=$this->Application->getModule('data');
@@ -47,9 +47,9 @@ 
 				$user->setIsGuest(false);
 				$user->setRoles($userRecord->Role===UserRecord::ROLE_USER?'user':'admin');
 				return $user;
+			} else {
+							return null;
 			}
-			else
-				return null;
 		}
 	}
 
@@ -62,10 +62,11 @@ 
 	public function validateUser($username,$password)
 	{
 		$db=$this->Application->getModule('data');
-		if(($userRecord=$db->queryUserByName($username))!==null)
-			return $userRecord->Password===md5($password) && $userRecord->Status===UserRecord::STATUS_NORMAL;
-		else
-			return false;
+		if(($userRecord=$db->queryUserByName($username))!==null) {
+					return $userRecord->Password===md5($password) && $userRecord->Status===UserRecord::STATUS_NORMAL;
+		} else {
+					return false;
+		}
 	}
 
 	/**

demos/blog/protected/Pages/SearchPost.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
 		return $limit;
 	}
 
+	/**
+	 * @param integer $newOffset
+	 */
 	private function formUrl($newOffset)
 	{
 		$gets=array();

Braces +18 added lines, -12 removed lines

@@ -20,15 +20,17 @@ 
 
 	private function getPageOffset()
 	{
-		if(($offset=TPropertyValue::ensureInteger($this->Request['offset']))<=0)
-			$offset=0;
+		if(($offset=TPropertyValue::ensureInteger($this->Request['offset']))<=0) {
+					$offset=0;
+		}
 		return $offset;
 	}
 
 	private function getPageSize()
 	{
-		if(($limit=TPropertyValue::ensureInteger($this->Request['limit']))<=0)
-			$limit=TPropertyValue::ensureInteger($this->Application->Parameters['PostPerPage']);
+		if(($limit=TPropertyValue::ensureInteger($this->Request['limit']))<=0) {
+					$limit=TPropertyValue::ensureInteger($this->Application->Parameters['PostPerPage']);
+		}
 		return $limit;
 	}
 
@@ -36,12 +38,15 @@ 
 	{
 		$gets=array();
 		$gets['offset']=$newOffset;
-		if($this->Request['limit']!==null)
-			$gets['limit']=$this->Request['limit'];
-		if($this->Request['time']!==null)
-			$gets['time']=$this->Request['time'];
-		if($this->Request['cat']!==null)
-			$gets['cat']=$this->Request['cat'];
+		if($this->Request['limit']!==null) {
+					$gets['limit']=$this->Request['limit'];
+		}
+		if($this->Request['time']!==null) {
+					$gets['time']=$this->Request['time'];
+		}
+		if($this->Request['cat']!==null) {
+					$gets['cat']=$this->Request['cat'];
+		}
 		return $this->Service->constructUrl('Posts.ListPost',$gets);
 	}
 
@@ -52,8 +57,9 @@ 
 		$this->PostList->dataBind();
 		if($this->getPageOffset()>0)
 		{
-			if(($offset=$this->getPageOffset()-$this->getPageSize())<0)
-				$offset=0;
+			if(($offset=$this->getPageOffset()-$this->getPageSize())<0) {
+							$offset=0;
+			}
 			$this->PrevPage->NavigateUrl=$this->formUrl($offset);
 			$this->PrevPage->Visible=true;
 		}