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

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

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

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)

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

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;

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

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

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