pradosoft / prado

framework/PradoBase.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR',dirname(__FILE__));
 /**
- * Defines the default permission for writable directories and files
- */
+	 * Defines the default permission for writable directories and files
+	 */
 if(!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD',0777);
 

Doc Comments +2 added lines, -1 removed lines

@@ -210,7 +210,7 @@ 
 	 * module of the Prado application to handle the exception.
 	 * If the application or the module does not exist, it simply echoes the
 	 * exception.
-	 * @param Exception exception that is not caught
+	 * @param Exception TPhpErrorException that is not caught
 	 */
 	public static function exceptionHandler($exception)
 	{
@@ -232,6 +232,7 @@ 
 	 * will cause the throw of an exception.
 	 * This method should only be used by framework developers.
 	 * @param TApplication the application instance
+	 * @param TApplication $application
 	 * @throws TInvalidOperationException if this method is invoked twice or more.
 	 */
 	public static function setApplication($application)

Spacing +86 added lines, -86 removed lines

@@ -29,7 +29,7 @@ 
  * Defines the default permission for writable directories and files
  */
 if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+	define('PRADO_CHMOD', 0777);
 
 /**
  * PradoBase class.
@@ -73,7 +73,7 @@ 
 	/**
 	 * @var array list of class exists checks
 	 */
-	protected static $classExists = array();
+	protected static $classExists=array();
 	/**
 	 * @var Autoloader instance
 	 */
@@ -97,13 +97,13 @@ 
 	 */
 	public static function initAutoloader()
 	{
-		$autoloadPaths = array(
-			__DIR__ . '/../../../autoload.php', // prado as dependency
-			__DIR__ . '/../vendor/autoload.php', // prado itself
+		$autoloadPaths=array(
+			__DIR__.'/../../../autoload.php', // prado as dependency
+			__DIR__.'/../vendor/autoload.php', // prado itself
 		);
 		foreach($autoloadPaths as $autoloadPath)
 			if(file_exists($autoloadPath)) {
-				self::$_loader = $autoloadPath;
+				self::$_loader=$autoloadPath;
 				break;
 			}
 
@@ -120,15 +120,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(array('\Prado\PradoBase','phpErrorHandler'));
+		set_error_handler(array('\Prado\PradoBase', 'phpErrorHandler'));
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(array('PradoBase','phpFatalErrorHandler'));
+		register_shutdown_function(array('PradoBase', 'phpFatalErrorHandler'));
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(array('\Prado\PradoBase','exceptionHandler'));
+		set_exception_handler(array('\Prado\PradoBase', 'exceptionHandler'));
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -159,11 +159,11 @@ 
 	 */
 	public static function poweredByPrado($logoType=0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
+		$logoName=$logoType==1 ? 'powered2' : 'powered';
 		if(self::$_application!==null)
 		{
 			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName,'.gif'));
+			$url=$am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName, '.gif'));
 		}
 		else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
@@ -180,10 +180,10 @@ 
 	 * @param string the filename that the error was raised in
 	 * @param integer the line number the error was raised at
 	 */
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
 		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
 	/**
@@ -194,12 +194,12 @@ 
 	 */
 	public static function phpFatalErrorHandler()
 	{
-		$error = error_get_last();
+		$error=error_get_last();
 		if($error && 
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
-			self::exceptionHandler(new TPhpErrorException($error['type'],$error['message'],$error['file'],$error['line']));
+			self::exceptionHandler(new TPhpErrorException($error['type'], $error['message'], $error['file'], $error['line']));
 		}
 	}
 
@@ -216,7 +216,7 @@ 
 	{
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -265,7 +265,7 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if(substr($type, 0, 6) === 'System')
+		if(substr($type, 0, 6)==='System')
 			$type='Prado'.substr($type, 6);
 
 		return str_replace('.', '\\', $type);
@@ -286,14 +286,14 @@ 
 	 */
 	public static function createComponent($requestedType)
 	{
-		$type = static::prado3NamespaceToPhpNamespace($requestedType);
+		$type=static::prado3NamespaceToPhpNamespace($requestedType);
 
 		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 
-		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			static::using($type);
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 		}
 
 		/*
@@ -302,12 +302,12 @@ 
 		 * code expects the class not to be php5.3-namespaced (eg: MyDataModule instead of
 		 * \Application\Common\MyDataModule)
 		 */
-		if( ($pos = strrpos($type, '\\')) !== false & ($requestedType != $type))
-			$type = substr($type,$pos+1);
+		if(($pos=strrpos($type, '\\'))!==false & ($requestedType!=$type))
+			$type=substr($type, $pos + 1);
 
-		if(($n=func_num_args())>1)
+		if(($n=func_num_args()) > 1)
 		{
-			$args = func_get_args();
+			$args=func_get_args();
 			switch($n) {
 				case 2:
 					return new $type($args[1]);
@@ -323,7 +323,7 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
+					for($i=2; $i < $n; ++$i)
 						$s.=",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -343,21 +343,21 @@ 
 	 * @param boolean whether to check the existence of the class after the class file is included
 	 * @throws TInvalidDataValueException if the namespace is invalid
 	 */
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence=true)
 	{
-		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
+		$namespace=static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
-		if(($pos=strrpos($namespace,'\\'))===false)
+		if(($pos=strrpos($namespace, '\\'))===false)
 		{
 			// trying to autoload an old class name
 			foreach(self::$_usings as $k => $v)
 			{
-				$path = $v . DIRECTORY_SEPARATOR . $namespace . self::CLASS_FILE_EXT;
+				$path=$v.DIRECTORY_SEPARATOR.$namespace.self::CLASS_FILE_EXT;
 				if(file_exists($path))
 				{
-					$phpNamespace = '\\'. $k.'\\'.$namespace;
+					$phpNamespace='\\'.$k.'\\'.$namespace;
 					if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 					{
 						if(!class_exists($namespace) && !interface_exists($namespace))
@@ -367,12 +367,12 @@ 
 				}
 			}
 
-			if($checkClassExistence && !class_exists($namespace,false) && !interface_exists($namespace,false))
-				throw new TInvalidOperationException('prado_component_unknown',$namespace,'');
+			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
+				throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
 		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		else if(($path=self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT))!==null)
 		{
-			$className=substr($namespace,$pos+1);
+			$className=substr($namespace, $pos + 1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)]=$path;
@@ -380,7 +380,7 @@ 
 			else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || (!class_exists($className,false) && !interface_exists($className, false)))
+				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
 				{
 					try
 					{
@@ -390,8 +390,8 @@ 
 					}
 					catch(\Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -414,9 +414,9 @@ 
 	 */
 	public static function getPathOfNamespace($namespace, $ext='')
 	{
-		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
+		$namespace=static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if(self::CLASS_FILE_EXT===$ext || empty($ext))
 		{
 			if(isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
@@ -425,11 +425,11 @@ 
 				return self::$_aliases[$namespace];
 		}
 
-		$segs = explode('\\',$namespace);
-		$alias = array_shift($segs);
+		$segs=explode('\\', $namespace);
+		$alias=array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if(null!==($file=array_pop($segs)) && null!==($root=self::getPathOfAlias($alias)))
+			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $segs), '/\\').(($file==='*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
 
 		return null;
 	}
@@ -440,7 +440,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ? self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -454,19 +454,19 @@ 
 	 * @throws TInvalidOperationException if the alias is already defined
 	 * @throws TInvalidDataValueException if the path is not a valid file path
 	 */
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
 		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
 		else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
+			if(strpos($alias, '.')===false)
 				self::$_aliases[$alias]=$rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -491,13 +491,13 @@ 
 				continue;
 			echo '#'.$index.' ';
 			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
+				echo basename($t['file']).':'.$t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
 			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
-			echo $t['function'] . '(';
+				echo $t['class'].$t['type'];
+			echo $t['function'].'(';
 			if(isset($t['args']) && sizeof($t['args']) > 0)
 			{
 				$count=0;
@@ -506,25 +506,25 @@ 
 					if(is_string($item))
 					{
 						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+						if(strlen($item) > 70)
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
-					else if (is_int($item) || is_float($item))
+					else if(is_int($item) || is_float($item))
 						echo $item;
-					else if (is_object($item))
+					else if(is_object($item))
 						echo get_class($item);
-					else if (is_array($item))
-						echo 'array(' . count($item) . ')';
-					else if (is_bool($item))
+					else if(is_array($item))
+						echo 'array('.count($item).')';
+					else if(is_bool($item))
 						echo $item ? 'true' : 'false';
-					else if ($item === null)
+					else if($item===null)
 						echo 'NULL';
-					else if (is_resource($item))
+					else if(is_resource($item))
 						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
+					if(count($t['args']) > $count)
 						echo ', ';
 				}
 			}
@@ -551,10 +551,10 @@ 
 			else
 			{
 				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array=explode(';q=', trim($language));
+					$languages[trim($array[0])]=isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
@@ -575,7 +575,7 @@ 
 		if($language===null)
 		{
 			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
+			$lang=explode('-', $langs[0]);
 			if(empty($lang[0]) || !ctype_alpha($lang[0]))
 				$language='en';
 			else
@@ -596,7 +596,7 @@ 
 	 * @param (string|TControl) control of the message
 	 * @see log, getLogger
 	 */
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
 			return;
@@ -609,7 +609,7 @@ 
 		}
 		else
 			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+		self::log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -624,11 +624,11 @@ 
 	 * @param string category of the message
 	 * @param (string|TControl) control of the message
 	 */
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level=TLogger::INFO, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_logger===null)
 			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -650,9 +650,9 @@ 
 	 * @param boolean whether to syntax highlight the output. Defaults to false.
 	 * @return string the string representation of the variable
 	 */
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth=10, $highlight=false)
 	{
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
 
 	/**
@@ -667,31 +667,31 @@ 
 	 */
 	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
 	{
-		$app = Prado::getApplication()->getGlobalization(false);
+		$app=Prado::getApplication()->getGlobalization(false);
 
-		$params = array();
+		$params=array();
 		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+			$params['{'.$key.'}']=$value;
 
 		//no translation handler provided
-		if($app===null || ($config = $app->getTranslationConfiguration())===null)
+		if($app===null || ($config=$app->getTranslationConfiguration())===null)
 			return strtr($text, $params);
 
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if($catalogue===null)
+			$catalogue=isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
 		//globalization charset
-		$appCharset = $app===null ? '' : $app->getCharset();
+		$appCharset=$app===null ? '' : $app->getCharset();
 
 		//default charset
-		$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+		$defaultCharset=($app===null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if(empty($charset)) $charset=$appCharset;
+		if(empty($charset)) $charset=$defaultCharset;
 
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }

Braces +9 added lines, -18 removed lines

@@ -164,8 +164,7 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName,'.gif'));
-		}
-		else
+		} else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
@@ -217,8 +216,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -329,8 +327,7 @@ 
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 
@@ -369,15 +366,13 @@ 
 
 			if($checkClassExistence && !class_exists($namespace,false) && !interface_exists($namespace,false))
 				throw new TInvalidOperationException('prado_component_unknown',$namespace,'');
-		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		} else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
 		{
 			$className=substr($namespace,$pos+1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)]=$path;
-			}
-			else  // a file
+			} else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || (!class_exists($className,false) && !interface_exists($className, false)))
@@ -387,8 +382,7 @@ 
 						include_once($path);
 						if(class_exists($namespace, false) || interface_exists($namespace, false))
 							class_alias($namespace, $className, true);
-					}
-					catch(\Exception $e)
+					} catch(\Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className,false))
 							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
@@ -464,8 +458,7 @@ 
 				self::$_aliases[$alias]=$rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 
@@ -510,8 +503,7 @@ 
 							echo "'". substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					else if (is_int($item) || is_float($item))
+					} else if (is_int($item) || is_float($item))
 						echo $item;
 					else if (is_object($item))
 						echo get_class($item);
@@ -606,8 +598,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level=TLogger::DEBUG;
-		}
-		else
+		} else
 			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}

framework/Web/UI/ActiveControls/TActiveDataGrid.php

Indentation +4 added lines, -4 removed lines

@@ -68,9 +68,9 @@ 
 	}
 
 	/**
-	* Creates a new callback control, sets the adapter to
-	* TActiveControlAdapter.
-	*/
+	 * Creates a new callback control, sets the adapter to
+	 * TActiveControlAdapter.
+	 */
 	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
@@ -111,7 +111,7 @@ 
 	 * @param string $value container tag
 	 */
 	public function setSurroundingTag($value) {
-    $this->_surroundingTag=TPropertyValue::ensureString($value);
+	$this->_surroundingTag=TPropertyValue::ensureString($value);
 	}
 
 	/**

Spacing +6 added lines, -6 removed lines

@@ -89,7 +89,7 @@ 
 		parent::setDataSource($value);
 		if($this->getActiveControl()->canUpdateClientSide()) {
 			$this->renderPager();
-			$this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+			$this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
 		}
 	}
 
@@ -131,7 +131,7 @@ 
 	 * @param string CommandParameter corresponding to the OnCommand event of the button
 	 * @return mixed the button instance
 	 */
-	protected function createPagerButton($pager,$buttonType,$enabled,$text,$commandName,$commandParameter) {
+	protected function createPagerButton($pager, $buttonType, $enabled, $text, $commandName, $commandParameter) {
 		if($buttonType===TDataGridPagerButtonType::LinkButton) {
 			if($enabled)
 				$button=new TActiveLinkButton;
@@ -174,10 +174,10 @@ 
 	public function render($writer) {
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
-			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
+			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(), $writer);
 		}
 		else {
-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 		}
 	}
 
@@ -191,7 +191,7 @@ 
 		foreach($pager as $item) {
 			if($item->ControlToPaginate==$this->ID) {
 				$writer=$this->getResponse()->createHtmlWriter();
-				$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+				$this->getPage()->getAdapter()->registerControlToRender($item, $writer);
 			}
 		}
 	}
@@ -203,7 +203,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 */
 	private function renderDataGrid($writer) {
-	  $writer->addAttribute('id',$this->getSurroundingTagID());
+	  $writer->addAttribute('id', $this->getSurroundingTagID());
 	  $writer->renderBeginTag($this->getSurroundingTag());
 		parent::render($writer);
 		$writer->renderEndTag();

Braces +2 added lines, -4 removed lines

@@ -140,8 +140,7 @@ 
 				$button->setText($text);
 				return $button;
 			}
-		}
-		else {
+		} else {
 			$button=new TActiveButton;
 			if(!$enabled)
 				$button->setEnabled(false);
@@ -175,8 +174,7 @@ 
 		if($this->getHasPreRendered()) {
 			$this->renderDataGrid($writer);
 			if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getSurroundingTagId(),$writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
 		}
 	}

framework/Collections/TAttributeCollection.php

Doc Comments +2 added lines

@@ -93,6 +93,7 @@ 
 
 	/**
 	 * @param boolean whether the keys are case-sensitive.
+	 * @param boolean $value
 	 */
 	public function setCaseSensitive($value)
 	{
@@ -126,6 +127,7 @@ 
 	 * Removes an item from the map by its key.
 	 * This overrides the parent implementation by converting the key to lower case first if CaseSensitive is false.
 	 * @param mixed the key of the item to be removed
+	 * @param string $key
 	 * @return mixed the removed value, null if no such key exists.
 	 */
 	public function remove($key)

Spacing +10 added lines, -10 removed lines

@@ -53,8 +53,8 @@ 
 	protected function __getZappableSleepProps(&$exprops)
 	{
 		parent::__getZappableSleepProps($exprops);
-		if ($this->_caseSensitive===false)
-			$exprops[] = "\0TAttributeCollection\0_caseSensitive";
+		if($this->_caseSensitive===false)
+			$exprops[]="\0TAttributeCollection\0_caseSensitive";
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 * @param mixed the property value or event handler
 	 * @throws TInvalidOperationException If the property is not defined or read-only.
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		$this->add($name,$value);
+		$this->add($name, $value);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -117,9 +117,9 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key),$value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**

framework/I18N/TGlobalization.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	}
 
 	/**
-	 * @return string default culture
+	 * @return boolean default culture
 	 */
 	public function getTranslateDefaultCulture()
 	{

Spacing +28 added lines, -28 removed lines

@@ -29,13 +29,13 @@ 
 	 * Default character set is 'UTF-8'.
 	 * @var string
 	 */
-	private $_defaultCharset = 'UTF-8';
+	private $_defaultCharset='UTF-8';
 
 	/**
 	 * Default culture is 'en'.
 	 * @var string
 	 */
-	private $_defaultCulture = 'en';
+	private $_defaultCulture='en';
 
 	/**
 	 * The current charset.
@@ -77,11 +77,11 @@ 
 		if($config!==null)
 		{
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+				$translation=isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
-				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$t=$config->getElementByTagName('translation');
+				$translation=($t) ? $t->getAttributes() : null;
 			}
 			if($translation)
 				$this->setTranslationConfiguration($translation);
@@ -102,7 +102,7 @@ 
 	 */
 	public function setTranslateDefaultCulture($value)
 	{
-		$this->_translateDefaultCulture = TPropertyValue::ensureBoolean($value);
+		$this->_translateDefaultCulture=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	public function setDefaultCulture($culture)
 	{
-		$this->_defaultCulture = str_replace('-','_',$culture);
+		$this->_defaultCulture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 */
 	public function setDefaultCharset($charset)
 	{
-		$this->_defaultCharset = $charset;
+		$this->_defaultCharset=$charset;
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->_culture = str_replace('-','_',$culture);
+		$this->_culture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = $charset;
+		$this->_charset=$charset;
 	}
 
 	/**
@@ -174,7 +174,7 @@ 
 	 */
 	public function getTranslationConfiguration()
 	{
-		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture() == $this->getCulture()))
+		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture()==$this->getCulture()))
 			? null
 			: $this->_translation;
 	}
@@ -196,11 +196,11 @@ 
 	 */
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
+		if($config['type']=='XLIFF' || $config['type']=='gettext')
 		{
 			if($config['source'])
 			{
-				$config['source'] = Prado::getPathOfNamespace($config['source']);
+				$config['source']=Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
 					if(@mkdir($config['source'])===false)
@@ -216,7 +216,7 @@ 
 		}
 		if($config['cache'])
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
+			$config['cache']=$this->getApplication()->getRunTimePath().'/i18n';
 			if(!is_dir($config['cache']))
 			{
 				if(@mkdir($config['cache'])===false)
@@ -225,7 +225,7 @@ 
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
 			}
 		}
-		$this->_translation = $config;
+		$this->_translation=$config;
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 	 */
 	public function setTranslationCatalogue($value)
 	{
-		$this->_translation['catalogue'] = $value;
+		$this->_translation['catalogue']=$value;
 	}
 
 	/**
@@ -252,11 +252,11 @@ 
 	 */
 	public function getCultureVariants($culture=null)
 	{
-		if($culture===null) $culture = $this->getCulture();
-		$variants = explode('_', $culture);
-		$result = array();
+		if($culture===null) $culture=$this->getCulture();
+		$variants=explode('_', $culture);
+		$result=array();
 		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+			$result[]=implode('_', $variants);
 		return $result;
 	}
 
@@ -279,17 +279,17 @@ 
 	 * @param string culture string, null to use current culture
 	 * @return array list of possible localized resource files.
 	 */
-	public function getLocalizedResource($file,$culture=null)
+	public function getLocalizedResource($file, $culture=null)
 	{
-		$files = array();
-		$variants = $this->getCultureVariants($culture);
-		$path = pathinfo($file);
+		$files=array();
+		$variants=$this->getCultureVariants($culture);
+		$path=pathinfo($file);
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
-		$filename = substr($path['basename'],0,strrpos($path['basename'],'.'));
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		$filename=substr($path['basename'], 0, strrpos($path['basename'], '.'));
 		foreach($variants as $variant)
-			$files[] = $path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
-		$files[] = $file;
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		$files[]=$file;
 		return $files;
 	}
 

Braces +2 added lines, -4 removed lines

@@ -233,8 +233,7 @@ 
 				$newid=substr($id,$pos+1);
 				if ($control!==null)
 					$control=$control->$newid;
-			}
-			else
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
@@ -296,8 +295,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Security/TSecurityManager.php

Doc Comments +3 added lines, -1 removed lines

@@ -182,7 +182,7 @@ 
 	}
 
 	/**
-	 * @return mixed the algorithm used to encrypt/decrypt data. Defaults to the string 'rijndael-256'.
+	 * @return string the algorithm used to encrypt/decrypt data. Defaults to the string 'rijndael-256'.
 	 */
 	public function getCryptAlgorithm()
 	{
@@ -201,6 +201,7 @@ 
 	/**
 	 * Encrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be encrypted.
+	 * @param string $data
 	 * @return string the encrypted data
 	 * @throws TNotSupportedException if PHP Mcrypt extension is not loaded
 	 */
@@ -220,6 +221,7 @@ 
 	/**
 	 * Decrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be decrypted.
+	 * @param string $data
 	 * @return string the decrypted data
 	 * @throws TNotSupportedException if PHP Mcrypt extension is not loaded
 	 */

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +44 added lines, -44 removed lines

@@ -44,13 +44,13 @@ 
  */
 class TSecurityManager extends \Prado\TModule
 {
-	const STATE_VALIDATION_KEY = 'prado:securitymanager:validationkey';
-	const STATE_ENCRYPTION_KEY = 'prado:securitymanager:encryptionkey';
+	const STATE_VALIDATION_KEY='prado:securitymanager:validationkey';
+	const STATE_ENCRYPTION_KEY='prado:securitymanager:encryptionkey';
 
-	private $_validationKey = null;
-	private $_encryptionKey = null;
-	private $_hashAlgorithm = 'sha1';
-	private $_cryptAlgorithm = 'rijndael-256';
+	private $_validationKey=null;
+	private $_encryptionKey=null;
+	private $_hashAlgorithm='sha1';
+	private $_cryptAlgorithm='rijndael-256';
 	private $_mbstring;
 
 	/**
@@ -69,7 +69,7 @@ 
 	 */
 	protected function generateRandomKey()
 	{
-		return sprintf('%08x%08x%08x%08x',mt_rand(),mt_rand(),mt_rand(),mt_rand());
+		return sprintf('%08x%08x%08x%08x', mt_rand(), mt_rand(), mt_rand(), mt_rand());
 	}
 
 	/**
@@ -78,9 +78,9 @@ 
 	 */
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
-				$this->_validationKey = $this->generateRandomKey();
+		if(null===$this->_validationKey) {
+			if(null===($this->_validationKey=$this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+				$this->_validationKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
 		}
@@ -93,10 +93,10 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 
-		$this->_validationKey = $value;
+		$this->_validationKey=$value;
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 */
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
-				$this->_encryptionKey = $this->generateRandomKey();
+		if(null===$this->_encryptionKey) {
+			if(null===($this->_encryptionKey=$this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+				$this->_encryptionKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
 		}
@@ -120,10 +120,10 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 
-		$this->_encryptionKey = $value;
+		$this->_encryptionKey=$value;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function setValidation($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureEnum($value, 'Prado\\Security\\TSecurityManagerValidationMode');
+		$this->_hashAlgorithm=TPropertyValue::ensureEnum($value, 'Prado\\Security\\TSecurityManagerValidationMode');
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 */
 	public function setHashAlgorithm($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
+		$this->_hashAlgorithm=TPropertyValue::ensureString($value);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 */
 	public function setEncryption($value)
 	{
-		$this->_cryptAlgorithm = $value;
+		$this->_cryptAlgorithm=$value;
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 	 */
 	public function setCryptAlgorithm($value)
 	{
-		$this->_cryptAlgorithm = $value;
+		$this->_cryptAlgorithm=$value;
 	}
 
 	/**
@@ -211,11 +211,11 @@ 
 	public function encrypt($data)
 	{
 		$module=$this->openCryptModule();
-		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
+		$key=$this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
 		srand();
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
+		$iv=mcrypt_create_iv(mcrypt_enc_get_iv_size($module), MCRYPT_RAND);
 		mcrypt_generic_init($module, $key, $iv);
-		$encrypted = $iv.mcrypt_generic($module, $data);
+		$encrypted=$iv.mcrypt_generic($module, $data);
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $encrypted;
@@ -230,11 +230,11 @@ 
 	public function decrypt($data)
 	{
 		$module=$this->openCryptModule();
-		$key = $this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
-		$ivSize = mcrypt_enc_get_iv_size($module);
-		$iv = $this->substr($data, 0, $ivSize);
+		$key=$this->substr(md5($this->getEncryptionKey()), 0, mcrypt_enc_get_key_size($module));
+		$ivSize=mcrypt_enc_get_iv_size($module);
+		$iv=$this->substr($data, 0, $ivSize);
 		mcrypt_generic_init($module, $key, $iv);
-		$decrypted = mdecrypt_generic($module, $this->substr($data, $ivSize, $this->strlen($data)));
+		$decrypted=mdecrypt_generic($module, $this->substr($data, $ivSize, $this->strlen($data)));
 		mcrypt_generic_deinit($module);
 		mcrypt_module_close($module);
 		return $decrypted;
@@ -250,9 +250,9 @@ 
 		if(extension_loaded('mcrypt'))
 		{
 			if(is_array($this->_cryptAlgorithm))
-				$module=@call_user_func_array('mcrypt_module_open',$this->_cryptAlgorithm);
+				$module=@call_user_func_array('mcrypt_module_open', $this->_cryptAlgorithm);
 			else
-				$module=@mcrypt_module_open($this->_cryptAlgorithm,'', MCRYPT_MODE_CBC,'');
+				$module=@mcrypt_module_open($this->_cryptAlgorithm, '', MCRYPT_MODE_CBC, '');
 
 			if($module===false)
 				throw new TNotSupportedException('securitymanager_mcryptextension_initfailed');
@@ -270,7 +270,7 @@ 
 	 */
 	public function hashData($data)
 	{
-		$hmac = $this->computeHMAC($data);
+		$hmac=$this->computeHMAC($data);
 		return $hmac.$data;
 	}
 
@@ -288,9 +288,9 @@ 
 		if($this->strlen($data) < $len)
 			return false;
 
-		$hmac = $this->substr($data, 0, $len);
+		$hmac=$this->substr($data, 0, $len);
 		$data2=$this->substr($data, $len, $this->strlen($data));
-		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
+		return $hmac===$this->computeHMAC($data2) ? $data2 : false;
 	}
 
 	/**
@@ -300,22 +300,22 @@ 
 	 */
 	protected function computeHMAC($data)
 	{
-		$key = $this->getValidationKey();
+		$key=$this->getValidationKey();
 
 		if(function_exists('hash_hmac'))
 			return hash_hmac($this->_hashAlgorithm, $data, $key);
 
-		if(!strcasecmp($this->_hashAlgorithm,'sha1'))
+		if(!strcasecmp($this->_hashAlgorithm, 'sha1'))
 		{
-			$pack = 'H40';
-			$func = 'sha1';
+			$pack='H40';
+			$func='sha1';
 		} else {
-			$pack = 'H32';
-			$func = 'md5';
+			$pack='H32';
+			$func='md5';
 		}
 
-		$key = str_pad($func($key), 64, chr(0));
-		return $func((str_repeat(chr(0x5C), 64) ^ substr($key, 0, 64)) . pack($pack, $func((str_repeat(chr(0x36), 64) ^ substr($key, 0, 64)) . $data)));
+		$key=str_pad($func($key), 64, chr(0));
+		return $func((str_repeat(chr(0x5C), 64) ^ substr($key, 0, 64)).pack($pack, $func((str_repeat(chr(0x36), 64) ^ substr($key, 0, 64)).$data)));
 	}
 
 	/**
@@ -326,7 +326,7 @@ 
 	 */
 	private function strlen($string)
 	{
-		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
+		return $this->_mbstring ? mb_strlen($string, '8bit') : strlen($string);
 	}
 
 	/**
@@ -337,8 +337,8 @@ 
 	 * @param int $length the desired portion length
 	 * @return string the extracted part of string, or FALSE on failure or an empty string.
 	 */
-	private function substr($string,$start,$length)
+	private function substr($string, $start, $length)
 	{
-		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
+		return $this->_mbstring ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
 	}
 }
\ No newline at end of file

framework/Security/TUser.php

Doc Comments +4 added lines

@@ -73,6 +73,7 @@ 
 
 	/**
 	 * @param string username
+	 * @param string $value
 	 */
 	public function setName($value)
 	{
@@ -89,6 +90,7 @@ 
 
 	/**
 	 * @param boolean if the user is a guest
+	 * @param boolean $value
 	 */
 	public function setIsGuest($value)
 	{
@@ -170,6 +172,7 @@ 
 	 *
 	 * @param string variable name
 	 * @param mixed default value
+	 * @param string $key
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
@@ -190,6 +193,7 @@ 
 	 * @param string variable name
 	 * @param mixed variable value
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
+	 * @param string $key
 	 * @see getState
 	 */
 	protected function setState($key,$value,$defaultValue=null)

Spacing +12 added lines, -12 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getState('Name','');
+		return $this->getState('Name', '');
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->setState('Name',$value,'');
+		$this->setState('Name', $value, '');
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function getIsGuest()
 	{
-		return $this->getState('IsGuest',true);
+		return $this->getState('IsGuest', true);
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles(array());
 		}
-		$this->setState('IsGuest',$isGuest);
+		$this->setState('IsGuest', $isGuest);
 	}
 
 	/**
@@ -105,7 +105,7 @@ 
 	 */
 	public function getRoles()
 	{
-		return $this->getState('Roles',array());
+		return $this->getState('Roles', array());
 	}
 
 	/**
@@ -114,16 +114,16 @@ 
 	public function setRoles($value)
 	{
 		if(is_array($value))
-			$this->setState('Roles',$value,array());
+			$this->setState('Roles', $value, array());
 		else
 		{
 			$roles=array();
-			foreach(explode(',',$value) as $role)
+			foreach(explode(',', $value) as $role)
 			{
 				if(($role=trim($role))!=='')
 					$roles[]=$role;
 			}
-			$this->setState('Roles',$roles,array());
+			$this->setState('Roles', $roles, array());
 		}
 	}
 
@@ -134,7 +134,7 @@ 
 	public function isInRole($role)
 	{
 		foreach($this->getRoles() as $r)
-			if(strcasecmp($role,$r)===0)
+			if(strcasecmp($role, $r)===0)
 				return true;
 		return false;
 	}
@@ -173,9 +173,9 @@ 
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
-	protected function getState($key,$defaultValue=null)
+	protected function getState($key, $defaultValue=null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**
@@ -192,7 +192,7 @@ 
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
 	 * @see getState
 	 */
-	protected function setState($key,$value,$defaultValue=null)
+	protected function setState($key, $value, $defaultValue=null)
 	{
 		if($value===$defaultValue)
 			unset($this->_state[$key]);

framework/Util/TSimpleDateFormatter.php

Doc Comments +9 added lines

@@ -93,6 +93,7 @@ 
 
 	/**
 	 * @param string formatting charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -313,6 +314,7 @@ 
 
 	/**
 	 * Calculate the length of a string, may be consider iconv_strlen?
+	 * @param string $string
 	 */
 	private function length($string)
 	{
@@ -338,6 +340,9 @@ 
 
 	/**
 	 * Returns true if char at position equals a particular char.
+	 * @param string $string
+	 * @param integer $pos
+	 * @param string $char
 	 */
 	private function charEqual($string, $pos, $char)
 	{
@@ -350,6 +355,10 @@ 
 	 * @param int starting position
 	 * @param int minimum integer length
 	 * @param int maximum integer length
+	 * @param string $str
+	 * @param integer $i
+	 * @param integer|null $minlength
+	 * @param integer|null $maxlength
 	 * @return string integer portion of the string, null otherwise
 	 */
 	private function getInteger($str,$i,$minlength,$maxlength)

Braces +4 added lines, -8 removed lines

@@ -225,8 +225,7 @@ 
 			$year = "{$date['year']}";
 			$month = $date['mon'];
 			$day = $date['mday'];
-		}
-		else
+		} else
 		{
 			$year = null;
 			$month = null;
@@ -262,8 +261,7 @@ 
 						$year = $iYear + 2000;
 				}
 				$year = (int)$year;
-			}
-			elseif($token=='MM' || $token=='M')
+			} elseif($token=='MM' || $token=='M')
 			{
 				$month=$this->getInteger($value,$i_val,
 									$this->length($token),2);
@@ -273,8 +271,7 @@ 
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
 				$month = $iMonth;
-			}
-			elseif ($token=='dd' || $token=='d')
+			} elseif ($token=='dd' || $token=='d')
 			{
 				$day = $this->getInteger($value,$i_val,
 									$this->length($token), 2);
@@ -284,8 +281,7 @@ 
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
 				$day = $iDay;
-			}
-			else
+			} else
 			{
 				if($this->substring($value, $i_val, $this->length($token)) != $token)
 					return null;

Spacing +76 added lines, -76 removed lines

@@ -54,7 +54,7 @@ 
 	 * Charset, default is 'UTF-8'
 	 * @var string
 	 */
-	private $charset = 'UTF-8';
+	private $charset='UTF-8';
 
 	/**
 	 * Constructor, create a new date time formatter.
@@ -80,7 +80,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->pattern = $pattern;
+		$this->pattern=$pattern;
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -106,17 +106,17 @@ 
 	 */
 	public function format($value)
 	{
-		$date = $this->getDate($value);
-		$bits['yyyy'] = $date['year'];
-		$bits['yy'] = substr("{$date['year']}", -2);
+		$date=$this->getDate($value);
+		$bits['yyyy']=$date['year'];
+		$bits['yy']=substr("{$date['year']}", -2);
 
-		$bits['MM'] = str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
-		$bits['M'] = $date['mon'];
+		$bits['MM']=str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
+		$bits['M']=$date['mon'];
 
-		$bits['dd'] = str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
-		$bits['d'] = $date['mday'];
+		$bits['dd']=str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
+		$bits['d']=$date['mday'];
 
-		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		$pattern=preg_replace('/M{3,4}/', 'MM', $this->pattern);
 		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
@@ -153,13 +153,13 @@ 
 
 	public function getDayMonthYearOrdering()
 	{
-		$ordering = array();
-		if(is_int($day= strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month= strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year= strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		$ordering=array();
+		if(is_int($day=strpos($this->pattern, 'd')))
+			$ordering['day']=$day;
+		if(is_int($month=strpos($this->pattern, 'M')))
+			$ordering['month']=$month;
+		if(is_int($year=strpos($this->pattern, 'yy')))
+			$ordering['year']=$year;
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -171,7 +171,7 @@ 
 	 */
 	private function getDate($value)
 	{
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
 		if(is_numeric($value))
 			return $s->getDate($value);
 		else
@@ -183,10 +183,10 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if($value===null) {
 			return false;
 		} else {
-			return $this->parse($value, false) !== null;
+			return $this->parse($value, false)!==null;
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 	 * @return int date time stamp
 	 * @throws TInvalidDataValueException if date string is malformed.
 	 */
-	public function parse($value,$defaultToCurrentTime=true)
+	public function parse($value, $defaultToCurrentTime=true)
 	{
 		if(is_int($value) || is_float($value))
 			return $value;
@@ -205,108 +205,108 @@ 
 
 		if(empty($this->pattern)) return time();
 
-		$date = time();
+		$date=time();
 
 		if($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
-		$pattern = $this->pattern;
+		$pattern=$this->pattern;
 
-		$i_val = 0;
-		$i_format = 0;
-		$pattern_length = $this->length($pattern);
-		$c = '';
+		$i_val=0;
+		$i_format=0;
+		$pattern_length=$this->length($pattern);
+		$c='';
 		$token='';
 		$x=null; $y=null;
 
 
 		if($defaultToCurrentTime)
 		{
-			$year = "{$date['year']}";
-			$month = $date['mon'];
-			$day = $date['mday'];
+			$year="{$date['year']}";
+			$month=$date['mon'];
+			$day=$date['mday'];
 		}
 		else
 		{
-			$year = null;
-			$month = null;
-			$day = null;
+			$year=null;
+			$month=null;
+			$day=null;
 		}
 
-		while ($i_format < $pattern_length)
+		while($i_format < $pattern_length)
 		{
-			$c = $this->charAt($pattern,$i_format);
+			$c=$this->charAt($pattern, $i_format);
 			$token='';
-			while ($this->charEqual($pattern, $i_format, $c)
+			while($this->charEqual($pattern, $i_format, $c)
 						&& ($i_format < $pattern_length))
 			{
-				$token .= $this->charAt($pattern, $i_format++);
+				$token.=$this->charAt($pattern, $i_format++);
 			}
 
-			if ($token=='yyyy' || $token=='yy' || $token=='y')
+			if($token=='yyyy' || $token=='yy' || $token=='y')
 			{
-				if ($token=='yyyy') { $x=4;$y=4; }
-				if ($token=='yy')   { $x=2;$y=2; }
-				if ($token=='y')    { $x=2;$y=4; }
-				$year = $this->getInteger($value,$i_val,$x,$y);
-				if($year === null)
+				if($token=='yyyy') { $x=4; $y=4; }
+				if($token=='yy') { $x=2; $y=2; }
+				if($token=='y') { $x=2; $y=4; }
+				$year=$this->getInteger($value, $i_val, $x, $y);
+				if($year===null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
-				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				$i_val+=strlen($year);
+				if(strlen($year)==2)
 				{
-					$iYear = (int)$year;
+					$iYear=(int) $year;
 					if($iYear > 70)
-						$year = $iYear + 1900;
+						$year=$iYear + 1900;
 					else
-						$year = $iYear + 2000;
+						$year=$iYear + 2000;
 				}
-				$year = (int)$year;
+				$year=(int) $year;
 			}
 			elseif($token=='MM' || $token=='M')
 			{
-				$month=$this->getInteger($value,$i_val,
-									$this->length($token),2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12 )
+				$month=$this->getInteger($value, $i_val,
+									$this->length($token), 2);
+				$iMonth=(int) $month;
+				if($month===null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
-				$i_val += strlen($month);
-				$month = $iMonth;
+				$i_val+=strlen($month);
+				$month=$iMonth;
 			}
-			elseif ($token=='dd' || $token=='d')
+			elseif($token=='dd' || $token=='d')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day=$this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay >31)
+				$iDay=(int) $day;
+				if($day===null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
-				$i_val += strlen($day);
-				$day = $iDay;
+				$i_val+=strlen($day);
+				$day=$iDay;
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if($this->substring($value, $i_val, $this->length($token))!=$token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
-					$i_val += $this->length($token);
+					$i_val+=$this->length($token);
 			}
 		}
-		if ($i_val != $this->length($value))
+		if($i_val!=$this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if(!$defaultToCurrentTime && ($month===null || $day===null || $year===null))
 			return null;
 		else
 		{
 			if(empty($year)) {
-				$year = date('Y');
+				$year=date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
+			$day=(int) $day <= 0 ? 1 : (int) $day;
+			$month=(int) $month <= 0 ? 1 : (int) $month;
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
 			return $s->getTimeStamp(0, 0, 0, $month, $day, $year);
 		}
 	}
@@ -341,7 +341,7 @@ 
 	 */
 	private function charEqual($string, $pos, $char)
 	{
-		return $this->charAt($string, $pos) == $char;
+		return $this->charAt($string, $pos)==$char;
 	}
 
 	/**
@@ -352,15 +352,15 @@ 
 	 * @param int maximum integer length
 	 * @return string integer portion of the string, null otherwise
 	 */
-	private function getInteger($str,$i,$minlength,$maxlength)
+	private function getInteger($str, $i, $minlength, $maxlength)
 	{
 		//match for digits backwards
-		for ($x = $maxlength; $x >= $minlength; $x--)
+		for($x=$maxlength; $x >= $minlength; $x--)
 		{
-			$token= $this->substring($str, $i,$x);
-			if ($this->length($token) < $minlength)
+			$token=$this->substring($str, $i, $x);
+			if($this->length($token) < $minlength)
 				return null;
-			if (preg_match('/^\d+$/', $token))
+			if(preg_match('/^\d+$/', $token))
 				return $token;
 		}
 		return null;

framework/Web/TAssetManager.php

Doc Comments +9 added lines

@@ -215,6 +215,7 @@ 
 	 * This method does not perform any publishing. It merely tells you
 	 * if the file path is published, what the URL will be to access it.
 	 * @param string directory or file path being published
+	 * @param string $path
 	 * @return string the published URL for the file path
 	 */
 	public function getPublishedUrl($path)
@@ -230,6 +231,7 @@ 
 	 * Generate a CRC32 hash for the directory path. Collisions are higher
 	 * than MD5 but generates a much smaller hash string.
 	 * @param string string to be hashed.
+	 * @param string $dir
 	 * @return string hashed string.
 	 */
 	protected function hash($dir)
@@ -243,6 +245,8 @@ 
 	 * or has an older file modification time.
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
+	 * @param string $src
+	 * @param string $dst
 	 */
 	protected function copyFile($src,$dst)
 	{
@@ -265,6 +269,8 @@ 
 	 * File modification time is used to ensure the copied files are latest.
 	 * @param string the source directory
 	 * @param string the destination directory
+	 * @param string $src
+	 * @param string $dst
 	 * @todo a generic solution to ignore certain directories and files
 	 */
 	public function copyDirectory($src,$dst)
@@ -306,6 +312,8 @@ 
 	 * @param string tar filename
 	 * @param string MD5 checksum for the corresponding tar file.
 	 * @param boolean Wether or not to check the time stamp of the file for publishing. Defaults to false.
+	 * @param string $tarfile
+	 * @param string $md5sum
 	 * @return string URL path to the directory where the tar file was extracted.
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
@@ -336,6 +344,7 @@ 
 	 * N.B Tar file must not be compressed.
 	 * @param string tar file
 	 * @param string path where the contents of tar file are to be extracted
+	 * @param string $destination
 	 * @return boolean true if extract successful, false otherwise.
 	 */
 	protected function deployTarFile($path,$destination)

Braces +2 added lines, -4 removed lines

@@ -163,8 +163,7 @@ 
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath,$dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
-		}
-		else
+		} else
 		{
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
@@ -287,8 +286,7 @@ 
 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);

Spacing +26 added lines, -26 removed lines

@@ -82,9 +82,9 @@ 
 		if($this->_basePath===null)
 			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
 		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
+			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
 		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
 		$this->_initialized=true;
 	}
@@ -111,7 +111,7 @@ 
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
 			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
 
@@ -132,7 +132,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -149,19 +149,19 @@ 
 	 * @throws TInvalidDataValueException if the file path to be published is
 	 * invalid
 	 */
-	public function publishFilePath($path,$checkTimestamp=false)
+	public function publishFilePath($path, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$path]))
 			return $this->_published[$path];
 		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
+			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
 		else if(is_file($fullpath))
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
+				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
@@ -169,8 +169,8 @@ 
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				Prado::trace("Publishing directory $fullpath",'System.Web.UI.TAssetManager');
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				Prado::trace("Publishing directory $fullpath", 'System.Web.UI.TAssetManager');
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
@@ -191,7 +191,7 @@ 
 	 */
 	protected function setPublished($values=array())
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
 	 */
-	protected function copyFile($src,$dst)
+	protected function copyFile($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -252,10 +252,10 @@ 
 			@chmod($dst, PRADO_CHMOD);
 		}
 		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
-		if(@filemtime($dstFile)<@filemtime($src))
+		if(@filemtime($dstFile) < @filemtime($src))
 		{
-			Prado::trace("Publishing file $src to $dstFile",'System.Web.TAssetManager');
-			@copy($src,$dstFile);
+			Prado::trace("Publishing file $src to $dstFile", 'System.Web.TAssetManager');
+			@copy($src, $dstFile);
 		}
 	}
 
@@ -267,7 +267,7 @@ 
 	 * @param string the destination directory
 	 * @todo a generic solution to ignore certain directories and files
 	 */
-	public function copyDirectory($src,$dst)
+	public function copyDirectory($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -282,14 +282,14 @@ 
 					continue;
 				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -313,7 +313,7 @@ 
 		if(isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
 		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
 			$dir=$this->hash(dirname($fullpath));
@@ -321,10 +321,10 @@ 
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName)<@filemtime($fullpath))
+				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
-					$this->copyFile($fullpath,$dst);
-					$this->deployTarFile($tarfile,$dst);
+					$this->copyFile($fullpath, $dst);
+					$this->deployTarFile($tarfile, $dst);
 				}
 			}
 			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
@@ -338,14 +338,14 @@ 
 	 * @param string path where the contents of tar file are to be extracted
 	 * @return boolean true if extract successful, false otherwise.
 	 */
-	protected function deployTarFile($path,$destination)
+	protected function deployTarFile($path, $destination)
 	{
 		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
+			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
-			$tar = new TTarFileExtractor($fullpath);
+			$tar=new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);
 		}
 	}

framework/Data/DataGateway/TTableGateway.php

Braces +1 added lines, -2 removed lines

@@ -416,8 +416,7 @@
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
-		}
-		else if($criteria instanceof TSqlCriteria)
+		} else if($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			throw new TDbException('dbtablegateway_invalid_criteria');

Spacing +38 added lines, -38 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param string|TDbTableInfo table or view name or table information.
 	 * @param TDbConnection database connection.
 	 */
-	public function __construct($table,$connection)
+	public function __construct($table, $connection)
 	{
 		$this->_connection=$connection;
 		if(is_string($table))
@@ -103,7 +103,7 @@ 
 	 */
 	protected function setTableInfo($tableInfo)
 	{
-		$builder = $tableInfo->createCommandBuilder($this->getDbConnection());
+		$builder=$tableInfo->createCommandBuilder($this->getDbConnection());
 		$this->initCommandBuilder($builder);
 	}
 
@@ -114,7 +114,7 @@ 
 	protected function setTableName($tableName)
 	{
 		Prado::using('System.Data.Common.TDbMetaData');
-		$meta = TDbMetaData::getInstance($this->getDbConnection());
+		$meta=TDbMetaData::getInstance($this->getDbConnection());
 		$this->initCommandBuilder($meta->createCommandBuilder($tableName));
 	}
 
@@ -133,9 +133,9 @@ 
 	 */
 	protected function initCommandBuilder($builder)
 	{
-		$this->_command = new TDataGatewayCommand($builder);
-		$this->_command->OnCreateCommand[] = array($this, 'onCreateCommand');
-		$this->_command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
+		$this->_command=new TDataGatewayCommand($builder);
+		$this->_command->OnCreateCommand[]=array($this, 'onCreateCommand');
+		$this->_command->OnExecuteCommand[]=array($this, 'onExecuteCommand');
 	}
 
 	/**
@@ -189,8 +189,8 @@ 
 	 */
 	public function findBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findBySql($criteria);
 	}
 
@@ -202,8 +202,8 @@ 
 	 */
 	public function findAllBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findAllBySql($criteria);
 	}
 
@@ -226,8 +226,8 @@ 
 	 */
 	public function find($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->find($criteria);
 	}
 
@@ -239,9 +239,9 @@ 
 	 */
 	public function findAll($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->findAll($criteria);
 	}
 
@@ -260,7 +260,7 @@ 
 	public function findByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findByPk($keys);
 	}
 
@@ -284,7 +284,7 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findAllByPk($keys);
 	}
 
@@ -301,8 +301,8 @@ 
 	 */
 	public function deleteAll($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->delete($criteria);
 	}
 
@@ -332,7 +332,7 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->deleteByPk($keys);
 	}
 
@@ -342,7 +342,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 
@@ -352,11 +352,11 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria=null,$parameters=array())
+	public function count($criteria=null, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
 		if($criteria!==null)
-			$criteria = $this->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->count($criteria);
 	}
 
@@ -376,8 +376,8 @@ 
 	 */
 	public function update($data, $criteria, $parameters=array())
 	{
-		$args = func_num_args() > 2 ? array_slice(func_get_args(),2) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 2 ? array_slice(func_get_args(), 2) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->update($data, $criteria);
 	}
 
@@ -414,8 +414,8 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
-			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
+			$useArgs=!is_array($parameters) && is_array($args);
+			return new TSqlCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		else if($criteria instanceof TSqlCriteria)
 			return $criteria;
@@ -452,21 +452,21 @@ 
 	 * @return mixed single record if method name starts with "findBy", 0 or more records
 	 * if method name starts with "findAllBy"
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
-		$delete =false;
-		if($findOne = substr(strtolower($method),0,6)==='findby')
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(substr(strtolower($method),0,9)==='findallby')
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete = substr(strtolower($method),0,8)==='deleteby')
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete = substr(strtolower($method),0,11)==='deleteallby')
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		$delete=false;
+		if($findOne=substr(strtolower($method), 0, 6)==='findby')
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		else if(substr(strtolower($method), 0, 9)==='findallby')
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		else if($delete=substr(strtolower($method), 0, 8)==='deleteby')
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		else if($delete=substr(strtolower($method), 0, 11)==='deleteallby')
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 			return null;
 
-		$criteria = $this->getCommand()->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getCommand()->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else

Doc Comments +5 added lines

@@ -103,6 +103,7 @@ 
 
 	/**
 	 * @param TDbTableInfo table or view information.
+	 * @param TDbTableInfo $tableInfo
 	 */
 	protected function setTableInfo($tableInfo)
 	{
@@ -113,6 +114,7 @@ 
 	/**
 	 * Sets up the command builder for the given table.
 	 * @param string table or view name.
+	 * @param string $tableName
 	 */
 	protected function setTableName($tableName)
 	{
@@ -224,6 +226,7 @@ 
 	 *
 	 * @param string|TSqlCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return array matching record object.
 	 */
 	public function find($criteria, $parameters=array())
@@ -237,6 +240,7 @@ 
 	 * Accepts same parameters as find(), but returns TDbDataReader instead.
 	 * @param string|TSqlCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return TDbDataReader matching records.
 	 */
 	public function findAll($criteria=null, $parameters=array())
@@ -299,6 +303,7 @@ 
 	 * </code>
 	 * @param string delete condition.
 	 * @param array condition parameters.
+	 * @param TSqlCriteria $criteria
 	 * @return integer number of records deleted.
 	 */
 	public function deleteAll($criteria, $parameters=array())