pradosoft / prado

framework/Util/TSimpleDateFormatter.php

Doc Comments +10 added lines

@@ -60,6 +60,7 @@ 
 	 * Constructor, create a new date time formatter.
 	 * @param string formatting pattern.
 	 * @param string pattern and value charset
+	 * @param string $pattern
 	 */
 	public function __construct($pattern, $charset='UTF-8')
 	{
@@ -93,6 +94,7 @@ 
 
 	/**
 	 * @param string formatting charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -313,6 +315,7 @@ 
 
 	/**
 	 * Calculate the length of a string, may be consider iconv_strlen?
+	 * @param string $string
 	 */
 	private function length($string)
 	{
@@ -338,6 +341,9 @@ 
 
 	/**
 	 * Returns true if char at position equals a particular char.
+	 * @param string $string
+	 * @param integer $pos
+	 * @param string $char
 	 */
 	private function charEqual($string, $pos, $char)
 	{
@@ -350,6 +356,10 @@ 
 	 * @param int starting position
 	 * @param int minimum integer length
 	 * @param int maximum integer length
+	 * @param string $str
+	 * @param integer $i
+	 * @param integer|null $minlength
+	 * @param integer|null $maxlength
 	 * @return string integer portion of the string, null otherwise
 	 */
 	private function getInteger($str,$i,$minlength,$maxlength)

Spacing +76 added lines, -76 removed lines

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

framework/Vendor/SafeHtml/HTMLSax3/Decorators.php

Doc Comments +8 added lines

@@ -51,6 +51,7 @@ 
     * Constructs TSax3_Trim
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -99,6 +100,8 @@ 
     * @param object handler object being decorated
     * @param string original open handler method
     * @param string original close handler method
+    * @param string $orig_open_method
+    * @param string $orig_close_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_open_method, $orig_close_method) {
@@ -149,6 +152,7 @@ 
     * Constructs TSax3_LineFeed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -191,6 +195,7 @@ 
     * Constructs TSax3_Tab
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -234,6 +239,7 @@ 
     * Constructs TSax3_Entities_Parsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -286,6 +292,7 @@ 
     * Constructs TSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {
@@ -329,6 +336,7 @@ 
     * Constructs TSax3_Entities_Unparsed
     * @param object handler object being decorated
     * @param string original handler method
+    * @param string $orig_method
     * @access protected
     */
     function __construct(&$orig_obj, $orig_method) {

framework/Web/UI/ActiveControls/TDropContainer.php

Doc Comments +1 added lines, -2 removed lines

@@ -135,7 +135,6 @@ 
 	 * Raises the onDrop event.
 	 * The drop parameters are encapsulated into a {@link TDropContainerEventParameter}
 	 *
-	 * @param object $dropControlId
 	 */
 	public function onDrop ($dropParams)
 	{
@@ -223,7 +222,7 @@ 
 	/**
 	 * Override parent implementation to return the container control collection.
 	 *
-	 * @return TControlCollection
+	 * @return \Prado\Web\UI\TControlCollection
 	 */
 	public function getControls()
 	{

Spacing +13 added lines, -13 removed lines

@@ -137,9 +137,9 @@ 
 	 *
 	 * @param object $dropControlId
 	 */
-	public function onDrop ($dropParams)
+	public function onDrop($dropParams)
 	{
-		$this->raiseEvent('OnDrop', $this, new TDropContainerEventParameter ($dropParams));
+		$this->raiseEvent('OnDrop', $this, new TDropContainerEventParameter($dropParams));
 
 	}
 
@@ -161,11 +161,11 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
 
-		$options['accept'] = $this->getAcceptCssClass();
-		$options['hoverclass'] = $this->getHoverCssClass();
+		$options['accept']=$this->getAcceptCssClass();
+		$options['hoverclass']=$this->getHoverCssClass();
 		return $options;
 	}
 
@@ -197,7 +197,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 
 		$this->getPage()->getClientScript()->registerPradoScript('dragdrop');
 		$this->getActiveControl()->registerCallbackClientScript(
@@ -210,11 +210,11 @@ 
 	 * child controls. This container will be a TActivePanel, in order to allow user
 	 * to update its content on callback.
 	 */
-	public function createChildControls ()
+	public function createChildControls()
 	{
-		if ($this->_container===null)
+		if($this->_container===null)
 		{
-			$this->_container= new TActivePanel;
+			$this->_container=new TActivePanel;
 			$this->_container->setId($this->getId(false).'_content');
 			parent::getControls()->add($this->_container);
 		}
@@ -238,17 +238,17 @@ 
 	 * is defered until OnPreRender event is raised.
 	 * @param THtmlWriter html writer
 	 */
-	public function render ($writer)
+	public function render($writer)
 	{
 		if($this->getHasPreRendered())
 		{
 			parent::render($writer);
 			if($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this->_container,$writer);
+				$this->getPage()->getCallbackClient()->replaceContent($this->_container, $writer);
 		}
 		else
 		{
-			$this->getPage()->getAdapter()->registerControlToRender($this->_container,$writer);
+			$this->getPage()->getAdapter()->registerControlToRender($this->_container, $writer);
 		}
 	}
 }

framework/Web/UI/JuiControls/TJuiAutoComplete.php

Doc Comments +2 added lines

@@ -260,6 +260,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggest($param)
 	{
@@ -272,6 +273,7 @@ 
 	 * method, be sure to call the parent implementation so that the event
 	 * handler can be invoked.
 	 * @param TCallbackEventParameter event parameter to be passed to the event handlers
+	 * @param TJuiAutoCompleteEventParameter $param
 	 */
 	public function onSuggestionSelected($param)
 	{

Spacing +30 added lines, -30 removed lines

@@ -131,7 +131,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -212,7 +212,7 @@ 
 	 */
 	public function getMinChars()
 	{
-		return $this->getViewState('minChars','');
+		return $this->getViewState('minChars', '');
 	}
 
 	/**
@@ -236,17 +236,17 @@ 
 	 */
  	public function raiseCallbackEvent($param)
 	{
-		$token = $param->getCallbackParameter();
-		if(is_array($token) && count($token) == 2)
+		$token=$param->getCallbackParameter();
+		if(is_array($token) && count($token)==2)
 		{
-			if($token[1] === '__TJuiAutoComplete_onSuggest__')
+			if($token[1]==='__TJuiAutoComplete_onSuggest__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), $token[0]);
 				$this->onSuggest($parameter);
 			}
-			else if($token[1] === '__TJuiAutoComplete_onSuggestionSelected__')
+			else if($token[1]==='__TJuiAutoComplete_onSuggestionSelected__')
 			{
-				$parameter = new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
+				$parameter=new TJuiAutoCompleteEventParameter($this->getResponse(), null, $token[0]);
 				$this->onSuggestionSelected($parameter);
 			}
 		}
@@ -303,7 +303,7 @@ 
 	public function getResultPanel()
 	{
 		if($this->_resultPanel===null)
-			$this->_resultPanel = $this->createResultPanel();
+			$this->_resultPanel=$this->createResultPanel();
 		return $this->_resultPanel;
 	}
 
@@ -312,7 +312,7 @@ 
 	 */
 	protected function createResultPanel()
 	{
-		$panel = new TPanel;
+		$panel=new TPanel;
 		$this->getControls()->add($panel);
 		$panel->setID('result');
 		return $panel;
@@ -324,7 +324,7 @@ 
 	public function getSuggestions()
 	{
 		if($this->_repeater===null)
-			$this->_repeater = $this->createRepeater();
+			$this->_repeater=$this->createRepeater();
 		return $this->_repeater;
 	}
 
@@ -333,8 +333,8 @@ 
 	 */
 	protected function createRepeater()
 	{
-		$repeater = new TRepeater;
-		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>',null));
+		$repeater=new TRepeater;
+		$repeater->setItemTemplate(new TTemplate('<%# $this->Data %>', null));
 		$this->getControls()->add($repeater);
 		return $repeater;
 	}
@@ -376,12 +376,12 @@ 
 		{
 			$data=array();
 			$items=$this->getSuggestions()->getItems();
-			$writer = new TTextWriter;
-			for($i=0; $i<$items->Count; $i++)
+			$writer=new TTextWriter;
+			for($i=0; $i < $items->Count; $i++)
 			{
 				$items->itemAt($i)->render($writer);
 				$item=$writer->flush();
-				$data[]=array( 'id' => $i, 'label' => $item);
+				$data[]=array('id' => $i, 'label' => $item);
 			}
 
 			$this->getResponse()->getAdapter()->setResponseData($data);
@@ -393,25 +393,25 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 
-		if(strlen($separator = $this->getSeparator()))
-			$options['Separators'] = $separator;
+		if(strlen($separator=$this->getSeparator()))
+			$options['Separators']=$separator;
 
 		if($this->getAutoPostBack())
 		{
-			$options = array_merge($options,parent::getPostBackOptions());
-			$options['AutoPostBack'] = true;
+			$options=array_merge($options, parent::getPostBackOptions());
+			$options['AutoPostBack']=true;
 		}
-		if(strlen($textCssClass = $this->getTextCssClass()))
-			$options['textCssClass'] = $textCssClass;
-		$options['minLength'] = $this->getMinChars();
-		$options['delay'] = $this->getFrequency()*1000.0;
-		$options['appendTo'] = '#'.$this->getResultPanel()->getClientID();
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
+		if(strlen($textCssClass=$this->getTextCssClass()))
+			$options['textCssClass']=$textCssClass;
+		$options['minLength']=$this->getMinChars();
+		$options['delay']=$this->getFrequency() * 1000.0;
+		$options['appendTo']='#'.$this->getResultPanel()->getClientID();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
 		return $options;
 	}
 

framework/Web/UI/JuiControls/TJuiDatePicker.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 namespace Prado\Web\UI\JuiControls;
 
 use Prado\Exceptions\TNotSupportedException;
-use Prado\Web\Javascripts\TJavaScript;
 use Prado\Web\UI\ActiveControls\ICallbackEventHandler;
 use Prado\Web\UI\ActiveControls\TActivePanel;
 

Spacing +14 added lines, -14 removed lines

@@ -43,7 +43,7 @@ 
 	 * it will register an additional clientscript to set the language specific global default settings.
 	 * @var boolean true, if this is the first instance of TJuiDatePicker, false otherwise
 	 */
-	private static $_first = true;
+	private static $_first=true;
 
 	/**
 	 * Creates a new callback control, sets the adapter to
@@ -78,7 +78,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -172,8 +172,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -182,7 +182,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -191,7 +191,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -257,8 +257,8 @@ 
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = new TSimpleDateFormatter($this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=new TSimpleDateFormatter($this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -269,9 +269,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = new TSimpleDateFormatter($pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=new TSimpleDateFormatter($pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -282,10 +282,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 }
\ No newline at end of file

framework/Web/UI/JuiControls/TJuiSelectableTemplate.php

Doc Comments +3 added lines

@@ -317,6 +317,9 @@
 {
 	private $_template;
 
+	/**
+	 * @param string $template
+	 */
 	public function __construct($template)
 	{
 		$this->_template = $template;

framework/Web/UI/WebControls/TDatePicker.php

Doc Comments +6 added lines, -2 removed lines

@@ -111,6 +111,7 @@ 
 	/**
 	 * Sets the format of the date string.
 	 * @param string the format of the date string
+	 * @param string $value
 	 */
 	public function setDateFormat($value)
 	{
@@ -250,6 +251,7 @@ 
 
 	/**
 	 * @param integer date picker starting year, default is 2000.
+	 * @param integer $value
 	 */
 	public function setFromYear($value)
 	{
@@ -359,6 +361,7 @@ 
 
 	/**
 	 * @param string date string
+	 * @param string $value
 	 */
 	public function setDate($value)
 	{
@@ -482,7 +485,7 @@ 
 	 * Loads date from drop down list data.
 	 * @param string the key that can be used to retrieve data from the input data collection
 	 * @param array the input data collection
-	 * @return array the date selected
+	 * @return string the date selected
 	 */
 	protected function getDateFromPostData($key, $values)
 	{
@@ -586,7 +589,7 @@ 
 	}
 
 	/**
-	 * @return DateTimeFormatInfo date time format information for the current culture.
+	 * @return \Prado\I18N\core\DateTimeFormatInfo date time format information for the current culture.
 	 */
 	protected function getLocalizedCalendarInfo()
 	{
@@ -742,6 +745,7 @@ 
 	 * "MMMM" will return the month names, "MM" or "MMM" return abbr. month names
 	 * and "M" return month digits.
 	 * @param DateTimeFormatInfo localized date format information.
+	 * @param \Prado\I18N\core\DateTimeFormatInfo $info
 	 * @return array localized month names.
 	 */
 	protected function getLocalizedMonthNames($info)

Spacing +105 added lines, -105 removed lines

@@ -85,7 +85,7 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH = 'prado/datepicker';
+	const SCRIPT_PATH='prado/datepicker';
 
 	/**
 	 * @var TDatePickerClientScript validator client-script options.
@@ -105,7 +105,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function getShowCalendar()
 	{
-		return $this->getViewState('ShowCalendar',true);
+		return $this->getViewState('ShowCalendar', true);
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 */
 	public function setShowCalendar($value)
 	{
-		$this->setViewState('ShowCalendar',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('ShowCalendar', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -253,7 +253,7 @@ 
 	 */
 	public function setFromYear($value)
 	{
-		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))-5);
+		$this->setViewState('FromYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 	 */
 	public function getFromYear()
 	{
-		return $this->getViewState('FromYear', intval(@date('Y'))-5);
+		return $this->getViewState('FromYear', intval(@date('Y')) - 5);
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 	 */
 	public function setUpToYear($value)
 	{
-		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y'))+10);
+		$this->setViewState('UpToYear', TPropertyValue::ensureInteger($value), intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -277,7 +277,7 @@ 
 	 */
 	public function getUpToYear()
 	{
-		return $this->getViewState('UpToYear', intval(@date('Y'))+10);
+		return $this->getViewState('UpToYear', intval(@date('Y')) + 10);
 	}
 
 	/**
@@ -317,8 +317,8 @@ 
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = new TSimpleDateFormatter($this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=new TSimpleDateFormatter($this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -378,7 +378,7 @@ 
 	public function getClientSide()
 	{
 		if($this->_clientScript===null)
-			$this->_clientScript = $this->createClientScript();
+			$this->_clientScript=$this->createClientScript();
 		return $this->_clientScript;
 	}
 
@@ -397,10 +397,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 	/**
@@ -421,7 +421,7 @@ 
 	 */
 	public function render($writer)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if($this->getInputMode()==TDatePickerInputMode::TextBox)
 		{
 			parent::render($writer);
 			$this->renderDatePickerButtons($writer);
@@ -444,7 +444,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			switch ($this->getMode())
+			switch($this->getMode())
 			{
 				case TDatePickerMode::Button:
 					$this->renderButtonDatePicker($writer);
@@ -464,11 +464,11 @@ 
 	 * @param array the input data collection
 	 * @return boolean whether the data of the component has been changed
 	 */
-	public function loadPostData($key,$values)
+	public function loadPostData($key, $values)
 	{
-		if($this->getInputMode() == TDatePickerInputMode::TextBox)
+		if($this->getInputMode()==TDatePickerInputMode::TextBox)
 			return parent::loadPostData($key, $values);
-		$value = $this->getDateFromPostData($key, $values);
+		$value=$this->getDateFromPostData($key, $values);
 		if(!$this->getReadOnly() && $this->getText()!==$value)
 		{
 			$this->setText($value);
@@ -486,40 +486,40 @@ 
 	 */
 	protected function getDateFromPostData($key, $values)
 	{
-		$date = @getdate();
+		$date=@getdate();
 
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = new TSimpleDateFormatter($pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=new TSimpleDateFormatter($pattern);
 
-		$order = $formatter->getDayMonthYearOrdering();
+		$order=$formatter->getDayMonthYearOrdering();
 
 		if(isset($values[$key.'$day'])) {
-			$day = intval($values[$key.'$day']);
+			$day=intval($values[$key.'$day']);
 		} elseif(in_array('day', $order)) {
-			$day = $date['mday'];
+			$day=$date['mday'];
 		} else {
-			$day = 1;
+			$day=1;
 		}
 
 		if(isset($values[$key.'$month']))
-			$month = intval($values[$key.'$month']) + 1;
+			$month=intval($values[$key.'$month']) + 1;
 		else
-			$month = $date['mon'];
+			$month=$date['mon'];
 
 		if(isset($values[$key.'$year']))
-			$year = intval($values[$key.'$year']);
+			$year=intval($values[$key.'$year']);
 		else
-			$year = $date['year'];
+			$year=$date['year'];
 
-		$s = new TDateTimeStamp;
-		$date = $s->getTimeStamp(0, 0, 0, $month, $day, $year);
+		$s=new TDateTimeStamp;
+		$date=$s->getTimeStamp(0, 0, 0, $month, $day, $year);
 		//$date = @mktime(0, 0, 0, $month, $day, $year);
 
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
 
-		$formatter = new TSimpleDateFormatter($pattern);
+		$formatter=new TSimpleDateFormatter($pattern);
 		return $formatter->format($date);
 	}
 
@@ -529,31 +529,31 @@ 
 	 */
 	protected function getDatePickerOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['InputMode'] = $this->getInputMode();
-		$options['Format'] = $this->getDateFormat();
-		$options['FirstDayOfWeek'] = $this->getFirstDayOfWeek();
+		$options['ID']=$this->getClientID();
+		$options['InputMode']=$this->getInputMode();
+		$options['Format']=$this->getDateFormat();
+		$options['FirstDayOfWeek']=$this->getFirstDayOfWeek();
 		if(($cssClass=$this->getCssClass())!=='')
-			$options['ClassName'] = $cssClass;
-		$options['CalendarStyle'] = $this->getCalendarStyle();
-		$options['FromYear'] = $this->getFromYear();
-		$options['UpToYear'] = $this->getUpToYear();
+			$options['ClassName']=$cssClass;
+		$options['CalendarStyle']=$this->getCalendarStyle();
+		$options['FromYear']=$this->getFromYear();
+		$options['UpToYear']=$this->getUpToYear();
 		switch($this->getMode())
 		{
 			case TDatePickerMode::Basic:
 				break;
 			case TDatePickerMode::Clickable:
-				$options['TriggerEvent'] = "click";
+				$options['TriggerEvent']="click";
 				break;
 			default:
-				$options['Trigger'] = $this->getDatePickerButtonID();
+				$options['Trigger']=$this->getDatePickerButtonID();
 				break;
 		}
-		$options['PositionMode'] = $this->getPositionMode();
+		$options['PositionMode']=$this->getPositionMode();
 
-		$options = array_merge($options, $this->getCulturalOptions());
+		$options=array_merge($options, $this->getCulturalOptions());
 		if($this->_clientScript!==null)
-			$options = array_merge($options,
+			$options=array_merge($options,
 				$this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
@@ -564,13 +564,13 @@ 
 	 */
 	protected function getCulturalOptions()
 	{
-		if($this->getCurrentCulture() == 'en')
+		if($this->getCurrentCulture()=='en')
 			return array();
 
-		$date = $this->getLocalizedCalendarInfo();
-		$options['MonthNames'] = $date->getMonthNames();
-		$options['AbbreviatedMonthNames'] = $date->getAbbreviatedMonthNames();
-		$options['ShortWeekDayNames'] = $date->getAbbreviatedDayNames();
+		$date=$this->getLocalizedCalendarInfo();
+		$options['MonthNames']=$date->getMonthNames();
+		$options['AbbreviatedMonthNames']=$date->getAbbreviatedMonthNames();
+		$options['ShortWeekDayNames']=$date->getAbbreviatedDayNames();
 
 		return $options;
 	}
@@ -580,8 +580,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -591,8 +591,8 @@ 
 	protected function getLocalizedCalendarInfo()
 	{
 		//expensive operations
-		$culture = $this->getCurrentCulture();
-		$info = new CultureInfo($culture);
+		$culture=$this->getCurrentCulture();
+		$info=new CultureInfo($culture);
 		return $info->getDateTimeFormat();
 	}
 
@@ -601,19 +601,19 @@ 
 	 */
 	protected function renderDropDownListCalendar($writer)
 	{
-		if($this->getMode() == TDatePickerMode::Basic)
+		if($this->getMode()==TDatePickerMode::Basic)
 			$this->setMode(TDatePickerMode::ImageButton);
 		parent::addAttributesToRender($writer);
 		$writer->removeAttribute('name');
 		$writer->removeAttribute('type');
 		$writer->addAttribute('id', $this->getClientID());
 
-		if(strlen($class = $this->getCssClass()) > 0)
+		if(strlen($class=$this->getCssClass()) > 0)
 			$writer->addAttribute('class', $class);
 		$writer->renderBeginTag('span');
 
-		$s = new TDateTimeStamp;
-		$date = $s->getDate($this->getTimeStampFromText());
+		$s=new TDateTimeStamp;
+		$date=$s->getDate($this->getTimeStampFromText());
 		//$date = @getdate($this->getTimeStampFromText());
 
 		$this->renderCalendarSelections($writer, $date);
@@ -630,7 +630,7 @@ 
 
 	protected function hasDayPattern()
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
 		return ($formatter->getDayPattern()!==null);
 	}
 
@@ -641,16 +641,16 @@ 
 	 */
 	protected function renderCalendarSelections($writer, $date)
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
 
 		foreach($formatter->getDayMonthYearOrdering() as $type)
 		{
-			if($type == 'day')
-				$this->renderCalendarDayOptions($writer,$date['mday']);
-			elseif($type == 'month')
-				$this->renderCalendarMonthOptions($writer,$date['mon']);
-			elseif($type == 'year')
-				$this->renderCalendarYearOptions($writer,$date['year']);
+			if($type=='day')
+				$this->renderCalendarDayOptions($writer, $date['mday']);
+			elseif($type=='month')
+				$this->renderCalendarMonthOptions($writer, $date['mon']);
+			elseif($type=='year')
+				$this->renderCalendarYearOptions($writer, $date['year']);
 		}
 	}
 
@@ -660,9 +660,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = new TSimpleDateFormatter($pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=new TSimpleDateFormatter($pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -672,12 +672,12 @@ 
 	 * @param array list of selection options
 	 * @param mixed selected key.
 	 */
-	private function renderDropDownListOptions($writer,$options,$selected=null)
+	private function renderDropDownListOptions($writer, $options, $selected=null)
 	{
 		foreach($options as $k => $v)
 		{
 			$writer->addAttribute('value', $k);
-			if($k == $selected)
+			if($k==$selected)
 				$writer->addAttribute('selected', 'selected');
 			$writer->renderBeginTag('option');
 			$writer->write($v);
@@ -692,7 +692,7 @@ 
 	 */
 	protected function renderCalendarDayOptions($writer, $selected=null)
 	{
-		$days = $this->getDropDownDayOptions();
+		$days=$this->getDropDownDayOptions();
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'day');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'day');
 		$writer->addAttribute('class', 'datepicker_day_options');
@@ -708,12 +708,12 @@ 
 	 */
 	protected function getDropDownDayOptions()
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
-		$days = array();
-		$requiresPadding = $formatter->getDayPattern() === 'dd';
-		for($i=1;$i<=31;$i++)
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
+		$days=array();
+		$requiresPadding=$formatter->getDayPattern()==='dd';
+		for($i=1; $i <= 31; $i++)
 		{
-			$days[$i] = $requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
+			$days[$i]=$requiresPadding ? str_pad($i, 2, '0', STR_PAD_LEFT) : $i;
 		}
 		return $days;
 	}
@@ -725,7 +725,7 @@ 
 	 */
 	protected function renderCalendarMonthOptions($writer, $selected=null)
 	{
-		$info = $this->getLocalizedCalendarInfo();
+		$info=$this->getLocalizedCalendarInfo();
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'month');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'month');
 		$writer->addAttribute('class', 'datepicker_month_options');
@@ -733,7 +733,7 @@ 
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag('select');
 		$this->renderDropDownListOptions($writer,
-					$this->getLocalizedMonthNames($info), $selected-1);
+					$this->getLocalizedMonthNames($info), $selected - 1);
 		$writer->renderEndTag();
 	}
 
@@ -746,17 +746,17 @@ 
 	 */
 	protected function getLocalizedMonthNames($info)
 	{
-		$formatter = new TSimpleDateFormatter($this->getDateFormat());
+		$formatter=new TSimpleDateFormatter($this->getDateFormat());
 		switch($formatter->getMonthPattern())
 		{
 			case 'MMM': return $info->getAbbreviatedMonthNames();
 			case 'MM':
-				$array = array();
-				for($i=1;$i<=12;$i++)
-						$array[$i-1] = $i < 10 ? '0'.$i : $i;
+				$array=array();
+				for($i=1; $i <= 12; $i++)
+						$array[$i - 1]=$i < 10 ? '0'.$i : $i;
 				return $array;
 			case 'M':
-				$array = array(); for($i=1;$i<=12;$i++) $array[$i-1] = $i;
+				$array=array(); for($i=1; $i <= 12; $i++) $array[$i - 1]=$i;
 				return $array;
 			default :	return $info->getMonthNames();
 		}
@@ -769,9 +769,9 @@ 
 	 */
 	protected function renderCalendarYearOptions($writer, $selected=null)
 	{
-		$years = array();
-		for($i = $this->getFromYear(); $i <= $this->getUpToYear(); $i++)
-			$years[$i] = $i;
+		$years=array();
+		for($i=$this->getFromYear(); $i <= $this->getUpToYear(); $i++)
+			$years[$i]=$i;
 		$writer->addAttribute('id', $this->getClientID().TControl::CLIENT_ID_SEPARATOR.'year');
 		$writer->addAttribute('name', $this->getUniqueID().TControl::ID_SEPARATOR.'year');
 		$writer->addAttribute('class', 'datepicker_year_options');
@@ -800,7 +800,7 @@ 
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('type', 'button');
 		$writer->addAttribute('class', $this->getCssClass().' TDatePickerButton');
-		$writer->addAttribute('value',$this->getButtonText());
+		$writer->addAttribute('value', $this->getButtonText());
 		if(!$this->getEnabled(true))
 			$writer->addAttribute('disabled', 'disabled');
 		$writer->renderBeginTag("input");
@@ -813,8 +813,8 @@ 
 	 */
 	 protected function renderImageButtonDatePicker($writer)
 	{
-		$url = $this->getButtonImageUrl();
-		$url = empty($url) ? $this->getAssetUrl('calendar.png') : $url;
+		$url=$this->getButtonImageUrl();
+		$url=empty($url) ? $this->getAssetUrl('calendar.png') : $url;
 		$writer->addAttribute('id', $this->getDatePickerButtonID());
 		$writer->addAttribute('src', $url);
 		$writer->addAttribute('alt', ' ');
@@ -833,7 +833,7 @@ 
 	 */
 	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
 		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
@@ -843,8 +843,8 @@ 
 	 */
 	protected function publishCalendarStyle()
 	{
-		$url = $this->getAssetUrl($this->getCalendarStyle().'.css');
-		$cs = $this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($this->getCalendarStyle().'.css');
+		$cs=$this->getPage()->getClientScript();
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -857,7 +857,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -867,7 +867,7 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			$cs->registerPradoScript("datepicker");
 		}
 	}
@@ -876,16 +876,16 @@ 
 	{
 		if($this->getShowCalendar())
 		{
-			$cs = $this->getPage()->getClientScript();
+			$cs=$this->getPage()->getClientScript();
 			if(!$cs->isEndScriptRegistered('TDatePicker.spacer'))
 			{
-				$spacer = $this->getAssetUrl('spacer.gif');
-				$code = "Prado.WebUI.TDatePicker.spacer = '$spacer';";
+				$spacer=$this->getAssetUrl('spacer.gif');
+				$code="Prado.WebUI.TDatePicker.spacer = '$spacer';";
 				$cs->registerEndScript('TDatePicker.spacer', $code);
 			}
 
-			$options = TJavaScript::encode($this->getDatePickerOptions());
-			$code = "new Prado.WebUI.TDatePicker($options);";
+			$options=TJavaScript::encode($this->getDatePickerOptions());
+			$code="new Prado.WebUI.TDatePicker($options);";
 			$cs->registerEndScript("prado:".$this->getClientID(), $code);
 		}
 	}

framework/Web/UI/WebControls/TEditCommandColumn.php

Doc Comments +4 added lines

@@ -233,6 +233,10 @@
 	 * @param string button caption
 	 * @param boolean whether the button should cause validation
 	 * @param string the validation group that the button belongs to
+	 * @param string $commandName
+	 * @param string $text
+	 * @param boolean $causesValidation
+	 * @param string $validationGroup
 	 * @return mixed the newly created button.
 	 */
 	protected function createButton($commandName,$text,$causesValidation,$validationGroup)

Spacing +32 added lines, -32 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->getViewState('ButtonType',TButtonColumnType::LinkButton);
+		return $this->getViewState('ButtonType', TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -63,7 +63,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->setViewState('ButtonType',TPropertyValue::ensureEnum($value,'Prado\\Web\\UI\\WebControls\\TButtonColumnType'),TButtonColumnType::LinkButton);
+		$this->setViewState('ButtonType', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TButtonColumnType'), TButtonColumnType::LinkButton);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	public function getEditText()
 	{
-		return $this->getViewState('EditText','Edit');
+		return $this->getViewState('EditText', 'Edit');
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setEditText($value)
 	{
-		$this->setViewState('EditText',$value,'Edit');
+		$this->setViewState('EditText', $value, 'Edit');
 	}
 
 	/**
@@ -87,7 +87,7 @@ 
 	 */
 	public function getEditImageUrl()
 	{
-		return $this->getViewState('EditImageUrl','');
+		return $this->getViewState('EditImageUrl', '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setEditImageUrl($value)
 	{
-		$this->setViewState('EditImageUrl',$value,'');
+		$this->setViewState('EditImageUrl', $value, '');
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function getUpdateText()
 	{
-		return $this->getViewState('UpdateText','Update');
+		return $this->getViewState('UpdateText', 'Update');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setUpdateText($value)
 	{
-		$this->setViewState('UpdateText',$value,'Update');
+		$this->setViewState('UpdateText', $value, 'Update');
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 */
 	public function getUpdateImageUrl()
 	{
-		return $this->getViewState('UpdateImageUrl','');
+		return $this->getViewState('UpdateImageUrl', '');
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	public function setUpdateImageUrl($value)
 	{
-		$this->setViewState('UpdateImageUrl',$value,'');
+		$this->setViewState('UpdateImageUrl', $value, '');
 	}
 
 	/**
@@ -135,7 +135,7 @@ 
 	 */
 	public function getCancelText()
 	{
-		return $this->getViewState('CancelText','Cancel');
+		return $this->getViewState('CancelText', 'Cancel');
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 	 */
 	public function setCancelText($value)
 	{
-		$this->setViewState('CancelText',$value,'Cancel');
+		$this->setViewState('CancelText', $value, 'Cancel');
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function getCancelImageUrl()
 	{
-		return $this->getViewState('CancelImageUrl','');
+		return $this->getViewState('CancelImageUrl', '');
 	}
 
 	/**
@@ -159,7 +159,7 @@ 
 	 */
 	public function setCancelImageUrl($value)
 	{
-		$this->setViewState('CancelImageUrl',$value,'');
+		$this->setViewState('CancelImageUrl', $value, '');
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getCausesValidation()
 	{
-		return $this->getViewState('CausesValidation',true);
+		return $this->getViewState('CausesValidation', true);
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public function setCausesValidation($value)
 	{
-		$this->setViewState('CausesValidation',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('CausesValidation', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 	 */
 	public function getValidationGroup()
 	{
-		return $this->getViewState('ValidationGroup','');
+		return $this->getViewState('ValidationGroup', '');
 	}
 
 	/**
@@ -191,7 +191,7 @@ 
 	 */
 	public function setValidationGroup($value)
 	{
-		$this->setViewState('ValidationGroup',$value,'');
+		$this->setViewState('ValidationGroup', $value, '');
 	}
 
 	/**
@@ -203,27 +203,27 @@ 
 	 * @param integer the index to the Columns property that the cell resides in.
 	 * @param string the type of cell (Header,Footer,Item,AlternatingItem,EditItem,SelectedItem)
 	 */
-	public function initializeCell($cell,$columnIndex,$itemType)
+	public function initializeCell($cell, $columnIndex, $itemType)
 	{
 		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem)
 		{
-			$button=$this->createButton('Edit',$this->getEditText(),false,'');
+			$button=$this->createButton('Edit', $this->getEditText(), false, '');
 			$cell->getControls()->add($button);
-			$cell->registerObject('EditButton',$button);
+			$cell->registerObject('EditButton', $button);
 		}
 		else if($itemType===TListItemType::EditItem)
 		{
 			$controls=$cell->getControls();
-			$button=$this->createButton('Update',$this->getUpdateText(),$this->getCausesValidation(),$this->getValidationGroup());
+			$button=$this->createButton('Update', $this->getUpdateText(), $this->getCausesValidation(), $this->getValidationGroup());
 			$controls->add($button);
-			$cell->registerObject('UpdateButton',$button);
+			$cell->registerObject('UpdateButton', $button);
 			$controls->add(' ');
-			$button=$this->createButton('Cancel',$this->getCancelText(),false,'');
+			$button=$this->createButton('Cancel', $this->getCancelText(), false, '');
 			$controls->add($button);
-			$cell->registerObject('CancelButton',$button);
+			$cell->registerObject('CancelButton', $button);
 		}
 		else
-			parent::initializeCell($cell,$columnIndex,$itemType);
+			parent::initializeCell($cell, $columnIndex, $itemType);
 	}
 
 	/**
@@ -235,18 +235,18 @@ 
 	 * @param string the validation group that the button belongs to
 	 * @return mixed the newly created button.
 	 */
-	protected function createButton($commandName,$text,$causesValidation,$validationGroup)
+	protected function createButton($commandName, $text, $causesValidation, $validationGroup)
 	{
 		if($this->getButtonType()===TButtonColumnType::LinkButton)
-			$button= new TLinkButton;
+			$button=new TLinkButton;
 		else if($this->getButtonType()===TButtonColumnType::PushButton)
-			$button= new TButton;
+			$button=new TButton;
 		else	// image buttons
 		{
-			$button= new TImageButton;
-			if(strcasecmp($commandName,'Update')===0)
+			$button=new TImageButton;
+			if(strcasecmp($commandName, 'Update')===0)
 				$url=$this->getUpdateImageUrl();
-			else if(strcasecmp($commandName,'Cancel')===0)
+			else if(strcasecmp($commandName, 'Cancel')===0)
 				$url=$this->getCancelImageUrl();
 			else
 				$url=$this->getEditImageUrl();

framework/Web/UI/WebControls/TWebControl.php

Doc Comments +11 added lines, -2 removed lines

@@ -53,6 +53,7 @@ 
 	 * control does work with javascript and your class wants to flag that it requires an id
 	 * to operate properly.  Once set to true, it stays that way.
 	 * @param boolean pass true to enable enforcement of the tag attribute id.
+	 * @param boolean $value
 	 */
 	public function setEnsureId($value)
 	{
@@ -60,7 +61,7 @@ 
 	}
 
 	/**
-	 * @return whether this web control must have an id
+	 * @return boolean this web control must have an id
 	 */
 	public function getEnsureId()
 	{
@@ -107,6 +108,7 @@ 
 	 * Only one-character string can be set, or an exception will be raised.
 	 * Pass in an empty string if you want to disable access key.
 	 * @param string the access key to be set
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the access key is specified with more than one character
 	 */
 	public function setAccessKey($value)
@@ -186,6 +188,7 @@ 
 
 	/**
 	 * @param string the border width of the control
+	 * @param string $value
 	 */
 	public function setBorderWidth($value)
 	{
@@ -213,6 +216,7 @@ 
 
 	/**
 	 * @param string the foreground color of the control
+	 * @param string $value
 	 */
 	public function setForeColor($value)
 	{
@@ -239,7 +243,7 @@ 
 	}
 
 	/**
-	 * @return TDisplayStyle display style of the control, default is TDisplayStyle::Fixed
+	 * @return string display style of the control, default is TDisplayStyle::Fixed
 	 */
 	public function getDisplay()
 	{
@@ -248,6 +252,7 @@ 
 
 	/**
 	 * @param string the css class of the control
+	 * @param string $value
 	 */
 	public function setCssClass($value)
 	{
@@ -267,6 +272,7 @@ 
 
 	/**
 	 * @param string the height of the control
+	 * @param string $value
 	 */
 	public function setHeight($value)
 	{
@@ -310,6 +316,7 @@ 
 	 * Sets the css style string of the control.
 	 * The style string will be prefixed to the styles set via other control properties (e.g. Height, Width).
 	 * @param string the css style string
+	 * @param string $value
 	 * @throws TInvalidDataValueException if the parameter is not a string
 	 */
 	public function setStyle($value)
@@ -340,6 +347,7 @@ 
 	 * Sets the tab index of the control.
 	 * Pass 0 if you want to disable tab index.
 	 * @param integer the tab index to be set
+	 * @param integer $value
 	 */
 	public function setTabIndex($value)
 	{
@@ -388,6 +396,7 @@ 
 
 	/**
 	 * @param string the width of the control
+	 * @param string $value
 	 */
 	public function setWidth($value)
 	{

Spacing +33 added lines, -33 removed lines

@@ -56,7 +56,7 @@ 
 	 */
 	public function setEnsureId($value)
 	{
-		$this->_ensureid |= TPropertyValue::ensureBoolean($value);
+		$this->_ensureid|=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	public function getDecorator($create=true)
 	{
 		if($create && !$this->_decorator)
-			$this->_decorator = new TWebControlDecorator($this);
+			$this->_decorator=new TWebControlDecorator($this);
 		return $this->_decorator;
 	}
 
@@ -99,7 +99,7 @@ 
 	 */
 	public function getAccessKey()
 	{
-		return $this->getViewState('AccessKey','');
+		return $this->getViewState('AccessKey', '');
 	}
 
 	/**
@@ -111,9 +111,9 @@ 
 	 */
 	public function setAccessKey($value)
 	{
-		if(strlen($value)>1)
-			throw new TInvalidDataValueException('webcontrol_accesskey_invalid',get_class($this),$value);
-		$this->setViewState('AccessKey',$value,'');
+		if(strlen($value) > 1)
+			throw new TInvalidDataValueException('webcontrol_accesskey_invalid', get_class($this), $value);
+		$this->setViewState('AccessKey', $value, '');
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 	 */
 	public function getBackColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBackColor();
 		else
 			return '';
@@ -140,7 +140,7 @@ 
 	 */
 	public function getBorderColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderColor();
 		else
 			return '';
@@ -159,7 +159,7 @@ 
 	 */
 	public function getBorderStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderStyle();
 		else
 			return '';
@@ -178,7 +178,7 @@ 
 	 */
 	public function getBorderWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getBorderWidth();
 		else
 			return '';
@@ -205,7 +205,7 @@ 
 	 */
 	public function getForeColor()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getForeColor();
 		else
 			return '';
@@ -224,7 +224,7 @@ 
 	 */
 	public function getHeight()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getHeight();
 		else
 			return '';
@@ -259,7 +259,7 @@ 
 	 */
 	public function getCssClass()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getCssClass();
 		else
 			return '';
@@ -278,7 +278,7 @@ 
 	 */
 	public function getHasStyle()
 	{
-		return $this->getViewState('Style',null)!==null;
+		return $this->getViewState('Style', null)!==null;
 	}
 
 	/**
@@ -296,12 +296,12 @@ 
 	 */
 	public function getStyle()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style;
 		else
 		{
 			$style=$this->createStyle();
-			$this->setViewState('Style',$style,null);
+			$this->setViewState('Style', $style, null);
 			return $style;
 		}
 	}
@@ -317,7 +317,7 @@ 
 		if(is_string($value))
 			$this->getStyle()->setCustomStyle($value);
 		else
-			throw new TInvalidDataValueException('webcontrol_style_invalid',get_class($this));
+			throw new TInvalidDataValueException('webcontrol_style_invalid', get_class($this));
 	}
 
 	/**
@@ -333,7 +333,7 @@ 
 	 */
 	public function getTabIndex()
 	{
-		return $this->getViewState('TabIndex',0);
+		return $this->getViewState('TabIndex', 0);
 	}
 
 	/**
@@ -343,7 +343,7 @@ 
 	 */
 	public function setTabIndex($value)
 	{
-		$this->setViewState('TabIndex',TPropertyValue::ensureInteger($value),0);
+		$this->setViewState('TabIndex', TPropertyValue::ensureInteger($value), 0);
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 	 */
 	public function getToolTip()
 	{
-		return $this->getViewState('ToolTip','');
+		return $this->getViewState('ToolTip', '');
 	}
 
 	/**
@@ -372,7 +372,7 @@ 
 	 */
 	public function setToolTip($value)
 	{
-		$this->setViewState('ToolTip',$value,'');
+		$this->setViewState('ToolTip', $value, '');
 	}
 
 	/**
@@ -380,7 +380,7 @@ 
 	 */
 	public function getWidth()
 	{
-		if($style=$this->getViewState('Style',null))
+		if($style=$this->getViewState('Style', null))
 			return $style->getWidth();
 		else
 			return '';
@@ -402,7 +402,7 @@ 
 	 * @param TEventParameter event parameter to be passed to the event handlers
 	 */
 	public function onPreRender($param) {
-		if($decorator = $this->getDecorator(false))
+		if($decorator=$this->getDecorator(false))
 			$decorator->instantiate();
 
 		parent::onPreRender($param);
@@ -418,21 +418,21 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		if($this->getID()!=='' || $this->getEnsureId())
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 		if(($accessKey=$this->getAccessKey())!=='')
-			$writer->addAttribute('accesskey',$accessKey);
+			$writer->addAttribute('accesskey', $accessKey);
 		if(!$this->getEnabled())
-			$writer->addAttribute('disabled','disabled');
-		if(($tabIndex=$this->getTabIndex())>0)
-			$writer->addAttribute('tabindex',"$tabIndex");
+			$writer->addAttribute('disabled', 'disabled');
+		if(($tabIndex=$this->getTabIndex()) > 0)
+			$writer->addAttribute('tabindex', "$tabIndex");
 		if(($toolTip=$this->getToolTip())!=='')
-			$writer->addAttribute('title',$toolTip);
-		if($style=$this->getViewState('Style',null))
+			$writer->addAttribute('title', $toolTip);
+		if($style=$this->getViewState('Style', null))
 			$style->addAttributesToRender($writer);
 		if($this->getHasAttributes())
 		{
 			foreach($this->getAttributes() as $name=>$value)
-				$writer->addAttribute($name,$value);
+				$writer->addAttribute($name, $value);
 		}
 	}
 
@@ -458,7 +458,7 @@ 
 	 */
 	public function renderBeginTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPreTagText($writer);
 			$this->addAttributesToRender($writer);
 			$writer->renderBeginTag($this->getTagName());
@@ -486,7 +486,7 @@ 
 	 */
 	public function renderEndTag($writer)
 	{
-		if($decorator = $this->getDecorator(false)) {
+		if($decorator=$this->getDecorator(false)) {
 			$decorator->renderPostContentsText($writer);
 			$writer->renderEndTag();
 			$decorator->renderPostTagText($writer);