pradosoft / prado

framework/Web/UI/WebControls/TCaptchaValidator.php

Doc Comments +4 added lines, -1 removed lines

@@ -79,7 +79,7 @@ 
 	}
 
 	/**
-	 * @return TCaptchaControl the CAPTCHA control to be validated against
+	 * @return TCaptcha the CAPTCHA control to be validated against
 	 * @throws TConfigurationException if the CAPTCHA cannot be found according to {@link setCaptchaControl CaptchaControl}
 	 */
 	protected function findCaptchaControl()
@@ -115,6 +115,9 @@ 
 		return $options;
 	}
 
+	/**
+	 * @param string $token
+	 */
 	private function generateTokenHash($token)
 	{
 		for($h=0,$i=strlen($token)-1;$i>=0;--$i)

Braces +1 added lines, -2 removed lines

@@ -107,8 +107,7 @@
 		{
 			$options['TokenHash']=$this->generateTokenHash($control->getToken());
 			$options['CaseSensitive']=true;
-		}
-		else
+		} else
 		{
 			$options['TokenHash']=$this->generateTokenHash(strtoupper($control->getToken()));
 			$options['CaseSensitive']=false;

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 
 	private function generateTokenHash($token)
 	{
-		for($h=0,$i=strlen($token)-1;$i>=0;--$i)
+		for($h=0, $i=strlen($token) - 1; $i >= 0; --$i)
 			$h+=ord($token[$i]);
 		return $h;
 	}

framework/Web/UI/WebControls/TCheckBox.php

Doc Comments +6 added lines, -1 removed lines

@@ -117,7 +117,7 @@ 
 
 	/**
 	 * Returns the value of the property that needs validation.
-	 * @return mixed the property value to be validated
+	 * @return boolean the property value to be validated
 	 */
 	public function getValidationPropertyValue()
 	{
@@ -184,6 +184,7 @@ 
 
 	/**
 	 * @param TTextAlign the alignment of the text caption. Valid values include Left and Right.
+	 * @param TTextAlign $value
 	 */
 	public function setTextAlign($value)
 	{
@@ -244,6 +245,7 @@ 
 	/**
 	 * Sets a value indicating whether clicking on the checkbox will post the page.
 	 * @param boolean whether clicking on the checkbox will post the page.
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -261,6 +263,7 @@ 
 	/**
 	 * Sets the value indicating whether postback event trigger by this checkbox will cause input validation.
 	 * @param boolean whether postback event trigger by this checkbox will cause input validation.
+	 * @param boolean $value
 	 */
 	public function setCausesValidation($value)
 	{
@@ -277,6 +280,7 @@ 
 
 	/**
 	 * @param string the group of validators which the checkbox causes validation upon postback
+	 * @param string $value
 	 */
 	public function setValidationGroup($value)
 	{
@@ -410,6 +414,7 @@ 
 
 	/**
 	 * @param boolean whether to render javascript.
+	 * @param boolean $value
 	 */
 	public function setEnableClientScript($value)
 	{

Spacing +7 added lines, -7 removed lines

@@ -301,7 +301,7 @@ 
 	 */
 	public function getSurroundingTagID()
 	{
-	return $this->getSpanNeeded() ? $this->getClientID() . '_parent' : $this->getClientID();
+	return $this->getSpanNeeded() ? $this->getClientID().'_parent' : $this->getClientID();
 	}
 
 	/**
@@ -480,7 +480,7 @@ 
 
 		if(($accesskey=$this->getAccessKey())!=='')
 			$writer->addAttribute('accesskey', $accesskey);
-		if(($tabindex=$this->getTabIndex())>0)
+		if(($tabindex=$this->getTabIndex()) > 0)
 			$writer->addAttribute('tabindex', "$tabindex");
 		if($attributes=$this->getViewState('InputAttributes', null))
 			$writer->addAttributes($attributes);
@@ -493,7 +493,7 @@ 
 	 */
 	protected function renderClientControlScript($writer)
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -513,10 +513,10 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['EventTarget']=$this->getUniqueID();
 		return $options;
 	}
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -328,8 +328,7 @@ 
 				$writer->addAttributes($attributes);
 			if($value!==null)
 				$attributes->add('value', $value);
-		}
-		else
+		} else
 			$onclick='';
 	if($needspan=$this->getSpanNeeded())
 	{
@@ -343,14 +342,12 @@ 
 			{
 				$this->renderLabel($writer, $clientID, $text);
 				$this->renderInputTag($writer, $clientID, $onclick);
-			}
-			else
+			} else
 			{
 				$this->renderInputTag($writer, $clientID, $onclick);
 				$this->renderLabel($writer, $clientID, $text);
 			}
-		}
-		else
+		} else
 			$this->renderInputTag($writer, $clientID, $onclick);
 		if($needspan)
 			$writer->renderEndTag();

framework/Web/UI/WebControls/TCompareValidator.php

Doc Comments +2 added lines

@@ -186,6 +186,8 @@
 	 * Parse the pair of values into the appropriate value type.
 	 * @param string value one
 	 * @param string second value
+	 * @param string $value1
+	 * @param string $value2
 	 * @return array appropriate type of the value pair, array($value1, $value2);
 	 */
 	protected function getComparisonValues($value1, $value2)

Spacing +6 added lines, -6 removed lines

@@ -164,13 +164,13 @@ 
 		else
 			$value2=$this->getValueToCompare();
 
-		$values = $this->getComparisonValues($value, $value2);
+		$values=$this->getComparisonValues($value, $value2);
 		switch($this->getOperator())
 		{
 			case TValidationCompareOperator::Equal:
-				return $values[0] == $values[1];
+				return $values[0]==$values[1];
 			case TValidationCompareOperator::NotEqual:
-				return $values[0] != $values[1];
+				return $values[0]!=$values[1];
 			case TValidationCompareOperator::GreaterThan:
 				return $values[0] > $values[1];
 			case TValidationCompareOperator::GreaterThanEqual:
@@ -199,10 +199,10 @@ 
 			case TValidationDataType::Float:
 				return [floatval($value1), floatval($value2)];
 			case TValidationDataType::Date:
-				$dateFormat = $this->getDateFormat();
+				$dateFormat=$this->getDateFormat();
 				if($dateFormat!=='')
 				{
-					$formatter = new TSimpleDateFormatter($dateFormat);
+					$formatter=new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
 				}
 				else
@@ -217,7 +217,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		if(($name=$this->getControlToCompare())!=='')
 		{
 			if(($control=$this->findControl($name))!==null)

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
 				throw new TInvalidDataValueException('comparevalidator_controltocompare_invalid');
 			if(($value2=$this->getValidationValue($control2))==='')
 				return false;
-		}
-		else
+		} else
 			$value2=$this->getValueToCompare();
 
 		$values = $this->getComparisonValues($value, $value2);
@@ -204,8 +203,7 @@ 
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return [$formatter->parse($value1), $formatter->parse($value2)];
-				}
-				else
+				} else
 					return [strtotime($value1), strtotime($value2)];
 		}
 		return [$value1, $value2];

framework/Web/UI/WebControls/TDataTypeValidator.php

Doc Comments +1 added lines

@@ -82,6 +82,7 @@
 	/**
 	 * Determine if the given value is of a particular type using RegExp.
 	 * @param string value to check
+	 * @param string $value
 	 * @return boolean true if value fits the type expression.
 	 */
 	protected function evaluateDataTypeCheck($value)

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 				{
 					$formatter = new TSimpleDateFormatter($dateFormat);
 					return $formatter->isValidDate($value);
-				}
-				else
+				} else
 					return strtotime($value) > 0;
 		}
 		return true;

Spacing +3 added lines, -3 removed lines

@@ -97,10 +97,10 @@ 
 			case TValidationDataType::Float:
 				return preg_match('/^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?$/', trim($value));
 			case TValidationDataType::Date:
-				$dateFormat = $this->getDateFormat();
+				$dateFormat=$this->getDateFormat();
 				if(strlen($dateFormat))
 				{
-					$formatter = new TSimpleDateFormatter($dateFormat);
+					$formatter=new TSimpleDateFormatter($dateFormat);
 					return $formatter->isValidDate($value);
 				}
 				else
@@ -115,7 +115,7 @@ 
 	 */
 	protected function getClientScriptOptions()
 	{
-		$options = parent::getClientScriptOptions();
+		$options=parent::getClientScriptOptions();
 		$options['DataType']=$this->getDataType();
 		if(($dateFormat=$this->getDateFormat())!=='')
 			$options['DateFormat']=$dateFormat;

framework/Web/UI/WebControls/TEmailAddressValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 	/**
 	 * Returns an array of javascript validator options.
-	 * @return array javascript validator options.
+	 * @return boolean javascript validator options.
 	 */
 	public function evaluateIsValid()
 	{

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
 	public function getRegularExpression()
 	{
 		$regex=parent::getRegularExpression();
-		return $regex===''?self::EMAIL_REGEXP:$regex;
+		return $regex==='' ?self::EMAIL_REGEXP : $regex;
 	}
 
 	/**
@@ -59,7 +59,7 @@ 
 	public function evaluateIsValid()
 	{
 		$value=$this->getValidationValue($this->getValidationTarget());
-		$valid=$valid=is_string($value) && strlen($value)<=254 && parent::evaluateIsValid();
+		$valid=$valid=is_string($value) && strlen($value) <= 254 && parent::evaluateIsValid();
 
 		if($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
 		{
@@ -67,8 +67,8 @@ 
 			{
 				if(($pos=strpos($value, '@'))!==false)
 				{
-					$domain=substr($value, $pos+1);
-					return $domain===''?false:checkdnsrr($domain, 'MX');
+					$domain=substr($value, $pos + 1);
+					return $domain==='' ?false:checkdnsrr($domain, 'MX');
 				}
 				else
 					return false;

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 				{
 					$domain=substr($value, $pos+1);
 					return $domain===''?false:checkdnsrr($domain, 'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

framework/Web/UI/WebControls/TFlushOutput.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	}
 
 	/**
-	 * @return Tells whether buffering of output can continue after this point
+	 * @return boolean whether buffering of output can continue after this point
 	 */
 	public function getContinueBuffering()
 	{

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 	public function __construct()
 	{
 		parent::__construct();
-		$this->EnableViewState = false;
+		$this->EnableViewState=false;
 	}
 
 	/**
@@ -61,7 +61,7 @@ 
 	 */
 	public function setContinueBuffering($value)
 	{
-		$this->_continueBuffering = TPropertyValue::ensureBoolean($value);
+		$this->_continueBuffering=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 //$writer->write('<!-- flush -->');
 		// ajax responses can't be parsed by the client side before loaded and returned completely,
 		// so don't bother with flushing output somewhere mid-page if refreshing in a callback
-		if (!$this->Page->IsCallback)
+		if(!$this->Page->IsCallback)
 		{
 			$this->Page->flushWriter();
 //			$this->Application->flushOutput($this->ContinueBuffering);

framework/Web/UI/WebControls/TRatingList.php

Doc Comments +1 added lines

@@ -132,6 +132,7 @@
 
 	/**
 	 * @param float rating value
+	 * @param double $rating
 	 * @return int rating as integer
 	 */
 	protected function getRatingIndex($rating)

Spacing +31 added lines, -31 removed lines

@@ -29,12 +29,12 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH = 'ratings';
+	const SCRIPT_PATH='ratings';
 
 	/**
 	 * @var array list of published rating images.
 	 */
-	private $_ratingImages = [];
+	private $_ratingImages=[];
 
 	/**
 	 * Sets the default repeat direction to horizontal.
@@ -106,9 +106,9 @@ 
 	 */
 	public function getRating()
 	{
-		$rating = $this->getViewState('Rating', null);
-		if ($rating === null)
-			return $this->getSelectedIndex()+1;
+		$rating=$this->getViewState('Rating', null);
+		if($rating===null)
+			return $this->getSelectedIndex() + 1;
 		else
 			return $rating;
 	}
@@ -118,15 +118,15 @@ 
 	 */
 	public function setRating($value)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->setViewState('Rating', $value, null);
-		$index = $this->getRatingIndex($value);
+		$index=$this->getRatingIndex($value);
 		parent::setSelectedIndex($index);
 	}
 
 	public function setSelectedIndex($value)
 	{
-		$this->setRating($value+1);
+		$this->setRating($value + 1);
 		parent::setSelectedIndex($value);
 	}
 
@@ -136,10 +136,10 @@ 
 	 */
 	protected function getRatingIndex($rating)
 	{
-		$interval = $this->getHalfRatingInterval();
-		$base = intval($rating)-1;
-		$remainder = $rating-$base-1;
-		return $remainder > $interval[1] ? $base+1 : $base;
+		$interval=$this->getHalfRatingInterval();
+		$base=intval($rating) - 1;
+		$remainder=$rating - $base - 1;
+		return $remainder > $interval[1] ? $base + 1 : $base;
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$value = $this->getRating();
-		$value = TPropertyValue::ensureInteger($value);
+		$value=$this->getRating();
+		$value=TPropertyValue::ensureInteger($value);
 		$this->setRating($value);
 		parent::onSelectedIndexChanged($param);
 	}
@@ -219,7 +219,7 @@ 
 	 */
 	protected function getRatingStyleCssClass()
 	{
-		return 'TRatingList_' . $this->getRatingStyle();
+		return 'TRatingList_'.$this->getRatingStyle();
 	}
 
 	/**
@@ -246,14 +246,14 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = parent::getPostBackOptions();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
-		$options['ReadOnly'] = $this->getReadOnly();
-		$options['Style'] = $this->getRatingStyleCssClass();
-		$options['CaptionID'] = $this->getCaptionControlID();
-		$options['SelectedIndex'] = $this->getSelectedIndex();
-		$options['Rating'] = $this->getRating();
-		$options['HalfRating'] = $this->getHalfRatingInterval();
+		$options=parent::getPostBackOptions();
+		$options['AutoPostBack']=$this->getAutoPostBack();
+		$options['ReadOnly']=$this->getReadOnly();
+		$options['Style']=$this->getRatingStyleCssClass();
+		$options['CaptionID']=$this->getCaptionControlID();
+		$options['SelectedIndex']=$this->getSelectedIndex();
+		$options['Rating']=$this->getRating();
+		$options['HalfRating']=$this->getHalfRatingInterval();
 		return $options;
 	}
 
@@ -282,7 +282,7 @@ 
 	{
 		parent::onPreRender($param);
 		$this->publishStyle($this->getRatingStyle());
-		$this->_ratingImages = $this->publishImages($this->getRatingStyle());
+		$this->_ratingImages=$this->publishImages($this->getRatingStyle());
 		$this->registerClientScript();
 	}
 
@@ -292,8 +292,8 @@ 
 	 */
 	protected function publishStyle($style)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$url = $this->getAssetUrl($style . '.css');
+		$cs=$this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($style.'.css');
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -306,10 +306,10 @@ 
 	 */
 	protected function publishImages($style, $fileExt='.gif')
 	{
-		$types = ['blank', 'selected', 'half', 'combined'];
-		$files = [];
+		$types=['blank', 'selected', 'half', 'combined'];
+		$files=[];
 		foreach($types as $type)
-			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+			$files[$type]=$this->getAssetUrl("{$style}_{$type}{$fileExt}");
 		return $files;
 	}
 
@@ -328,8 +328,8 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -268,8 +268,7 @@
 			{
 				if($control->getVisible(true))
 					return $control->getClientID();
-			}
-			else
+			} else
 				return $id;
 		}
 		return '';

framework/Web/UI/WebControls/TTable.php

Doc Comments +2 added lines

@@ -144,6 +144,7 @@ 
 
 	/**
 	 * @param string table caption
+	 * @param string $value
 	 */
 	public function setCaption($value)
 	{
@@ -160,6 +161,7 @@ 
 
 	/**
 	 * @param TTableCaptionAlign table caption alignment.
+	 * @param TTableCaptionAlign $value
 	 */
 	public function setCaptionAlign($value)
 	{

Spacing +2 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
 				if(($border=$this->getBorderWidth())==='')
 					$border=1;
 				else
-					$border=(int)$border;
+					$border=(int) $border;
 			}
 		}
 		$writer->addAttribute('border', "$border");
@@ -311,7 +311,7 @@ 
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
-							if($index>0)
+							if($index > 0)
 								$writer->renderEndTag();
 							if($section===TTableRowSection::Body)
 								$writer->renderBeginTag('tbody');

Braces +4 added lines, -8 removed lines

@@ -306,8 +306,7 @@ 
 					{
 						if($index===0 && $currentSection===TTableRowSection::Header)
 							$writer->renderBeginTag('thead');
-					}
-					else
+					} else
 					{
 						if($currentSection===TTableRowSection::Header)
 						{
@@ -318,8 +317,7 @@ 
 							else
 								$writer->renderBeginTag('tfoot');
 							$currentSection=$section;
-						}
-						elseif($currentSection===TTableRowSection::Body)
+						} elseif($currentSection===TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
 							if($section===TTableRowSection::Footer)
@@ -327,16 +325,14 @@ 
 							else
 								throw new TConfigurationException('table_tablesection_outoforder');
 							$currentSection=$section;
-						}
-						else // Footer
+						} else // Footer
 							throw new TConfigurationException('table_tablesection_outoforder');
 					}
 					$row->renderControl($writer);
 					$writer->writeLine();
 				}
 				$writer->renderEndTag();
-			}
-			else
+			} else
 			{
 				$writer->writeLine();
 				foreach($this->getControls() as $row)

framework/Web/UI/WebControls/TTemplateColumn.php

Doc Comments +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	}
 
 	/**
-	 * @return ITemplate the item template
+	 * @return string the item template
 	 */
 	public function getItemTemplate()
 	{

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 					$control->setItemType($itemType);
 				}
 				if($control instanceof \Prado\IDataRenderer)
-					$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+					$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			}
 			elseif($template!==null)
 				$template->instantiateIn($cell);

Braces +4 added lines, -8 removed lines

@@ -198,8 +198,7 @@ 
 					$classPath=$this->getItemRenderer();
 					$template=$this->_itemTemplate;
 				}
-			}
-			else
+			} else
 			{
 				$template=$this->_itemTemplate;
 				$classPath=$this->getItemRenderer();
@@ -215,13 +214,11 @@ 
 				}
 				if($control instanceof \Prado\IDataRenderer)
 					$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
-			}
-			elseif($template!==null)
+			} elseif($template!==null)
 				$template->instantiateIn($cell);
 			elseif($itemType!==TListItemType::EditItem)
 				$cell->setText(' ');
-		}
-		elseif($itemType===TListItemType::Header)
+		} elseif($itemType===TListItemType::Header)
 		{
 			if(($classPath=$this->getHeaderRenderer())!=='')
 				$this->initializeHeaderCell($cell, $columnIndex);
@@ -229,8 +226,7 @@ 
 				$this->_headerTemplate->instantiateIn($cell);
 			else
 				$this->initializeHeaderCell($cell, $columnIndex);
-		}
-		elseif($itemType===TListItemType::Footer)
+		} elseif($itemType===TListItemType::Footer)
 		{
 			if(($classPath=$this->getFooterRenderer())!=='')
 				$this->initializeFooterCell($cell, $columnIndex);