pradosoft / prado

framework/Web/UI/ActiveControls/TActiveLinkButton.php

Spacing +4 added lines, -4 removed lines

@@ -95,7 +95,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -118,7 +118,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		if($this->getEnabled(true))
 		{
@@ -134,7 +134,7 @@ 
 	 */
 	public function setEnabled($value)
 	{
-		if(parent::getEnabled() === $value)
+		if(parent::getEnabled()===$value)
 			return;
 
 		parent::setEnabled($value);
@@ -142,7 +142,7 @@ 
 		{
 			if($this->getEnabled(true))
 			{
-				$nop = "javascript:;//".$this->getClientID();
+				$nop="javascript:;//".$this->getClientID();
 				$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $nop);
 
 				$this->getActiveControl()->registerCallbackClientScript(

framework/Web/UI/ActiveControls/TActiveCheckBox.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -105,8 +105,8 @@ 
 	 */
 	public function setChecked($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
+		$value=TPropertyValue::ensureBoolean($value);
+		if(parent::getChecked()===$value)
 			return;
 
 		parent::setChecked($value);
@@ -132,10 +132,10 @@ 
 	 * @param string checkbox id
 	 * @param string onclick js
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		parent::renderInputTag($writer,$clientID,$onclick);
-		if ($this->getAutoPostBack())
+		parent::renderInputTag($writer, $clientID, $onclick);
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}
@@ -154,8 +154,8 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		$attributes = parent::getLabelAttributes();
-		$attributes['id'] = $this->getDefaultLabelID();
+		$attributes=parent::getLabelAttributes();
+		$attributes['id']=$this->getDefaultLabelID();
 		return $attributes;
 	}
 
@@ -165,7 +165,7 @@ 
 	 * @param string checkbox id
 	 * @param string label text
 	 */
-	protected function renderLabel($writer,$clientID,$text)
+	protected function renderLabel($writer, $clientID, $text)
 	{
 		$writer->addAttribute('id', $this->getDefaultLabelID());
 		parent::renderLabel($writer, $clientID, $text);
@@ -176,7 +176,7 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			return TCheckBox::getLabelAttributes()->itemAt('id');
 		else
 			return $this->getClientID().'_label';

framework/Web/UI/ActiveControls/TActiveImageButton.php

Spacing +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if(parent::getAlternateText()===$value)
 			return;
 
 		parent::setAlternateText($value);
@@ -75,7 +75,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if(parent::getImageAlign()===$value)
 			return;
 
 		parent::setImageAlign($value);
@@ -88,7 +88,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
@@ -101,7 +101,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if(parent::getDescriptionUrl()===$value)
 			return;
 
 		parent::setDescriptionUrl($value);
@@ -151,7 +151,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}

Doc Comments +2 added lines

@@ -48,6 +48,7 @@ 
 	/**
 	 * Sets the alternative text to be displayed in the TImage when the image is unavailable.
 	 * @param string the alternative text
+	 * @param string $value
 	 */
 	public function setAlternateText($value)
 	{
@@ -78,6 +79,7 @@ 
 
 	/**
 	 * @param string the URL of the image file
+	 * @param string $value
 	 */
 	public function setImageUrl($value)
 	{

framework/Web/UI/WebControls/TCheckBoxList.php

Indentation +4 added lines, -4 removed lines

@@ -404,8 +404,8 @@ 
 	{
 	  if ($needSpan=$this->getSpanNeeded())
 	  {
-	    $writer->addAttribute('id', $this->getClientId());
-	    $writer->renderBeginTag('span');
+		$writer->addAttribute('id', $this->getClientId());
+		$writer->renderBeginTag('span');
 	  }
 		if($this->getItemCount()>0)
 		{
@@ -463,14 +463,14 @@ 
 	 */
 	public function getIsValid()
 	{
-	    return $this->_isValid;
+		return $this->_isValid;
 	}
 	/**
 	 * @param bool wether this control is valid.
 	 */
 	public function setIsValid($value)
 	{
-	    $this->_isValid=TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**

Doc Comments +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
 
 	/**
 	 * Creates a control used for repetition (used as a template).
-	 * @return TControl the control to be repeated
+	 * @return TCheckBoxItem the control to be repeated
 	 */
 	protected function createRepeatedControl()
 	{
@@ -71,7 +71,7 @@ 
 	 * This method overrides the parent implementation so that it always returns
 	 * the checkbox list itself (because the checkbox list does not have child controls.)
 	 * @param string control ID
-	 * @return TControl control being found
+	 * @return \Prado\Web\UI\TControl|null control being found
 	 */
 	public function findControl($id, $real=false)
 	{
@@ -145,7 +145,7 @@ 
 	}
 
 	/**
-	 * @return string the direction of traversing the list, defaults to 'Vertical'
+	 * @return TRepeatDirection the direction of traversing the list, defaults to 'Vertical'
 	 */
 	public function getRepeatDirection()
 	{
@@ -161,7 +161,7 @@ 
 	}
 
 	/**
-	 * @return string how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
+	 * @return TRepeatLayout how the list should be displayed, using table or using line breaks. Defaults to 'Table'.
 	 */
 	public function getRepeatLayout()
 	{
@@ -440,7 +440,7 @@ 
 	/**
 	 * Returns the value to be validated.
 	 * This methid is required by \Prado\Web\UI\IValidatable interface.
-	 * @return mixed the value of the property to be validated.
+	 * @return string the value of the property to be validated.
 	 */
 	public function getValidationPropertyValue()
 	{

Spacing +26 added lines, -26 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	public function findControl($id, $real=false)
 	{
-  		if ($real===true)
+  		if($real===true)
   			return parent::findControl($id);
 		return $this;
 	}
@@ -103,7 +103,7 @@ 
 	 */
 	public function getTextAlign()
 	{
-		return $this->getViewState('TextAlign',TTextAlign::Right);
+		return $this->getViewState('TextAlign', TTextAlign::Right);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setTextAlign($value)
 	{
-		$this->setViewState('TextAlign',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TTextAlign'),TTextAlign::Right);
+		$this->setViewState('TextAlign', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TTextAlign'), TTextAlign::Right);
 	}
 
 
@@ -120,10 +120,10 @@ 
 	 */
 	protected function getRepeatInfo()
 	{
-		if(($repeatInfo=$this->getViewState('RepeatInfo',null))===null)
+		if(($repeatInfo=$this->getViewState('RepeatInfo', null))===null)
 		{
 			$repeatInfo=new TRepeatInfo;
-			$this->setViewState('RepeatInfo',$repeatInfo,null);
+			$this->setViewState('RepeatInfo', $repeatInfo, null);
 		}
 		return $repeatInfo;
 	}
@@ -252,7 +252,7 @@ 
 	public function setEnabled($value)
 	{
 		parent::setEnabled($value);
-		$value = !TPropertyValue::ensureBoolean($value);
+		$value=!TPropertyValue::ensureBoolean($value);
 		// if this is an active control,
 		// and it's a callback,
 		// and we can update clientside,
@@ -261,9 +261,9 @@ 
 				$this->getPage()->getIsCallBack() &&
 				$this->getActiveControl()->canUpdateClientSide())
 		{
-			$items = $this->getItems();
-			$cs = $this->getPage()->getCallbackClient();
-			$baseClientID = $this->getClientID().'_c';
+			$items=$this->getItems();
+			$cs=$this->getPage()->getCallbackClient();
+			$baseClientID=$this->getClientID().'_c';
 			foreach($items as $index=>$item)
 			{
 				$cs->setAttribute($baseClientID.$index, 'disabled', $value);
@@ -278,7 +278,7 @@ 
 	 * @param integer index of the item being rendered
 	 * @return null
 	 */
-	public function generateItemStyle($itemType,$index)
+	public function generateItemStyle($itemType, $index)
 	{
 		return null;
 	}
@@ -291,7 +291,7 @@ 
 	 * @param string item type (Header,Footer,Item,AlternatingItem,SelectedItem,EditItem,Separator,Pager)
 	 * @param integer zero-based index of the item in the item list
 	 */
-	public function renderItem($writer,$repeatInfo,$itemType,$index)
+	public function renderItem($writer, $repeatInfo, $itemType, $index)
 	{
 		$repeatedControl=$this->_repeatedControl;
 		$item=$this->getItems()->itemAt($index);
@@ -302,7 +302,7 @@ 
 		$repeatedControl->setID("c$index");
 		$repeatedControl->setText($item->getText());
 		$repeatedControl->setChecked($item->getSelected());
-		$repeatedControl->setAttribute('value',$item->getValue());
+		$repeatedControl->setAttribute('value', $item->getValue());
 		$repeatedControl->setEnabled($this->_isEnabled && $item->getEnabled());
 		$repeatedControl->setEnableClientScript(false);
 		$repeatedControl->renderControl($writer);
@@ -315,13 +315,13 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the control has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
 		if($this->getEnabled(true))
 		{
-			$index=(int)substr($key,strlen($this->getUniqueID())+2);
+			$index=(int) substr($key, strlen($this->getUniqueID()) + 2);
 			$this->ensureDataBound();
-			if($index>=0 && $index<$this->getItemCount())
+			if($index >= 0 && $index < $this->getItemCount())
 			{
 				$item=$this->getItems()->itemAt($index);
 				if($item->getEnabled())
@@ -369,7 +369,7 @@ 
 		$this->_repeatedControl->setValidationGroup($this->getValidationGroup());
 		$page=$this->getPage();
 		$n=$this->getItemCount();
-		for($i=0;$i<$n;++$i)
+		for($i=0; $i < $n; ++$i)
 		{
 			$this->_repeatedControl->setID("c$i");
 			$page->registerRequiresPostData($this->_repeatedControl);
@@ -381,7 +381,7 @@ 
 	 *
 	 *@return boolean true if we need a span
 	 */
-	protected function getSpanNeeded ()
+	protected function getSpanNeeded()
 	{
 		return $this->getRepeatLayout()===TRepeatLayout::Raw;
 	}
@@ -393,12 +393,12 @@ 
 	 */
 	public function render($writer)
 	{
-	  if ($needSpan=$this->getSpanNeeded())
+	  if($needSpan=$this->getSpanNeeded())
 	  {
 	    $writer->addAttribute('id', $this->getClientId());
 	    $writer->renderBeginTag('span');
 	  }
-		if($this->getItemCount()>0)
+		if($this->getItemCount() > 0)
 		{
 			$this->_isEnabled=$this->getEnabled(true);
 			$repeatInfo=$this->getRepeatInfo();
@@ -410,11 +410,11 @@ 
 			$this->setAccessKey('');
 			$this->setTabIndex(0);
 			$this->addAttributesToRender($writer);
-			$repeatInfo->renderRepeater($writer,$this);
+			$repeatInfo->renderRepeater($writer, $this);
 			$this->setAccessKey($accessKey);
 			$this->setTabIndex($tabIndex);
 		}
-		if ($needSpan)
+		if($needSpan)
 		  $writer->renderEndTag();
 
 		//checkbox skipped the client control script in addAttributesToRender
@@ -480,11 +480,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ListName'] = $this->getUniqueID();
-		$options['ItemCount'] = $this->getItemCount();
+		$options['ID']=$this->getClientID();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ListName']=$this->getUniqueID();
+		$options['ItemCount']=$this->getItemCount();
 		return $options;
 	}
 

framework/Web/UI/WebControls/TReCaptcha2Validator.php

Indentation +72 added lines, -72 removed lines

@@ -29,82 +29,82 @@
 
 class TReCaptcha2Validator extends TBaseValidator
 {
-    protected $_isvalid = null;
+	protected $_isvalid = null;
 
-    protected function getClientClassName()
-    {
-        return 'Prado.WebUI.TReCaptcha2Validator';
-    }
-    public function getEnableClientScript()
-    {
-        return true;
-    }
-    protected function getCaptchaControl()
-    {
-        $control = $this->getValidationTarget();
-        if (!$control)
-            throw new Exception('No target control specified for TReCaptcha2Validator');
-        if (!($control instanceof TReCaptcha2))
-            throw new Exception('TReCaptcha2Validator only works with TReCaptcha2 controls');
-        return $control;
-    }
-    public function getClientScriptOptions()
-    {
-        $options = parent::getClientScriptOptions();
-        $options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
-        return $options;
-    }
-    /**
-     * This method overrides the parent's implementation.
-     * The validation succeeds if the input control has the same value
-     * as the one displayed in the corresponding RECAPTCHA control.
-     *
-     * @return boolean whether the validation succeeds
-     */
-    protected function evaluateIsValid()
-    {
-        // check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
-        if (is_null($this->_isvalid))
-        {
-            $control = $this->getCaptchaControl();
-            $this->_isvalid = $control->validate();
-        }
-        return ($this->_isvalid==true);
-    }
-    public function onPreRender($param)
-    {
-        parent::onPreRender($param);
+	protected function getClientClassName()
+	{
+		return 'Prado.WebUI.TReCaptcha2Validator';
+	}
+	public function getEnableClientScript()
+	{
+		return true;
+	}
+	protected function getCaptchaControl()
+	{
+		$control = $this->getValidationTarget();
+		if (!$control)
+			throw new Exception('No target control specified for TReCaptcha2Validator');
+		if (!($control instanceof TReCaptcha2))
+			throw new Exception('TReCaptcha2Validator only works with TReCaptcha2 controls');
+		return $control;
+	}
+	public function getClientScriptOptions()
+	{
+		$options = parent::getClientScriptOptions();
+		$options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
+		return $options;
+	}
+	/**
+	 * This method overrides the parent's implementation.
+	 * The validation succeeds if the input control has the same value
+	 * as the one displayed in the corresponding RECAPTCHA control.
+	 *
+	 * @return boolean whether the validation succeeds
+	 */
+	protected function evaluateIsValid()
+	{
+		// check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
+		if (is_null($this->_isvalid))
+		{
+			$control = $this->getCaptchaControl();
+			$this->_isvalid = $control->validate();
+		}
+		return ($this->_isvalid==true);
+	}
+	public function onPreRender($param)
+	{
+		parent::onPreRender($param);
 
-        $cs = $this->Page->getClientScript();
-        $cs->registerPradoScript('validator');
+		$cs = $this->Page->getClientScript();
+		$cs->registerPradoScript('validator');
 
-        // communicate validation status to the client side
-        $value = $this->_isvalid===false ? '0' : '1';
-        $cs->registerHiddenField($this->getClientID().'_1',$value);
+		// communicate validation status to the client side
+		$value = $this->_isvalid===false ? '0' : '1';
+		$cs->registerHiddenField($this->getClientID().'_1',$value);
 
-        // update validator display
-        if ($control = $this->getValidationTarget())
-        {
-            $fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
+		// update validator display
+		if ($control = $this->getValidationTarget())
+		{
+			$fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
 
-            $cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
-                // this function will be used to update the validator
-                'function '.$fn.'(valid)',
-                '{',
-                '  jQuery('.TJavaScript::quoteString('#'.$this->getClientID().'_1').').val(valid);',
-                '  Prado.Validation.validateControl('.TJavaScript::quoteString($control->ClientID).'); ',
-                '}',
-                '',
-                // update the validator to the result if we're in a callback 
-                // (if we're in initial rendering or a postback then the result will be rendered directly to the page html anyway)
-                $this->Page->IsCallback ? $fn.'('.$value.');' : '',
-                '',
-                // install event handler that clears the validation error when user changes the captcha response field
-                'jQuery("#'.$control->getClientID().'").on("change", '.TJavaScript::quoteString('#'.$control->getResponseFieldName()).', function() { ',
-                    $fn.'("1");',
-                '});',
-            )));
-        }
-    }
+			$cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
+				// this function will be used to update the validator
+				'function '.$fn.'(valid)',
+				'{',
+				'  jQuery('.TJavaScript::quoteString('#'.$this->getClientID().'_1').').val(valid);',
+				'  Prado.Validation.validateControl('.TJavaScript::quoteString($control->ClientID).'); ',
+				'}',
+				'',
+				// update the validator to the result if we're in a callback 
+				// (if we're in initial rendering or a postback then the result will be rendered directly to the page html anyway)
+				$this->Page->IsCallback ? $fn.'('.$value.');' : '',
+				'',
+				// install event handler that clears the validation error when user changes the captcha response field
+				'jQuery("#'.$control->getClientID().'").on("change", '.TJavaScript::quoteString('#'.$control->getResponseFieldName()).', function() { ',
+					$fn.'("1");',
+				'});',
+			)));
+		}
+	}
 }
 

Spacing +15 added lines, -15 removed lines

@@ -29,7 +29,7 @@ 
 
 class TReCaptcha2Validator extends TBaseValidator
 {
-    protected $_isvalid = null;
+    protected $_isvalid=null;
 
     protected function getClientClassName()
     {
@@ -41,17 +41,17 @@ 
     }
     protected function getCaptchaControl()
     {
-        $control = $this->getValidationTarget();
-        if (!$control)
+        $control=$this->getValidationTarget();
+        if(!$control)
             throw new Exception('No target control specified for TReCaptcha2Validator');
-        if (!($control instanceof TReCaptcha2))
+        if(!($control instanceof TReCaptcha2))
             throw new Exception('TReCaptcha2Validator only works with TReCaptcha2 controls');
         return $control;
     }
     public function getClientScriptOptions()
     {
-        $options = parent::getClientScriptOptions();
-        $options['ResponseFieldName'] = $this->getCaptchaControl()->getResponseFieldName();
+        $options=parent::getClientScriptOptions();
+        $options['ResponseFieldName']=$this->getCaptchaControl()->getResponseFieldName();
         return $options;
     }
     /**
@@ -64,10 +64,10 @@ 
     protected function evaluateIsValid()
     {
         // check validity only once (if trying to evaulate multiple times, all redundant checks would fail)
-        if (is_null($this->_isvalid))
+        if(is_null($this->_isvalid))
         {
-            $control = $this->getCaptchaControl();
-            $this->_isvalid = $control->validate();
+            $control=$this->getCaptchaControl();
+            $this->_isvalid=$control->validate();
         }
         return ($this->_isvalid==true);
     }
@@ -75,19 +75,19 @@ 
     {
         parent::onPreRender($param);
 
-        $cs = $this->Page->getClientScript();
+        $cs=$this->Page->getClientScript();
         $cs->registerPradoScript('validator');
 
         // communicate validation status to the client side
-        $value = $this->_isvalid===false ? '0' : '1';
-        $cs->registerHiddenField($this->getClientID().'_1',$value);
+        $value=$this->_isvalid===false ? '0' : '1';
+        $cs->registerHiddenField($this->getClientID().'_1', $value);
 
         // update validator display
-        if ($control = $this->getValidationTarget())
+        if($control=$this->getValidationTarget())
         {
-            $fn = 'captchaUpdateValidatorStatus_'.$this->getClientID();
+            $fn='captchaUpdateValidatorStatus_'.$this->getClientID();
 
-            $cs->registerEndScript($this->getClientID().'::validate', implode(' ',array(
+            $cs->registerEndScript($this->getClientID().'::validate', implode(' ', array(
                 // this function will be used to update the validator
                 'function '.$fn.'(valid)',
                 '{',

framework/Web/UI/WebControls/TStyleSheet.php

Spacing +6 added lines, -6 removed lines

@@ -82,7 +82,7 @@ 
 	 */
 	public function getMediaType()
 	{
-		return $this->getViewState('MediaType','');
+		return $this->getViewState('MediaType', '');
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function setMediaType($value)
 	{
-		$this->setViewState('MediaType',$value,'');
+		$this->setViewState('MediaType', $value, '');
 	}
 
 	/**
@@ -100,17 +100,17 @@ 
 	 */
 	public function onPreRender($param)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 
-		$styles = preg_split('/,|\s+/', $this->getPradoStyles());
+		$styles=preg_split('/,|\s+/', $this->getPradoStyles());
 		foreach($styles as $style)
 		{
-			if(($style = trim($style))!=='')
+			if(($style=trim($style))!=='')
 				$cs->registerPradoStyle($style);
 		}
 
 		if(($url=$this->getStyleSheetUrl())!=='')
-			$cs->registerStyleSheetFile($url,$url,$this->getMediaType());
+			$cs->registerStyleSheetFile($url, $url, $this->getMediaType());
 	}
 
 	/**

framework/Web/UI/WebControls/TStyle.php

Indentation +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 	 */
 	public function __construct($style=null)
 	{
-    parent::__construct();
+	parent::__construct();
 		if($style!==null)
 			$this->copyFrom($style);
 	}

Doc Comments +4 added lines, -1 removed lines

@@ -228,7 +228,7 @@ 
 	}
 
 	/**
-	 * @return TDisplayStyle display style
+	 * @return string display style
 	 */
 	public function getDisplayStyle()
 	{
@@ -285,6 +285,7 @@ 
 	 * Sets custom style fields from a string.
 	 * Custom style fields will be overwritten by style fields explicitly defined.
 	 * @param string the custom style of the control
+	 * @param string $value
 	 */
 	public function setCustomStyle($value)
 	{
@@ -304,6 +305,8 @@ 
 	 * Style fields set by this method will overwrite those set by {@link setCustomStyle}.
 	 * @param string style field name
 	 * @param string style field value
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function setStyleField($name,$value)
 	{

Spacing +32 added lines, -32 removed lines

@@ -53,16 +53,16 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_fields===array())
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_fields";
+		if($this->_fields===array())
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_fields";
 		if($this->_font===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_font";
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_font";
 		if($this->_class===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_class";
-		if ($this->_customStyle===null)
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_customStyle";
-		if ($this->_displayStyle==='Fixed')
-			$exprops[] = "\0Prado\Web\UI\WebControls\TStyle\0_displayStyle";
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_class";
+		if($this->_customStyle===null)
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_customStyle";
+		if($this->_displayStyle==='Fixed')
+			$exprops[]="\0Prado\Web\UI\WebControls\TStyle\0_displayStyle";
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	public function __clone()
 	{
 		if($this->_font!==null)
-			$this->_font = clone($this->_font);
+			$this->_font=clone($this->_font);
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		return isset($this->_fields['background-color'])?$this->_fields['background-color']:'';
+		return isset($this->_fields['background-color']) ? $this->_fields['background-color'] : '';
 	}
 
 	/**
@@ -109,7 +109,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		return isset($this->_fields['border-color'])?$this->_fields['border-color']:'';
+		return isset($this->_fields['border-color']) ? $this->_fields['border-color'] : '';
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		return isset($this->_fields['border-style'])?$this->_fields['border-style']:'';
+		return isset($this->_fields['border-style']) ? $this->_fields['border-style'] : '';
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		return isset($this->_fields['border-width'])?$this->_fields['border-width']:'';
+		return isset($this->_fields['border-width']) ? $this->_fields['border-width'] : '';
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		return $this->_class===null?'':$this->_class;
+		return $this->_class===null ? '' : $this->_class;
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function hasFont()
 	{
-		return $this->_font !== null;
+		return $this->_font!==null;
 	}
 
 	/**
@@ -209,20 +209,20 @@ 
 	 */
 	public function setDisplayStyle($value)
 	{
-		$this->_displayStyle = TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TDisplayStyle');
+		$this->_displayStyle=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TDisplayStyle');
 		switch($this->_displayStyle)
 		{
 			case TDisplayStyle::None:
-				$this->_fields['display'] = 'none';
+				$this->_fields['display']='none';
 				break;
 			case TDisplayStyle::Dynamic:
-				$this->_fields['display'] = ''; //remove the display property
+				$this->_fields['display']=''; //remove the display property
 				break;
 			case TDisplayStyle::Fixed:
-				$this->_fields['visibility'] = 'visible';
+				$this->_fields['visibility']='visible';
 				break;
 			case TDisplayStyle::Hidden:
-				$this->_fields['visibility'] = 'hidden';
+				$this->_fields['visibility']='hidden';
 				break;
 		}
 	}
@@ -240,7 +240,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		return isset($this->_fields['color'])?$this->_fields['color']:'';
+		return isset($this->_fields['color']) ? $this->_fields['color'] : '';
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 */
 	public function getHeight()
 	{
-		return isset($this->_fields['height'])?$this->_fields['height']:'';
+		return isset($this->_fields['height']) ? $this->_fields['height'] : '';
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 	 */
 	public function getCustomStyle()
 	{
-		return $this->_customStyle===null?'':$this->_customStyle;
+		return $this->_customStyle===null ? '' : $this->_customStyle;
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 */
 	public function getStyleField($name)
 	{
-		return isset($this->_fields[$name])?$this->_fields[$name]:'';
+		return isset($this->_fields[$name]) ? $this->_fields[$name] : '';
 	}
 
 	/**
@@ -305,7 +305,7 @@ 
 	 * @param string style field name
 	 * @param string style field value
 	 */
-	public function setStyleField($name,$value)
+	public function setStyleField($name, $value)
 	{
 		$this->_fields[$name]=$value;
 	}
@@ -332,7 +332,7 @@ 
 	 */
 	public function getWidth()
 	{
-		return isset($this->_fields['width'])?$this->_fields['width']:'';
+		return isset($this->_fields['width']) ? $this->_fields['width'] : '';
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($this->_fields,$style->_fields);
+			$this->_fields=array_merge($this->_fields, $style->_fields);
 			if($style->_class!==null)
 				$this->_class=$style->_class;
 			if($style->_customStyle!==null)
@@ -384,7 +384,7 @@ 
 	{
 		if($style instanceof TStyle)
 		{
-			$this->_fields=array_merge($style->_fields,$this->_fields);
+			$this->_fields=array_merge($style->_fields, $this->_fields);
 			if($this->_class===null)
 				$this->_class=$style->_class;
 			if($this->_customStyle===null)
@@ -402,18 +402,18 @@ 
 	{
 		if($this->_customStyle!==null)
 		{
-			foreach(explode(';',$this->_customStyle) as $style)
+			foreach(explode(';', $this->_customStyle) as $style)
 			{
-				$arr=explode(':',$style,2);
+				$arr=explode(':', $style, 2);
 				if(isset($arr[1]) && trim($arr[0])!=='')
-					$writer->addStyleAttribute(trim($arr[0]),trim($arr[1]));
+					$writer->addStyleAttribute(trim($arr[0]), trim($arr[1]));
 			}
 		}
 		$writer->addStyleAttributes($this->_fields);
 		if($this->_font!==null)
 			$this->_font->addAttributesToRender($writer);
 		if($this->_class!==null)
-			$writer->addAttribute('class',$this->_class);
+			$writer->addAttribute('class', $this->_class);
 	}
 
 	/**

framework/Caching/TCache.php

Doc Comments +9 added lines, -3 removed lines

@@ -109,7 +109,7 @@ 
 
 	/**
 	 * @param string a key identifying a value to be cached
-	 * @return sring a key generated from the provided key which ensures the uniqueness across applications
+	 * @return string a key generated from the provided key which ensures the uniqueness across applications
 	 */
 	protected function generateUniqueKey($key)
 	{
@@ -143,7 +143,7 @@ 
 	 * @param mixed the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 * @return null|boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	public function set($id,$value,$expire=0,$dependency=null)
 	{
@@ -201,6 +201,7 @@ 
 	 * in {@link get()} already. So only the implementation of data retrieval
 	 * is needed.
 	 * @param string a unique key identifying the cached value
+	 * @param string $key
 	 * @return string the value stored in cache, false if the value is not in the cache or expired.
 	 */
 	abstract protected function getValue($key);
@@ -215,6 +216,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function setValue($key,$value,$expire);
@@ -229,6 +232,8 @@ 
 	 * @param string the key identifying the value to be cached
 	 * @param string the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
+	 * @param string $key
+	 * @param integer $expire
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	abstract protected function addValue($key,$value,$expire);
@@ -237,6 +242,7 @@ 
 	 * Deletes a value with the specified key from cache
 	 * This method should be implemented by child classes to delete the data from actual cache storage.
 	 * @param string the key of the value to be deleted
+	 * @param string $key
 	 * @return boolean if no error happens during deletion
 	 */
 	abstract protected function deleteValue($key);
@@ -280,7 +286,7 @@ 
 	 * Deletes the value with the specified key from cache
 	 * This method is required by the interface \ArrayAccess.
 	 * @param string the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
+	 * @return boolean|null if no error happens during deletion
 	 */
 	public function offsetUnset($id)
 	{

Spacing +12 added lines, -12 removed lines

@@ -67,7 +67,7 @@ 
 			if($this->getApplication()->getCache()===null)
 				$this->getApplication()->setCache($this);
 			else
-				throw new TConfigurationException('cache_primary_duplicated',get_class($this));
+				throw new TConfigurationException('cache_primary_duplicated', get_class($this));
 		}
 	}
 
@@ -145,14 +145,14 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id,$value,$expire=0,$dependency=null)
+	public function set($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			$this->delete($id);
 		else
 		{
-			$data=array($value,$dependency);
-			return $this->setValue($this->generateUniqueKey($id),$data,$expire);
+			$data=array($value, $dependency);
+			return $this->setValue($this->generateUniqueKey($id), $data, $expire);
 		}
 	}
 
@@ -165,12 +165,12 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labeled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id,$value,$expire=0,$dependency=null)
+	public function add($id, $value, $expire=0, $dependency=null)
 	{
-		if(empty($value) && $expire === 0)
+		if(empty($value) && $expire===0)
 			return false;
-		$data=array($value,$dependency);
-		return $this->addValue($this->generateUniqueKey($id),$data,$expire);
+		$data=array($value, $dependency);
+		return $this->addValue($this->generateUniqueKey($id), $data, $expire);
 	}
 
 	/**
@@ -217,7 +217,7 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	abstract protected function setValue($key,$value,$expire);
+	abstract protected function setValue($key, $value, $expire);
 
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
@@ -231,7 +231,7 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	abstract protected function addValue($key,$value,$expire);
+	abstract protected function addValue($key, $value, $expire);
 
 	/**
 	 * Deletes a value with the specified key from cache
@@ -249,7 +249,7 @@ 
 	 */
 	public function offsetExists($id)
 	{
-		return $this->get($id) !== false;
+		return $this->get($id)!==false;
 	}
 
 	/**

framework/Caching/TDirectoryCacheDependency.php

Doc Comments +3 added lines

@@ -123,6 +123,7 @@ 
 	 * By default, it always returns true, meaning the file should be checked.
 	 * You may override this method to check only certain files.
 	 * @param string the name of the file that may be checked for dependency.
+	 * @param string $fileName
 	 * @return boolean whether this file should be checked.
 	 */
 	protected function validateFile($fileName)
@@ -136,6 +137,7 @@ 
 	 * By default, it always returns true, meaning the subdirectory should be checked.
 	 * You may override this method to check only certain subdirectories.
 	 * @param string the name of the subdirectory that may be checked for dependency.
+	 * @param string $directory
 	 * @return boolean whether this subdirectory should be checked.
 	 */
 	protected function validateDirectory($directory)
@@ -149,6 +151,7 @@ 
 	 * {@link setRecursiveCheck RecursiveCheck} is set true.
 	 * @param string the directory name
 	 * @param int level of the recursion
+	 * @param string $directory
 	 * @return array list of file modification time indexed by the file path
 	 */
 	protected function generateTimestamps($directory,$level=0)

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
 	public function setDirectory($directory)
 	{
 		if(($path=realpath($directory))===false || !is_dir($path))
-			throw new TInvalidDataValueException('directorycachedependency_directory_invalid',$directory);
+			throw new TInvalidDataValueException('directorycachedependency_directory_invalid', $directory);
 		$this->_directory=$path;
 		$this->_timestamps=$this->generateTimestamps($path);
 	}
@@ -151,10 +151,10 @@ 
 	 * @param int level of the recursion
 	 * @return array list of file modification time indexed by the file path
 	 */
-	protected function generateTimestamps($directory,$level=0)
+	protected function generateTimestamps($directory, $level=0)
 	{
 		if(($dir=opendir($directory))===false)
-			throw new TIOException('directorycachedependency_directory_invalid',$directory);
+			throw new TIOException('directorycachedependency_directory_invalid', $directory);
 		$timestamps=array();
 		while(($file=readdir($dir))!==false)
 		{
@@ -163,8 +163,8 @@ 
 				continue;
 			else if(is_dir($path))
 			{
-				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
-					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
+				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
+					$timestamps=array_merge($this->generateTimestamps($path, $level + 1));
 			}
 			else if($this->validateFile($path))
 				$timestamps[$path]=filemtime($path);

Braces +1 added lines, -2 removed lines

@@ -532,8 +532,7 @@
 			{
 				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
-			}
-			else if($this->validateFile($path))
+			} else if($this->validateFile($path))
 				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);