pradosoft / prado

framework/Web/UI/JuiControls/TJuiSortableTemplate.php

Doc Comments +3 added lines

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

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 	public function __construct($template)
 	{
-		$this->_template = $template;
+		$this->_template=$template;
 	}
 	/**
 	 * Instantiates the template.

framework/Web/UI/WebControls/TAccordionViewCollection.php

Doc Comments +1 added lines

@@ -42,6 +42,7 @@
 	/**
 	 * Finds the index of the accordion view whose ID is the same as the one being looked for.
 	 * @param string the explicit ID of the accordion view to be looked for
+	 * @param string $id
 	 * @return integer the index of the accordion view found, -1 if not found.
 	 */
 	public function findIndexByID($id)

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	{
 		foreach($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
+			if($view->getID(false)===$id)
 				return $index;
 		}
 		return -1;

framework/Web/UI/WebControls/TDropDownList.php

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,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 +8 added lines, -8 removed lines

@@ -43,8 +43,8 @@ 
  */
 class TDropDownList extends TListControl implements \Prado\Web\UI\IPostBackDataHandler, \Prado\Web\UI\IValidatable
 {
-	private $_dataChanged = false;
-	private $_isValid = true;
+	private $_dataChanged=false;
+	private $_isValid=true;
 
 	/**
 	 * Adds attributes to renderer.
@@ -78,14 +78,14 @@ 
 		if(!$this->getEnabled(true))
 			return false;
 		$this->ensureDataBound();
-		$selection = isset($values[$key])?$values[$key]:null;
-		if($selection !== null)
+		$selection=isset($values[$key]) ? $values[$key] : null;
+		if($selection!==null)
 		{
-			$index = $this->getItems()->findIndexByValue($selection, false);
-			if($this->getSelectedIndex() !== $index)
+			$index=$this->getItems()->findIndexByValue($selection, false);
+			if($this->getSelectedIndex()!==$index)
 			{
 				$this->setSelectedIndex($index);
-				return $this->_dataChanged = true;
+				return $this->_dataChanged=true;
 			}
 		}
 		return false;
@@ -147,6 +147,6 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 }

framework/Web/UI/WebControls/THtmlArea4.php

Doc Comments +2 added lines

@@ -478,6 +478,7 @@ 
 
 	/**
 	 * Parse additional options set in the Options property.
+	 * @param string $string
 	 * @return array additional custom options
 	 */
 	protected function parseEditorOptions($string)
@@ -502,6 +503,7 @@ 
 	}
 
 	/**
+	 * @param string $culture
 	 * @return string localized editor interface language extension.
 	 */
 	protected function getLanguageSuffix($culture)

Spacing +45 added lines, -45 removed lines

@@ -63,7 +63,7 @@ 
 	/**
 	 * @var array list of locale => language file pairs.
 	 */
-	private static $_langs = [
+	private static $_langs=[
 			'ar' => 'ar',
 			'bg_BG' => 'bg_BG',
 			'bs' => 'bs',
@@ -121,7 +121,7 @@ 
 	/**
 	 * @var array list of default plugins to load, override using getAvailablePlugins();
 	 */
-	private static $_plugins = [
+	private static $_plugins=[
 		'advlist',
 		'anchor',
 		'autolink',
@@ -165,7 +165,7 @@ 
 	/**
 	 * @var array default themes to load
 	 */
-	private static $_themes = [
+	private static $_themes=[
 		'modern',
 	];
 
@@ -315,7 +315,7 @@ 
 
 	protected function loadJavascriptLibrary()
 	{
-		$scripts = $this->getPage()->getClientScript();
+		$scripts=$this->getPage()->getClientScript();
 		$scripts->registerPradoScript('htmlarea4');
 		$this->copyCustomPlugins();
 	}
@@ -326,26 +326,26 @@ 
 	protected function registerEditorClientScript($writer)
 	{
 		$this->loadJavascriptLibrary();
-		$scripts = $this->getPage()->getClientScript();
-		$options = [
+		$scripts=$this->getPage()->getClientScript();
+		$options=[
 			'EditorOptions' => $this->getEditorOptions()
 		];
 
-		$options = TJavaScript::encode($options, true, true);
-		$script = "new {$this->getClientClassName()}($options)";
-		$scripts->registerEndScript('prado:THtmlArea4' . $this->ClientID, $script);
+		$options=TJavaScript::encode($options, true, true);
+		$script="new {$this->getClientClassName()}($options)";
+		$scripts->registerEndScript('prado:THtmlArea4'.$this->ClientID, $script);
 	}
 
 	protected function copyCustomPlugins()
 	{
-		if($plugins = $this->getCustomPluginPath())
+		if($plugins=$this->getCustomPluginPath())
 		{
-			$basepath = $this->getPage()->getClientScript()->getPradoScriptAssetPath('tinymce');
-			$assets = $this->getApplication()->getAssetManager();
-			$path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
-			$name = basename($path);
-			$dest = $basepath . '/plugins/' . $name;
-			if(!is_dir($dest) || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$basepath=$this->getPage()->getClientScript()->getPradoScriptAssetPath('tinymce');
+			$assets=$this->getApplication()->getAssetManager();
+			$path=is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
+			$name=basename($path);
+			$dest=$basepath.'/plugins/'.$name;
+			if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$assets->copyDirectory($path, $dest);
 		}
 	}
@@ -356,26 +356,26 @@ 
 	 */
 	protected function getEditorOptions()
 	{
-		$options['mode'] = 'exact';
-		$options['elements'] = $this->getClientID();
-		$options['language'] = $this->getLanguageSuffix($this->getCulture());
+		$options['mode']='exact';
+		$options['elements']=$this->getClientID();
+		$options['language']=$this->getLanguageSuffix($this->getCulture());
 		//$options['theme'] = 'modern'; //default
 		// mimic previous (tinyMCE3) sizing behaviour
-		$options['width'] = $this->getWidth();
-		$options['height'] = $this->getHeight();
-		$options['resize'] = 'both';
-		$options['menubar'] = false;
+		$options['width']=$this->getWidth();
+		$options['height']=$this->getHeight();
+		$options['resize']='both';
+		$options['menubar']=false;
 		if($this->getReadOnly())
 		{
-			$options['readonly'] = true;
-			$options['toolbar'] = false;
-			$options['menubar'] = false;
-			$options['statusbar'] = false;
+			$options['readonly']=true;
+			$options['toolbar']=false;
+			$options['menubar']=false;
+			$options['statusbar']=false;
 		}
 
-		$options['extended_valid_elements'] = 'a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
+		$options['extended_valid_elements']='a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]';
 
-		$options = array_merge($options, $this->parseEditorOptions($this->getOptions()));
+		$options=array_merge($options, $this->parseEditorOptions($this->getOptions()));
 		return $options;
 	}
 
@@ -385,20 +385,20 @@ 
 	 */
 	protected function parseEditorOptions($string)
 	{
-		$options = [];
-		$substrings = preg_split('/,\s*\n|\n/', trim($string));
+		$options=[];
+		$substrings=preg_split('/,\s*\n|\n/', trim($string));
 		foreach($substrings as $bits)
 		{
-			$option = explode(":", $bits, 2);
+			$option=explode(":", $bits, 2);
 
-			if(count($option) == 2)
+			if(count($option)==2)
 			{
-				$value = trim(trim($option[1]), "'\"");
-				if (($s = strtolower($value)) === 'false')
-					$value = false;
-				elseif ($s === 'true')
-					$value = true;
-				$options[trim($option[0])] = $value;
+				$value=trim(trim($option[1]), "'\"");
+				if(($s=strtolower($value))==='false')
+					$value=false;
+				elseif($s==='true')
+					$value=true;
+				$options[trim($option[0])]=$value;
 			}
 		}
 		return $options;
@@ -409,12 +409,12 @@ 
 	 */
 	protected function getLanguageSuffix($culture)
 	{
-		$app = $this->getApplication()->getGlobalization();
-		if(empty($culture) && ($app !== null))
-			$culture = $app->getCulture();
-		$variants = [];
-		if($app !== null)
-			$variants = $app->getCultureVariants($culture);
+		$app=$this->getApplication()->getGlobalization();
+		if(empty($culture) && ($app!==null))
+			$culture=$app->getCulture();
+		$variants=[];
+		if($app!==null)
+			$variants=$app->getCultureVariants($culture);
 
 		foreach($variants as $variant)
 		{

framework/Web/UI/WebControls/TInlineFrame.php

Doc Comments +1 added lines

@@ -84,6 +84,7 @@
 
 	/**
 	 * @param boolean whether there should be a visual separator between the frames.
+	 * @param boolean $value
 	 */
 	public function setShowBorder($value)
 	{

Spacing +20 added lines, -20 removed lines

@@ -162,8 +162,8 @@ 
 	 */
 	public function setWidth($value)
 	{
-	  if(($value = TPropertyValue::ensureInteger($value)) < 0)
-		$value = -1;
+	  if(($value=TPropertyValue::ensureInteger($value)) < 0)
+		$value=-1;
 	  $this->setViewState('Width', $value, -1);
 	}
 	
@@ -180,8 +180,8 @@ 
 	 */
 	public function setHeight($value)
 	{
-	  if(($value = TPropertyValue::ensureInteger($value)) < 0)
-		$value = -1;
+	  if(($value=TPropertyValue::ensureInteger($value)) < 0)
+		$value=-1;
 	  $this->setViewState('Height', $value, -1);
 	}
 	
@@ -200,8 +200,8 @@ 
 	 */
 	public function setMarginWidth($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
 		$this->setViewState('MarginWidth', $value, -1);
 	}
 
@@ -220,8 +220,8 @@ 
 	 */
 	public function setMarginHeight($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
 		$this->setViewState('MarginHeight', $value, -1);
 	}
 
@@ -232,37 +232,37 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if($this->getID() !== '')
+		if($this->getID()!=='')
 			$writer->addAttribute('name', $this->getUniqueID());
 
-		if(($src = $this->getFrameUrl()) !== '')
+		if(($src=$this->getFrameUrl())!=='')
 			$writer->addAttribute('src', $src);
 
-		if(($align = strtolower($this->getAlign())) !== 'notset')
+		if(($align=strtolower($this->getAlign()))!=='notset')
 			$writer->addAttribute('align', $align);
 
-		$scrollBars = $this->getScrollBars();
-		if($scrollBars === TInlineFrameScrollBars::None)
+		$scrollBars=$this->getScrollBars();
+		if($scrollBars===TInlineFrameScrollBars::None)
 			$writer->addAttribute('scrolling', 'no');
-		elseif($scrollBars === TInlineFrameScrollBars::Both)
+		elseif($scrollBars===TInlineFrameScrollBars::Both)
 			$writer->addAttribute('scrolling', 'yes');
 
-		if (!$this->getShowBorder())
+		if(!$this->getShowBorder())
 			$writer->addAttribute('frameborder', '0');
 
-		if(($longdesc = $this->getDescriptionUrl()) !== '')
+		if(($longdesc=$this->getDescriptionUrl())!=='')
 			$writer->addAttribute('longdesc', $longdesc);
 		
-		if (($width = $this->getWidth()) !== -1)
+		if(($width=$this->getWidth())!==-1)
 		  $writer->addAttribute('width', $width);
 		
-		if (($height = $this->getHeight()) !== -1)
+		if(($height=$this->getHeight())!==-1)
 		  $writer->addAttribute('height', $height);
 
-		if(($marginheight = $this->getMarginHeight()) !== -1)
+		if(($marginheight=$this->getMarginHeight())!==-1)
 			$writer->addAttribute('marginheight', $marginheight);
 
-		if(($marginwidth = $this->getMarginWidth()) !== -1)
+		if(($marginwidth=$this->getMarginWidth())!==-1)
 			$writer->addAttribute('marginwidth', $marginwidth);
 
 		parent::addAttributesToRender($writer);

framework/Web/UI/WebControls/TSlider.php

Doc Comments +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
 	 * Returns the value of the TSlider control.
 	 * This method is required by {@link \Prado\IDataRenderer}.
 	 * It is the same as {@link getValue()}.
-	 * @return string the value of the TSlider control.
+	 * @return double the value of the TSlider control.
 	 * @see getValue
 	 */
 	public function getData()

Spacing +54 added lines, -54 removed lines

@@ -50,7 +50,7 @@ 
  */
 class TSlider extends \Prado\Web\UI\WebControls\TWebControl implements \Prado\Web\UI\IPostBackDataHandler, \Prado\IDataRenderer
 {
-	const MAX_STEPS = 200;
+	const MAX_STEPS=200;
 	/**
 	 * @var TSliderHandle handle component
 	 */
@@ -58,7 +58,7 @@ 
 	/*
 	 * @var boolean Wether the data has changed during postback
 	 */
-	private $_dataChanged = false;
+	private $_dataChanged=false;
 	/**
 	 * @var TSliderClientScript Clients side javascripts
 	 */
@@ -151,7 +151,7 @@ 
 	/**
 	 * @return boolean wether to display a progress indicator or not. Defaults to true.
 	 */
-	public function getProgressIndicator ()
+	public function getProgressIndicator()
 	{
 		return $this->getViewState('ProgressIndicator', true);
 	}
@@ -159,7 +159,7 @@ 
 	/**
 	 * @param boolean wether to display a progress indicator or not. Defaults to true.
 	 */
-	public function setProgressIndicator ($value)
+	public function setProgressIndicator($value)
 	{
 		$this->setViewState('ProgressIndicator', TPropertyValue::ensureBoolean($value), true);
 	}
@@ -296,11 +296,11 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		$value = (float)$values[$this->getClientID() . '_1'];
-		if($this->getValue() !== $value)
+		$value=(float) $values[$this->getClientID().'_1'];
+		if($this->getValue()!==$value)
 		{
 			$this->setValue($value);
-			return $this->_dataChanged = true;
+			return $this->_dataChanged=true;
 		}
 		else
 			return false;
@@ -319,8 +319,8 @@ 
 	 */
 	public function getClientSide()
 	{
-		if($this->_clientScript === null)
-			$this->_clientScript = $this->createClientScript();
+		if($this->_clientScript===null)
+			$this->_clientScript=$this->createClientScript();
 		return $this->_clientScript;
 	}
 
@@ -335,7 +335,7 @@ 
 	/**
 	 * @return string the HTML tag name for slider. Defaults to div.
 	 */
-	public function getTagName ()
+	public function getTagName()
 	{
 		return "div";
 	}
@@ -348,10 +348,10 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->getCssClass() === '')
+		if($this->getCssClass()==='')
 		{
-			$class = ($this->getDirection() == TSliderDirection::Horizontal)?'HorizontalSlider':'VerticalSlider';
-			$writer->addAttribute('class', 'Slider ' . $class);
+			$class=($this->getDirection()==TSliderDirection::Horizontal) ? 'HorizontalSlider' : 'VerticalSlider';
+			$writer->addAttribute('class', 'Slider '.$class);
 		}
 
 	}
@@ -363,13 +363,13 @@ 
 	{
 		// Render the 'Track'
 		$writer->addAttribute('class', 'Track');
-		$writer->addAttribute('id', $this->getClientID() . '_track');
+		$writer->addAttribute('id', $this->getClientID().'_track');
 		$writer->renderBeginTag('div');
 		// Render the 'Progress Indicator'
-		if ($this->getProgressIndicator())
+		if($this->getProgressIndicator())
 		{
 			$writer->addAttribute('class', 'Progress');
-			$writer->addAttribute('id', $this->getClientID() . '_progress');
+			$writer->addAttribute('id', $this->getClientID().'_progress');
 			$writer->renderBeginTag('div');
 			$writer->renderEndTag();
 		}
@@ -394,7 +394,7 @@ 
 
 		// Render the 'Handle'
 		$writer->addAttribute('class', 'Handle');
-		$writer->addAttribute('id', $this->getClientID() . '_handle');
+		$writer->addAttribute('id', $this->getClientID().'_handle');
 		$writer->renderBeginTag('div');
 		$writer->renderEndTag();
 	}
@@ -403,7 +403,7 @@ 
 	 * This method is invoked right before the control rendering, if the control is visible.
 	 * @param mixed event parameter
 	 */
-	public function onPreRender ($param)
+	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
 		$this->registerStyleSheet();
@@ -418,12 +418,12 @@ 
 	 */
 	protected function registerStyleSheet()
 	{
-		if(($url = $this->getCssUrl()) === '')
+		if(($url=$this->getCssUrl())==='')
 		{
-			$manager = $this->getApplication()->getAssetManager();
+			$manager=$this->getApplication()->getAssetManager();
 			// publish the assets
-			$url = $manager->publishFilePath(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'TSlider');
-			$url .= '/TSlider.css';
+			$url=$manager->publishFilePath(dirname(__FILE__).DIRECTORY_SEPARATOR.'assets'.DIRECTORY_SEPARATOR.'TSlider');
+			$url.='/TSlider.css';
 		}
 		$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 	}
@@ -433,11 +433,11 @@ 
 	 */
 	protected function registerSliderClientScript()
 	{
-		$page = $this->getPage();
-		$cs = $page->getClientScript();
+		$page=$this->getPage();
+		$cs=$page->getClientScript();
 		$cs->registerPradoScript("slider");
-		$id = $this->getClientID();
-		$cs->registerHiddenField($id . '_1', $this->getValue());
+		$id=$this->getClientID();
+		$cs->registerHiddenField($id.'_1', $this->getValue());
 		$page->registerRequiresPostData($this);
 		$cs->registerPostBackControl($this->getClientClassName(), $this->getSliderOptions());
 	}
@@ -449,50 +449,50 @@ 
 	protected function getSliderOptions()
 	{
 		// PostBack Options :
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['AutoPostBack']=$this->getAutoPostBack();
 
 		// Slider Control options
-		$minValue = $this->getMinValue();
-		$maxValue = $this->getMaxValue();
-		$options['axis'] = strtolower($this->getDirection());
-		$options['maximum'] = $maxValue;
-		$options['minimum'] = $minValue;
-		$options['range'] = [$minValue, $maxValue];
-		$options['sliderValue'] = $this->getValue();
-		$options['disabled'] = !$this->getEnabled();
-		$values = $this->getValues();
-		if (!empty($values))
+		$minValue=$this->getMinValue();
+		$maxValue=$this->getMaxValue();
+		$options['axis']=strtolower($this->getDirection());
+		$options['maximum']=$maxValue;
+		$options['minimum']=$minValue;
+		$options['range']=[$minValue, $maxValue];
+		$options['sliderValue']=$this->getValue();
+		$options['disabled']=!$this->getEnabled();
+		$values=$this->getValues();
+		if(!empty($values))
 		{
 			// Values are provided. Check if min/max are present in them
-			if (!in_array($minValue, $values)) $values[] = $minValue;
-			if (!in_array($maxValue, $values)) $values[] = $maxValue;
+			if(!in_array($minValue, $values)) $values[]=$minValue;
+			if(!in_array($maxValue, $values)) $values[]=$maxValue;
 			// Remove all values outsize the range [min..max]
-			foreach ($values as $idx => $value)
+			foreach($values as $idx => $value)
 			{
-				if ($value < $minValue) unset($values[$idx]);
-				if ($value > $maxValue) unset($values[$idx]);
+				if($value < $minValue) unset($values[$idx]);
+				if($value > $maxValue) unset($values[$idx]);
 			}
 		}
 		else
 		{
 			// Values are not provided, generate automatically using stepsize
-			$step = $this->getStepSize();
+			$step=$this->getStepSize();
 			// We want at most self::MAX_STEPS values, so, change the step if necessary
-			if (($maxValue - $minValue) / $step > self::MAX_STEPS)
+			if(($maxValue - $minValue) / $step > self::MAX_STEPS)
 			{
-				$step = ($maxValue - $minValue) / self::MAX_STEPS;
+				$step=($maxValue - $minValue) / self::MAX_STEPS;
 			}
-			$values = [];
-			for ($i = $minValue;$i <= $maxValue;$i += $step)
-				$values[] = $i;
+			$values=[];
+			for($i=$minValue; $i <= $maxValue; $i+=$step)
+				$values[]=$i;
 			// Add max if it's not in the array because of step
-			if (!in_array($maxValue, $values)) $values[] = $maxValue;
+			if(!in_array($maxValue, $values)) $values[]=$maxValue;
 		}
-		$options['values'] = $values;
-		if($this->_clientScript !== null)
-			$options = array_merge($options, $this->_clientScript->getOptions()->toArray());
+		$options['values']=$values;
+		if($this->_clientScript!==null)
+			$options=array_merge($options, $this->_clientScript->getOptions()->toArray());
 		return $options;
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -301,8 +301,7 @@ 
 		{
 			$this->setValue($value);
 			return $this->_dataChanged = true;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -474,8 +473,7 @@ 
 				if ($value < $minValue) unset($values[$idx]);
 				if ($value > $maxValue) unset($values[$idx]);
 			}
-		}
-		else
+		} else
 		{
 			// Values are not provided, generate automatically using stepsize
 			$step = $this->getStepSize();

framework/Web/UI/WebControls/TTabViewCollection.php

Doc Comments +1 added lines

@@ -42,6 +42,7 @@
 	/**
 	 * Finds the index of the tab view whose ID is the same as the one being looked for.
 	 * @param string the explicit ID of the tab view to be looked for
+	 * @param string $id
 	 * @return integer the index of the tab view found, -1 if not found.
 	 */
 	public function findIndexByID($id)

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	{
 		foreach($this as $index => $view)
 		{
-			if($view->getID(false) === $id)
+			if($view->getID(false)===$id)
 				return $index;
 		}
 		return -1;

framework/Web/UI/WebControls/TTextBox.php

Doc Comments +3 added lines, -1 removed lines

@@ -285,7 +285,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()
 	{
@@ -390,6 +390,7 @@ 
 	 * An automatic postback to the server will occur whenever the user
 	 * modifies the text in the TTextBox control and then tabs out of the component.
 	 * @param boolean the value indicating if postback automatically
+	 * @param boolean $value
 	 */
 	public function setAutoPostBack($value)
 	{
@@ -473,6 +474,7 @@ 
 
 	/**
 	 * @param boolean whether the textbox is read only
+	 * @param boolean $value
 	 */
 	public function setReadOnly($value)
 	{

Spacing +48 added lines, -48 removed lines

@@ -60,28 +60,28 @@ 
 	/**
 	 * Default number of rows (for MultiLine text box)
 	 */
-	const DEFAULT_ROWS = 4;
+	const DEFAULT_ROWS=4;
 	/**
 	 * Default number of columns (for MultiLine text box)
 	 */
-	const DEFAULT_COLUMNS = 20;
+	const DEFAULT_COLUMNS=20;
 	/**
 	 * @var mixed safe text parser
 	 */
-	private static $_safeTextParser = null;
+	private static $_safeTextParser=null;
 	/**
 	 * @var string safe textbox content with javascript stripped off
 	 */
 	private $_safeText;
-	private $_dataChanged = false;
-	private $_isValid = true;
+	private $_dataChanged=false;
+	private $_isValid=true;
 
 	/**
 	 * @return string tag name of the textbox
 	 */
 	protected function getTagName()
 	{
-		return ($this->getTextMode() === 'MultiLine')?'textarea':'input';
+		return ($this->getTextMode()==='MultiLine') ? 'textarea' : 'input';
 	}
 
 	/**
@@ -107,16 +107,16 @@ 
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		$page = $this->getPage();
+		$page=$this->getPage();
 		$page->ensureRenderInForm($this);
-		if(($uid = $this->getUniqueID()) !== '')
+		if(($uid=$this->getUniqueID())!=='')
 			$writer->addAttribute('name', $uid);
-		if(($textMode = $this->getTextMode()) === TTextBoxMode::MultiLine)
+		if(($textMode=$this->getTextMode())===TTextBoxMode::MultiLine)
 		{
-			if(($rows = $this->getRows()) <= 0)
-				$rows = self::DEFAULT_ROWS;
-			if(($cols = $this->getColumns()) <= 0)
-				$cols = self::DEFAULT_COLUMNS;
+			if(($rows=$this->getRows()) <= 0)
+				$rows=self::DEFAULT_ROWS;
+			if(($cols=$this->getColumns()) <= 0)
+				$cols=self::DEFAULT_COLUMNS;
 			$writer->addAttribute('rows', "$rows");
 			$writer->addAttribute('cols', "$cols");
 			if(!$this->getWrap())
@@ -174,42 +174,42 @@ 
 					break;
 			}
 
-			if(($text = $this->getText()) !== '' && ($textMode !== TTextBoxMode::Password || $this->getPersistPassword()))
+			if(($text=$this->getText())!=='' && ($textMode!==TTextBoxMode::Password || $this->getPersistPassword()))
 				$writer->addAttribute('value', $text);
 
-			if(($act = $this->getAutoCompleteType()) !== 'None')
+			if(($act=$this->getAutoCompleteType())!=='None')
 			{
-				if($act === 'Disabled')
+				if($act==='Disabled')
 					$writer->addAttribute('autocomplete', 'off');
-				elseif($act === 'Search')
+				elseif($act==='Search')
 					$writer->addAttribute('vcard_name', 'search');
-				elseif($act === 'HomeCountryRegion')
+				elseif($act==='HomeCountryRegion')
 					$writer->addAttribute('vcard_name', 'HomeCountry');
-				elseif($act === 'BusinessCountryRegion')
+				elseif($act==='BusinessCountryRegion')
 					$writer->addAttribute('vcard_name', 'BusinessCountry');
 				else
 				{
-					if(strpos($act, 'Business') === 0)
-						$act = 'Business' . '.' . substr($act, 8);
-					elseif(strpos($act, 'Home') === 0)
-						$act = 'Home' . '.' . substr($act, 4);
-					$writer->addAttribute('vcard_name', 'vCard.' . $act);
+					if(strpos($act, 'Business')===0)
+						$act='Business'.'.'.substr($act, 8);
+					elseif(strpos($act, 'Home')===0)
+						$act='Home'.'.'.substr($act, 4);
+					$writer->addAttribute('vcard_name', 'vCard.'.$act);
 				}
 			}
 
-			if(($cols = $this->getColumns()) > 0)
+			if(($cols=$this->getColumns()) > 0)
 				$writer->addAttribute('size', "$cols");
-			if(($maxLength = $this->getMaxLength()) > 0)
+			if(($maxLength=$this->getMaxLength()) > 0)
 				$writer->addAttribute('maxlength', "$maxLength");
 		}
 		if($this->getReadOnly())
 			$writer->addAttribute('readonly', 'readonly');
-		$isEnabled = $this->getEnabled(true);
+		$isEnabled=$this->getEnabled(true);
 		if(!$isEnabled && $this->getEnabled())  // in this case parent will not render 'disabled'
 			$writer->addAttribute('disabled', 'disabled');
 		if($isEnabled
 			&& $this->getEnableClientScript()
-			&& ($this->getAutoPostBack() || $textMode === TTextBoxMode::SingleLine)
+			&& ($this->getAutoPostBack() || $textMode===TTextBoxMode::SingleLine)
 			&& $page->getClientSupportsJavaScript())
 		{
 			$this->renderClientControlScript($writer);
@@ -223,7 +223,7 @@ 
 	protected function renderClientControlScript($writer)
 	{
 		$writer->addAttribute('id', $this->getClientID());
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		$cs->registerPostBackControl($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -243,12 +243,12 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options['ID'] = $this->getClientID();
-		$options['EventTarget'] = $this->getUniqueID();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
-		$options['CausesValidation'] = $this->getCausesValidation();
-		$options['ValidationGroup'] = $this->getValidationGroup();
-		$options['TextMode'] = $this->getTextMode();
+		$options['ID']=$this->getClientID();
+		$options['EventTarget']=$this->getUniqueID();
+		$options['AutoPostBack']=$this->getAutoPostBack();
+		$options['CausesValidation']=$this->getCausesValidation();
+		$options['ValidationGroup']=$this->getValidationGroup();
+		$options['TextMode']=$this->getTextMode();
 		return $options;
 	}
 
@@ -261,13 +261,13 @@ 
 	 */
 	public function loadPostData($key, $values)
 	{
-		$value = $values[$key];
+		$value=$values[$key];
 		if($this->getAutoTrim())
-			$value = trim($value);
-		if(!$this->getReadOnly() && $this->getText() !== $value)
+			$value=trim($value);
+		if(!$this->getReadOnly() && $this->getText()!==$value)
 		{
 			$this->setText($value);
-			return $this->_dataChanged = true;
+			return $this->_dataChanged=true;
 		}
 		else
 			return false;
@@ -307,7 +307,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -343,7 +343,7 @@ 
 	 */
 	public function renderContents($writer)
 	{
-		if($this->getTextMode() === 'MultiLine')
+		if($this->getTextMode()==='MultiLine')
 			$writer->write(THttpUtility::htmlEncode($this->getText()));
 	}
 
@@ -355,7 +355,7 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if($this->getTextMode() === 'MultiLine')
+		if($this->getTextMode()==='MultiLine')
 			$writer->write("\n");
 	}
 
@@ -528,7 +528,7 @@ 
 	public function setText($value)
 	{
 		$this->setViewState('Text', TPropertyValue::ensureString($value), '');
-		$this->_safeText = null;
+		$this->_safeText=null;
 	}
 
 	/**
@@ -562,8 +562,8 @@ 
 	 */
 	public function getSafeText()
 	{
-		if($this->_safeText === null)
-			$this->_safeText = $this->getSafeTextParser()->purify($this->getText());
+		if($this->_safeText===null)
+			$this->_safeText=$this->getSafeTextParser()->purify($this->getText());
 		return $this->_safeText;
 	}
 
@@ -573,7 +573,7 @@ 
 	protected function getSafeTextParser()
 	{
 		if(!self::$_safeTextParser)
-			self::$_safeTextParser = new \HTMLPurifier($this->getConfig());
+			self::$_safeTextParser=new \HTMLPurifier($this->getConfig());
 		return self::$_safeTextParser;
 	}
 
@@ -642,7 +642,7 @@ 
 	 */
 	public function getConfig()
 	{
-	  $config = $this->getViewState('Config', null);
-	  return ($config === null) ? \HTMLPurifier_Config::createDefault() : $config;
+	  $config=$this->getViewState('Config', null);
+	  return ($config===null) ? \HTMLPurifier_Config::createDefault() : $config;
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -121,8 +121,7 @@ 
 			$writer->addAttribute('cols', "$cols");
 			if(!$this->getWrap())
 				$writer->addAttribute('wrap', 'off');
-		}
-		else
+		} else
 		{
 			switch($textMode)
 			{
@@ -268,8 +267,7 @@ 
 		{
 			$this->setText($value);
 			return $this->_dataChanged = true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Data/Common/Mssql/TMssqlCommandBuilder.php

Braces +1 added lines, -2 removed lines

@@ -138,8 +138,7 @@
 						$ordering[$subs[1][0]] = $subs[2][0];
 					}
 					//else what?
-				}
-				else
+				} else
 					$ordering[trim($part)] = 'ASC';
 			}
 		}

Spacing +23 added lines, -23 removed lines

@@ -35,7 +35,7 @@ 
 		{
 			if($column->hasSequence())
 			{
-				$command = $this->getDbConnection()->createCommand('SELECT @@Identity');
+				$command=$this->getDbConnection()->createCommand('SELECT @@Identity');
 				return intval($command->queryScalar());
 			}
 		}
@@ -81,14 +81,14 @@ 
 	 * @param integer row offset, -1 to ignore offset.
 	 * @return string SQL with limit and offset.
 	 */
-	public function applyLimitOffset($sql, $limit = -1, $offset = -1)
+	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit !== null ? intval($limit) : -1;
-		$offset = $offset !== null ? intval($offset) : -1;
-		if ($limit > 0 && $offset <= 0) //just limit
-			$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $limit", $sql);
+		$limit=$limit!==null ? intval($limit) : -1;
+		$offset=$offset!==null ? intval($offset) : -1;
+		if($limit > 0 && $offset <= 0) //just limit
+			$sql=preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $limit", $sql);
 		elseif($limit > 0 && $offset > 0)
-			$sql = $this->rewriteLimitOffsetSql($sql, $limit, $offset);
+			$sql=$this->rewriteLimitOffsetSql($sql, $limit, $offset);
 		return $sql;
 	}
 
@@ -102,13 +102,13 @@ 
 	 */
 	protected function rewriteLimitOffsetSql($sql, $limit, $offset)
 	{
-		$fetch = $limit + $offset;
-		$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $fetch", $sql);
-		$ordering = $this->findOrdering($sql);
+		$fetch=$limit + $offset;
+		$sql=preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $fetch", $sql);
+		$ordering=$this->findOrdering($sql);
 
-		$orginalOrdering = $this->joinOrdering($ordering);
-		$reverseOrdering = $this->joinOrdering($this->reverseDirection($ordering));
-		$sql = "SELECT * FROM (SELECT TOP {$limit} * FROM ($sql) as [__inner top table__] {$reverseOrdering}) as [__outer top table__] {$orginalOrdering}";
+		$orginalOrdering=$this->joinOrdering($ordering);
+		$reverseOrdering=$this->joinOrdering($this->reverseDirection($ordering));
+		$sql="SELECT * FROM (SELECT TOP {$limit} * FROM ($sql) as [__inner top table__] {$reverseOrdering}) as [__outer top table__] {$orginalOrdering}";
 		return $sql;
 	}
 
@@ -122,25 +122,25 @@ 
 	{
 		if(!preg_match('/ORDER BY/i', $sql))
 			return [];
-		$matches = [];
-		$ordering = [];
+		$matches=[];
+		$ordering=[];
 		preg_match_all('/(ORDER BY)[\s"\[](.*)(ASC|DESC)?(?:[\s"\[]|$|COMPUTE|FOR)/i', $sql, $matches);
 		if(count($matches) > 1 && count($matches[2]) > 0)
 		{
-			$parts = explode(',', $matches[2][0]);
+			$parts=explode(',', $matches[2][0]);
 			foreach($parts as $part)
 			{
-				$subs = [];
+				$subs=[];
 				if(preg_match_all('/(.*)[\s"\]](ASC|DESC)$/i', trim($part), $subs))
 				{
 					if(count($subs) > 1 && count($subs[2]) > 0)
 					{
-						$ordering[$subs[1][0]] = $subs[2][0];
+						$ordering[$subs[1][0]]=$subs[2][0];
 					}
 					//else what?
 				}
 				else
-					$ordering[trim($part)] = 'ASC';
+					$ordering[trim($part)]='ASC';
 			}
 		}
 		return $ordering;
@@ -154,10 +154,10 @@ 
 	{
 		if(count($orders) > 0)
 		{
-			$str = [];
+			$str=[];
 			foreach($orders as $column => $direction)
-				$str[] = $column . ' ' . $direction;
-			return 'ORDER BY ' . implode(', ', $str);
+				$str[]=$column.' '.$direction;
+			return 'ORDER BY '.implode(', ', $str);
 		}
 	}
 
@@ -168,7 +168,7 @@ 
 	protected function reverseDirection($orders)
 	{
 		foreach($orders as $column => $direction)
-			$orders[$column] = strtolower(trim($direction)) === 'desc' ? 'ASC' : 'DESC';
+			$orders[$column]=strtolower(trim($direction))==='desc' ? 'ASC' : 'DESC';
 		return $orders;
 	}
 }