pradosoft / prado

framework/Web/UI/ActiveControls/TActiveLabel.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 
 	/**

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -71,7 +71,7 @@ 
 	 */
 	public function setForControl($value)
 	{
-		if(parent::getForControl() === $value)
+		if(parent::getForControl()===$value)
 			return;
 
 		parent::setForControl($value);
@@ -87,7 +87,7 @@ 
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 }

framework/Web/UI/ActiveControls/TActiveDataList.php

Indentation +27 added lines, -27 removed lines

@@ -31,8 +31,8 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->setAdapter(new TActiveControlAdapter($this));
+	parent::__construct();
+	$this->setAdapter(new TActiveControlAdapter($this));
   }
 
   /**
@@ -40,7 +40,7 @@ 
    */
   public function getActiveControl()
   {
-    return $this->getAdapter()->getBaseActiveControl();
+	return $this->getAdapter()->getBaseActiveControl();
   }
 
   /**
@@ -52,11 +52,11 @@ 
    */
   public function setDataSource($value)
   {
-    parent::setDataSource($value);
-    if($this->getActiveControl()->canUpdateClientSide()) {
-      $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
-    }
+	parent::setDataSource($value);
+	if($this->getActiveControl()->canUpdateClientSide()) {
+	  $this->renderPager();
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+	}
   }
 
   /**
@@ -65,7 +65,7 @@ 
    */
   protected function getContainerID()
   {
-    return $this->ClientID.'_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -76,13 +76,13 @@ 
    */
   public function render($writer)
   {
-    if($this->getHasPreRendered()) {
-      $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-    }
+	if($this->getHasPreRendered()) {
+	  $this->renderDataList($writer);
+	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+	}
+	else {
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+	}
   }
 
   /**
@@ -92,14 +92,14 @@ 
    */
   private function renderPager()
   {
-    $pager=$this->getPage()->findControlsByType('TActivePager', false);
-    foreach($pager as $item)
-    {
-      if($item->ControlToPaginate==$this->ID) {
-        $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
-      }
-    }
+	$pager=$this->getPage()->findControlsByType('TActivePager', false);
+	foreach($pager as $item)
+	{
+	  if($item->ControlToPaginate==$this->ID) {
+		$writer=$this->getResponse()->createHtmlWriter();
+		$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+	  }
+	}
   }
 
   /**
@@ -109,8 +109,8 @@ 
    */
   private function renderDataList($writer)
   {
-    $writer->write('<span id="'.$this->getContainerID().'">');
-    parent::render($writer);
-    $writer->write('</span>');
+	$writer->write('<span id="'.$this->getContainerID().'">');
+	parent::render($writer);
+	$writer->write('</span>');
   }
 }

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
       if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
+    } else {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,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());
     }
   }
 
@@ -78,10 +78,10 @@ 
   {
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
     }
     else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+      $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
     }
   }
 
@@ -97,7 +97,7 @@ 
     {
       if($item->ControlToPaginate==$this->ID) {
         $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+        $this->getPage()->getAdapter()->registerControlToRender($item, $writer);
       }
     }
   }

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Doc Comments +4 added lines, -3 removed lines

@@ -199,7 +199,7 @@ 
 	}
 
 	/**
-	 * @return boolean true to post the inputs of the form on callback, default
+	 * @return string true to post the inputs of the form on callback, default
 	 * is post the inputs on callback.
 	 */
 	public function getPostState()
@@ -217,7 +217,7 @@ 
 	}
 
 	/**
-	 * @return integer callback request timeout.
+	 * @return string callback request timeout.
 	 */
 	public function getRequestTimeOut()
 	{
@@ -261,6 +261,7 @@ 
 	 * update. This will automatically set HasPrority to true.
 	 * @param boolean true enables the callback response to update the
 	 * viewstate.
+	 * @param boolean $value
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
@@ -269,7 +270,7 @@ 
 	}
 
 	/**
-	 * @return boolean client-side viewstate will be updated on callback
+	 * @return boolean|string client-side viewstate will be updated on callback
 	 * response if true. Default is true.
 	 */
 	public function getEnablePageStateUpdate()

Spacing +3 added lines, -3 removed lines

@@ -264,7 +264,7 @@ 
 	 */
 	public function setEnablePageStateUpdate($value)
 	{
-		$enabled = TPropertyValue::ensureBoolean($value);
+		$enabled=TPropertyValue::ensureBoolean($value);
 		$this->setOption('EnablePageStateUpdate', $enabled);
 	}
 
@@ -274,7 +274,7 @@ 
 	 */
 	public function getEnablePageStateUpdate()
 	{
-		$option = $this->getOption('EnablePageStateUpdate');
+		$option=$this->getOption('EnablePageStateUpdate');
 		return ($option===null) ? true : $option;
 	}
 
@@ -292,7 +292,7 @@ 
 	public function setPostBackTarget($value)
 	{
 		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+			$value=$value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}
 

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

@@ -91,9 +91,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;
 	}
@@ -120,7 +120,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);
 		}
 	}
 
@@ -141,7 +141,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -158,19 +158,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
@@ -178,8 +178,8 @@ 
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				Prado::trace("Publishing directory $fullpath",'Prado\Web\TAssetManager');
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				Prado::trace("Publishing directory $fullpath", 'Prado\Web\TAssetManager');
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
@@ -200,7 +200,7 @@ 
 	 */
 	protected function setPublished($values=array())
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -253,7 +253,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))
 		{
@@ -261,10 +261,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",'Prado\Web\TAssetManager');
-			@copy($src,$dstFile);
+			Prado::trace("Publishing file $src to $dstFile", 'Prado\Web\TAssetManager');
+			@copy($src, $dstFile);
 		}
 	}
 
@@ -276,7 +276,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))
 		{
@@ -291,14 +291,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 {
@@ -322,7 +322,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));
@@ -330,10 +330,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;
@@ -347,13 +347,13 @@ 
 	 * @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
 		{
-			$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())