pradosoft / prado

framework/Web/UI/WebControls/TEmailAddressValidator.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
 	 * Regular expression used to validate the email address
 	 * @see http://www.regular-expressions.info/email.html
 	 */
-	const EMAIL_REGEXP = '[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?';
+	const EMAIL_REGEXP='[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&\'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?';
 
 	/**
 	 * Gets the name of the javascript class responsible for performing validation for this control.
@@ -48,8 +48,8 @@ 
 	 */
 	public function getRegularExpression()
 	{
-		$regex = parent::getRegularExpression();
-		return $regex === ''?self::EMAIL_REGEXP:$regex;
+		$regex=parent::getRegularExpression();
+		return $regex==='' ?self::EMAIL_REGEXP : $regex;
 	}
 
 	/**
@@ -58,17 +58,17 @@ 
 	 */
 	public function evaluateIsValid()
 	{
-		$value = $this->getValidationValue($this->getValidationTarget());
-		$valid = $valid = is_string($value) && strlen($value) <= 254 && parent::evaluateIsValid();
+		$value=$this->getValidationValue($this->getValidationTarget());
+		$valid=$valid=is_string($value) && strlen($value) <= 254 && parent::evaluateIsValid();
 
 		if($valid && $this->getCheckMXRecord() && function_exists('checkdnsrr'))
 		{
-			if($value !== '')
+			if($value!=='')
 			{
-				if(($pos = strpos($value, '@')) !== false)
+				if(($pos=strpos($value, '@'))!==false)
 				{
-					$domain = substr($value, $pos + 1);
-					return $domain === ''?false:checkdnsrr($domain, 'MX');
+					$domain=substr($value, $pos + 1);
+					return $domain==='' ?false:checkdnsrr($domain, 'MX');
 				}
 				else
 					return false;

Braces +1 added lines, -2 removed lines

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

framework/Web/UI/WebControls/TFlushOutput.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +4 added lines, -4 removed lines

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

framework/Web/UI/WebControls/TRatingList.php

Doc Comments +1 added lines

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

Braces +1 added lines, -2 removed lines

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

Spacing +37 added lines, -37 removed lines

@@ -29,12 +29,12 @@ 
 	/**
 	 * Script path relative to the TClientScriptManager::SCRIPT_PATH
 	 */
-	const SCRIPT_PATH = 'ratings';
+	const SCRIPT_PATH='ratings';
 
 	/**
 	 * @var array list of published rating images.
 	 */
-	private $_ratingImages = [];
+	private $_ratingImages=[];
 
 	/**
 	 * Sets the default repeat direction to horizontal.
@@ -95,7 +95,7 @@ 
 	 */
 	public function setRepeatLayout($value)
 	{
-		if($value !== TRepeatLayout::Table)
+		if($value!==TRepeatLayout::Table)
 			throw new TInvalidDataValueException('ratinglist_table_layout_only');
 		else
 			parent::setRepeatLayout($value);
@@ -106,8 +106,8 @@ 
 	 */
 	public function getRating()
 	{
-		$rating = $this->getViewState('Rating', null);
-		if ($rating === null)
+		$rating=$this->getViewState('Rating', null);
+		if($rating===null)
 			return $this->getSelectedIndex() + 1;
 		else
 			return $rating;
@@ -118,9 +118,9 @@ 
 	 */
 	public function setRating($value)
 	{
-		$value = TPropertyValue::ensureFloat($value);
+		$value=TPropertyValue::ensureFloat($value);
 		$this->setViewState('Rating', $value, null);
-		$index = $this->getRatingIndex($value);
+		$index=$this->getRatingIndex($value);
 		parent::setSelectedIndex($index);
 	}
 
@@ -136,9 +136,9 @@ 
 	 */
 	protected function getRatingIndex($rating)
 	{
-		$interval = $this->getHalfRatingInterval();
-		$base = intval($rating) - 1;
-		$remainder = $rating - $base - 1;
+		$interval=$this->getHalfRatingInterval();
+		$base=intval($rating) - 1;
+		$remainder=$rating - $base - 1;
 		return $remainder > $interval[1] ? $base + 1 : $base;
 	}
 
@@ -147,8 +147,8 @@ 
 	 */
 	public function onSelectedIndexChanged($param)
 	{
-		$value = $this->getRating();
-		$value = TPropertyValue::ensureInteger($value);
+		$value=$this->getRating();
+		$value=TPropertyValue::ensureInteger($value);
 		$this->setRating($value);
 		parent::onSelectedIndexChanged($param);
 	}
@@ -171,11 +171,11 @@ 
 
 	protected function getCaptionControl()
 	{
-		if(($id = $this->getCaptionID()) !== '')
+		if(($id=$this->getCaptionID())!=='')
 		{
-			if($control = $this->getPage()->findControl($id))
+			if($control=$this->getPage()->findControl($id))
 				return $control;
-			if($control = $this->getNamingContainer()->findControl($id))
+			if($control=$this->getNamingContainer()->findControl($id))
 				return $control;
 		}
 		throw new TInvalidDataValueException(
@@ -219,7 +219,7 @@ 
 	 */
 	protected function getRatingStyleCssClass()
 	{
-		return 'TRatingList_' . $this->getRatingStyle();
+		return 'TRatingList_'.$this->getRatingStyle();
 	}
 
 	/**
@@ -246,14 +246,14 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = parent::getPostBackOptions();
-		$options['AutoPostBack'] = $this->getAutoPostBack();
-		$options['ReadOnly'] = $this->getReadOnly();
-		$options['Style'] = $this->getRatingStyleCssClass();
-		$options['CaptionID'] = $this->getCaptionControlID();
-		$options['SelectedIndex'] = $this->getSelectedIndex();
-		$options['Rating'] = $this->getRating();
-		$options['HalfRating'] = $this->getHalfRatingInterval();
+		$options=parent::getPostBackOptions();
+		$options['AutoPostBack']=$this->getAutoPostBack();
+		$options['ReadOnly']=$this->getReadOnly();
+		$options['Style']=$this->getRatingStyleCssClass();
+		$options['CaptionID']=$this->getCaptionControlID();
+		$options['SelectedIndex']=$this->getSelectedIndex();
+		$options['Rating']=$this->getRating();
+		$options['HalfRating']=$this->getHalfRatingInterval();
 		return $options;
 	}
 
@@ -262,9 +262,9 @@ 
 	 */
 	protected function getCaptionControlID()
 	{
-		if(($id = $this->getCaptionID()) !== '')
+		if(($id=$this->getCaptionID())!=='')
 		{
-			if($control = $this->getParent()->findControl($id))
+			if($control=$this->getParent()->findControl($id))
 			{
 				if($control->getVisible(true))
 					return $control->getClientID();
@@ -282,7 +282,7 @@ 
 	{
 		parent::onPreRender($param);
 		$this->publishStyle($this->getRatingStyle());
-		$this->_ratingImages = $this->publishImages($this->getRatingStyle());
+		$this->_ratingImages=$this->publishImages($this->getRatingStyle());
 		$this->registerClientScript();
 	}
 
@@ -292,8 +292,8 @@ 
 	 */
 	protected function publishStyle($style)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$url = $this->getAssetUrl($style . '.css');
+		$cs=$this->getPage()->getClientScript();
+		$url=$this->getAssetUrl($style.'.css');
 		if(!$cs->isStyleSheetFileRegistered($url))
 			$cs->registerStyleSheetFile($url, $url);
 		return $url;
@@ -304,12 +304,12 @@ 
 	 * @param string rating image file extension, default is '.gif'
 	 * @return array URL of publish the rating images
 	 */
-	protected function publishImages($style, $fileExt = '.gif')
+	protected function publishImages($style, $fileExt='.gif')
 	{
-		$types = ['blank', 'selected', 'half', 'combined'];
-		$files = [];
+		$types=['blank', 'selected', 'half', 'combined'];
+		$files=[];
 		foreach($types as $type)
-			$files[$type] = $this->getAssetUrl("{$style}_{$type}{$fileExt}");
+			$files[$type]=$this->getAssetUrl("{$style}_{$type}{$fileExt}");
 		return $files;
 	}
 
@@ -318,7 +318,7 @@ 
 	 */
 	protected function registerClientScript()
 	{
-		$cs = $this->getPage()->getClientScript();
+		$cs=$this->getPage()->getClientScript();
 		$cs->registerPradoScript('ratings');
 	}
 
@@ -326,10 +326,10 @@ 
 	 * @param string asset file in the self::SCRIPT_PATH directory.
 	 * @return string asset file url.
 	 */
-	protected function getAssetUrl($file = '')
+	protected function getAssetUrl($file='')
 	{
-		$base = $this->getPage()->getClientScript()->getPradoScriptAssetUrl();
-		return $base . '/' . self::SCRIPT_PATH . '/' . $file;
+		$base=$this->getPage()->getClientScript()->getPradoScriptAssetUrl();
+		return $base.'/'.self::SCRIPT_PATH.'/'.$file;
 	}
 
 	/**

framework/Web/UI/WebControls/TTable.php

Doc Comments +2 added lines

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

Spacing +19 added lines, -19 removed lines

@@ -102,15 +102,15 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$border = 0;
+		$border=0;
 		if($this->getHasStyle())
 		{
-			if($this->getGridLines() !== TTableGridLines::None)
+			if($this->getGridLines()!==TTableGridLines::None)
 			{
-				if(($border = $this->getBorderWidth()) === '')
-					$border = 1;
+				if(($border=$this->getBorderWidth())==='')
+					$border=1;
 				else
-					$border = (int)$border;
+					$border=(int) $border;
 			}
 		}
 		$writer->addAttribute('border', "$border");
@@ -269,9 +269,9 @@ 
 	public function renderBeginTag($writer)
 	{
 		parent::renderBeginTag($writer);
-		if(($caption = $this->getCaption()) !== '')
+		if(($caption=$this->getCaption())!=='')
 		{
-			if(($align = $this->getCaptionAlign()) !== TTableCaptionAlign::NotSet)
+			if(($align=$this->getCaptionAlign())!==TTableCaptionAlign::NotSet)
 				$writer->addAttribute('align', strtolower($align));
 			$writer->renderBeginTag('caption');
 			$writer->write($caption);
@@ -287,46 +287,46 @@ 
 	{
 		if($this->getHasControls())
 		{
-			$renderTableSection = false;
+			$renderTableSection=false;
 			foreach($this->getControls() as $row)
 			{
-				if($row->getTableSection() !== TTableRowSection::Body)
+				if($row->getTableSection()!==TTableRowSection::Body)
 				{
-					$renderTableSection = true;
+					$renderTableSection=true;
 					break;
 				}
 			}
 			if($renderTableSection)
 			{
-				$currentSection = TTableRowSection::Header;
+				$currentSection=TTableRowSection::Header;
 				$writer->writeLine();
 				foreach($this->getControls() as $index => $row)
 				{
-					if(($section = $row->getTableSection()) === $currentSection)
+					if(($section=$row->getTableSection())===$currentSection)
 					{
-						if($index === 0 && $currentSection === TTableRowSection::Header)
+						if($index===0 && $currentSection===TTableRowSection::Header)
 							$writer->renderBeginTag('thead');
 					}
 					else
 					{
-						if($currentSection === TTableRowSection::Header)
+						if($currentSection===TTableRowSection::Header)
 						{
 							if($index > 0)
 								$writer->renderEndTag();
-							if($section === TTableRowSection::Body)
+							if($section===TTableRowSection::Body)
 								$writer->renderBeginTag('tbody');
 							else
 								$writer->renderBeginTag('tfoot');
-							$currentSection = $section;
+							$currentSection=$section;
 						}
-						elseif($currentSection === TTableRowSection::Body)
+						elseif($currentSection===TTableRowSection::Body)
 						{
 							$writer->renderEndTag();
-							if($section === TTableRowSection::Footer)
+							if($section===TTableRowSection::Footer)
 								$writer->renderBeginTag('tfoot');
 							else
 								throw new TConfigurationException('table_tablesection_outoforder');
-							$currentSection = $section;
+							$currentSection=$section;
 						}
 						else // Footer
 							throw new TConfigurationException('table_tablesection_outoforder');

Braces +4 added lines, -8 removed lines

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

framework/Web/UI/WebControls/TTemplateColumn.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +27 added lines, -27 removed lines

@@ -112,8 +112,8 @@ 
 	 */
 	public function setEditItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_editItemTemplate = $value;
+		if($value instanceof ITemplate || $value===null)
+			$this->_editItemTemplate=$value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'EditItemTemplate');
 	}
@@ -132,8 +132,8 @@ 
 	 */
 	public function setItemTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_itemTemplate = $value;
+		if($value instanceof ITemplate || $value===null)
+			$this->_itemTemplate=$value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'ItemTemplate');
 	}
@@ -152,8 +152,8 @@ 
 	 */
 	public function setHeaderTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_headerTemplate = $value;
+		if($value instanceof ITemplate || $value===null)
+			$this->_headerTemplate=$value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'HeaderTemplate');
 	}
@@ -172,8 +172,8 @@ 
 	 */
 	public function setFooterTemplate($value)
 	{
-		if($value instanceof ITemplate || $value === null)
-			$this->_footerTemplate = $value;
+		if($value instanceof ITemplate || $value===null)
+			$this->_footerTemplate=$value;
 		else
 			throw new TInvalidDataTypeException('templatecolumn_template_required', 'FooterTemplate');
 	}
@@ -189,24 +189,24 @@ 
 	 */
 	public function initializeCell($cell, $columnIndex, $itemType)
 	{
-		if($itemType === TListItemType::Item || $itemType === TListItemType::AlternatingItem || $itemType === TListItemType::SelectedItem || $itemType === TListItemType::EditItem)
+		if($itemType===TListItemType::Item || $itemType===TListItemType::AlternatingItem || $itemType===TListItemType::SelectedItem || $itemType===TListItemType::EditItem)
 		{
-			if($itemType === TListItemType::EditItem)
+			if($itemType===TListItemType::EditItem)
 			{
-				if(($classPath = $this->getEditItemRenderer()) === '' && ($template = $this->_editItemTemplate) === null)
+				if(($classPath=$this->getEditItemRenderer())==='' && ($template=$this->_editItemTemplate)===null)
 				{
-					$classPath = $this->getItemRenderer();
-					$template = $this->_itemTemplate;
+					$classPath=$this->getItemRenderer();
+					$template=$this->_itemTemplate;
 				}
 			}
 			else
 			{
-				$template = $this->_itemTemplate;
-				$classPath = $this->getItemRenderer();
+				$template=$this->_itemTemplate;
+				$classPath=$this->getItemRenderer();
 			}
-			if($classPath !== '')
+			if($classPath!=='')
 			{
-				$control = Prado::createComponent($classPath);
+				$control=Prado::createComponent($classPath);
 				$cell->getControls()->add($control);
 				if($control instanceof IItemDataRenderer)
 				{
@@ -214,27 +214,27 @@ 
 					$control->setItemType($itemType);
 				}
 				if($control instanceof \Prado\IDataRenderer)
-					$control->attachEventHandler('OnDataBinding', [$this,'dataBindColumn']);
+					$control->attachEventHandler('OnDataBinding', [$this, 'dataBindColumn']);
 			}
-			elseif($template !== null)
+			elseif($template!==null)
 				$template->instantiateIn($cell);
-			elseif($itemType !== TListItemType::EditItem)
+			elseif($itemType!==TListItemType::EditItem)
 				$cell->setText(' ');
 		}
-		elseif($itemType === TListItemType::Header)
+		elseif($itemType===TListItemType::Header)
 		{
-			if(($classPath = $this->getHeaderRenderer()) !== '')
+			if(($classPath=$this->getHeaderRenderer())!=='')
 				$this->initializeHeaderCell($cell, $columnIndex);
-			elseif($this->_headerTemplate !== null)
+			elseif($this->_headerTemplate!==null)
 				$this->_headerTemplate->instantiateIn($cell);
 			else
 				$this->initializeHeaderCell($cell, $columnIndex);
 		}
-		elseif($itemType === TListItemType::Footer)
+		elseif($itemType===TListItemType::Footer)
 		{
-			if(($classPath = $this->getFooterRenderer()) !== '')
+			if(($classPath=$this->getFooterRenderer())!=='')
 				$this->initializeFooterCell($cell, $columnIndex);
-			elseif($this->_footerTemplate !== null)
+			elseif($this->_footerTemplate!==null)
 				$this->_footerTemplate->instantiateIn($cell);
 			else
 				$this->initializeFooterCell($cell, $columnIndex);
@@ -248,7 +248,7 @@ 
 	 */
 	public function dataBindColumn($sender, $param)
 	{
-		$item = $sender->getNamingContainer();
+		$item=$sender->getNamingContainer();
 		$sender->setData($item->getData());
 	}
 }

Braces +4 added lines, -8 removed lines

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

framework/Web/UI/WebControls/TWizardNavigationButtonStyle.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
 
 	/**
 	 * @param string button caption
+	 * @param string $value
 	 */
 	public function setButtonText($value)
 	{

Spacing +23 added lines, -23 removed lines

@@ -40,9 +40,9 @@ 
 	public function reset()
 	{
 		parent::reset();
-		$this->_imageUrl = null;
-		$this->_buttonText = null;
-		$this->_buttonType = null;
+		$this->_imageUrl=null;
+		$this->_buttonText=null;
+		$this->_buttonType=null;
 	}
 
 	/**
@@ -56,12 +56,12 @@ 
 		parent::copyFrom($style);
 		if($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($this->_imageUrl === null && $style->_imageUrl !== null)
-				$this->_imageUrl = $style->_imageUrl;
-			if($this->_buttonText === null && $style->_buttonText !== null)
-				$this->_buttonText = $style->_buttonText;
-			if($this->_buttonType === null && $style->_buttonType !== null)
-				$this->_buttonType = $style->_buttonType;
+			if($this->_imageUrl===null && $style->_imageUrl!==null)
+				$this->_imageUrl=$style->_imageUrl;
+			if($this->_buttonText===null && $style->_buttonText!==null)
+				$this->_buttonText=$style->_buttonText;
+			if($this->_buttonType===null && $style->_buttonType!==null)
+				$this->_buttonType=$style->_buttonType;
 		}
 	}
 
@@ -76,12 +76,12 @@ 
 		parent::mergeWith($style);
 		if($style instanceof TWizardNavigationButtonStyle)
 		{
-			if($style->_imageUrl !== null)
-				$this->_imageUrl = $style->_imageUrl;
-			if($style->_buttonText !== null)
-				$this->_buttonText = $style->_buttonText;
-			if($style->_buttonType !== null)
-				$this->_buttonType = $style->_buttonType;
+			if($style->_imageUrl!==null)
+				$this->_imageUrl=$style->_imageUrl;
+			if($style->_buttonText!==null)
+				$this->_buttonText=$style->_buttonText;
+			if($style->_buttonType!==null)
+				$this->_buttonType=$style->_buttonType;
 		}
 	}
 
@@ -90,7 +90,7 @@ 
 	 */
 	public function getImageUrl()
 	{
-		return $this->_imageUrl === null?'':$this->_imageUrl;
+		return $this->_imageUrl===null ? '' : $this->_imageUrl;
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		$this->_imageUrl = $value;
+		$this->_imageUrl=$value;
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function getButtonText()
 	{
-		return $this->_buttonText === null?'':$this->_buttonText;
+		return $this->_buttonText===null ? '' : $this->_buttonText;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function setButtonText($value)
 	{
-		$this->_buttonText = $value;
+		$this->_buttonText=$value;
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function getButtonType()
 	{
-		return $this->_buttonType === null? TWizardNavigationButtonType::Button :$this->_buttonType;
+		return $this->_buttonType===null ? TWizardNavigationButtonType::Button : $this->_buttonType;
 	}
 
 	/**
@@ -130,7 +130,7 @@ 
 	 */
 	public function setButtonType($value)
 	{
-		$this->_buttonType = TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TWizardNavigationButtonType');
+		$this->_buttonType=TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\WebControls\\TWizardNavigationButtonType');
 	}
 
 	/**
@@ -141,10 +141,10 @@ 
 	{
 		if($button instanceof TImageButton)
 		{
-			if($button->getImageUrl() === '')
+			if($button->getImageUrl()==='')
 				$button->setImageUrl($this->getImageUrl());
 		}
-		if($button->getText() === '')
+		if($button->getText()==='')
 			$button->setText($this->getButtonText());
 		$button->getStyle()->mergeWith($this);
 	}

framework/Collections/TAttributeCollection.php

Doc Comments +2 added lines

@@ -93,6 +93,7 @@ 
 
 	/**
 	 * @param boolean whether the keys are case-sensitive.
+	 * @param boolean $value
 	 */
 	public function setCaseSensitive($value)
 	{
@@ -126,6 +127,7 @@ 
 	 * Removes an item from the map by its key.
 	 * This overrides the parent implementation by converting the key to lower case first if CaseSensitive is false.
 	 * @param mixed the key of the item to be removed
+	 * @param string $key
 	 * @return mixed the removed value, null if no such key exists.
 	 */
 	public function remove($key)

Spacing +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
  */
 class TAttributeCollection extends TMap
 {
-	private $_caseSensitive = false;
+	private $_caseSensitive=false;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -52,8 +52,8 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_caseSensitive === false)
-			$exprops[] = "\0Prado\Collections\TAttributeCollection\0_caseSensitive";
+		if($this->_caseSensitive===false)
+			$exprops[]="\0Prado\Collections\TAttributeCollection\0_caseSensitive";
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key), $value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**

framework/I18N/TGlobalization.php

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	}
 
 	/**
-	 * @return string default culture
+	 * @return boolean default culture
 	 */
 	public function getTranslateDefaultCulture()
 	{

Braces +2 added lines, -4 removed lines

@@ -212,8 +212,7 @@ 
 						$config['source']);
 					chmod($config['source'], PRADO_CHMOD); //make it deletable
 				}
-			}
-			else
+			} else
 			{
 				throw new TConfigurationException("invalid source dir '{$config['source']}'");
 			}
@@ -228,8 +227,7 @@ 
 						$config['cache']);
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
 			}
-		}
-		else
+		} else
 		{
 			unset($config['cache']);
 		}

Spacing +38 added lines, -38 removed lines

@@ -34,13 +34,13 @@ 
 	 * Default character set is 'UTF-8'.
 	 * @var string
 	 */
-	private $_defaultCharset = 'UTF-8';
+	private $_defaultCharset='UTF-8';
 
 	/**
 	 * Default culture is 'en'.
 	 * @var string
 	 */
-	private $_defaultCulture = 'en';
+	private $_defaultCulture='en';
 
 	/**
 	 * The current charset.
@@ -63,7 +63,7 @@ 
 	/**
 	 * @var boolean whether we should translate the default culture
 	 */
-	private $_translateDefaultCulture = true;
+	private $_translateDefaultCulture=true;
 
 	/**
 	 * Initialize the Culture and Charset for this application.
@@ -74,19 +74,19 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_charset === null)
-			$this->_charset = $this->getDefaultCharset();
-		if($this->_culture === null)
-			$this->_culture = $this->getDefaultCulture();
+		if($this->_charset===null)
+			$this->_charset=$this->getDefaultCharset();
+		if($this->_culture===null)
+			$this->_culture=$this->getDefaultCulture();
 
-		if($config !== null)
+		if($config!==null)
 		{
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
+				$translation=isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
-				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$t=$config->getElementByTagName('translation');
+				$translation=($t) ? $t->getAttributes() : null;
 			}
 			if($translation)
 				$this->setTranslationConfiguration($translation);
@@ -107,7 +107,7 @@ 
 	 */
 	public function setTranslateDefaultCulture($value)
 	{
-		$this->_translateDefaultCulture = TPropertyValue::ensureBoolean($value);
+		$this->_translateDefaultCulture=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 */
 	public function setDefaultCulture($culture)
 	{
-		$this->_defaultCulture = str_replace('-', '_', $culture);
+		$this->_defaultCulture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public function setDefaultCharset($charset)
 	{
-		$this->_defaultCharset = $charset;
+		$this->_defaultCharset=$charset;
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->_culture = str_replace('-', '_', $culture);
+		$this->_culture=str_replace('-', '_', $culture);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = $charset;
+		$this->_charset=$charset;
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 */
 	public function getTranslationConfiguration()
 	{
-		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture() == $this->getCulture()))
+		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture()==$this->getCulture()))
 			? null
 			: $this->_translation;
 	}
@@ -200,14 +200,14 @@ 
 	 */
 	protected function setTranslationConfiguration($config)
 	{
-		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext' || $config['type'] == 'PHP')
+		if($config['type']=='XLIFF' || $config['type']=='gettext' || $config['type']=='PHP')
 		{
 			if($config['source'])
 			{
-				$config['source'] = Prado::getPathOfNamespace($config['source']);
+				$config['source']=Prado::getPathOfNamespace($config['source']);
 				if(!is_dir($config['source']))
 				{
-					if(@mkdir($config['source']) === false)
+					if(@mkdir($config['source'])===false)
 					throw new TConfigurationException('globalization_source_path_failed',
 						$config['source']);
 					chmod($config['source'], PRADO_CHMOD); //make it deletable
@@ -220,10 +220,10 @@ 
 		}
 		if(isset($config['cache']) && TPropertyValue::ensureBoolean($config['cache']))
 		{
-			$config['cache'] = $this->getApplication()->getRunTimePath() . '/i18n';
+			$config['cache']=$this->getApplication()->getRunTimePath().'/i18n';
 			if(!is_dir($config['cache']))
 			{
-				if(@mkdir($config['cache']) === false)
+				if(@mkdir($config['cache'])===false)
 					throw new TConfigurationException('globalization_cache_path_failed',
 						$config['cache']);
 				chmod($config['cache'], PRADO_CHMOD); //make it deletable
@@ -233,7 +233,7 @@ 
 		{
 			unset($config['cache']);
 		}
-		$this->_translation = $config;
+		$this->_translation=$config;
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 */
 	public function setTranslationCatalogue($value)
 	{
-		$this->_translation['catalogue'] = $value;
+		$this->_translation['catalogue']=$value;
 	}
 
 	/**
@@ -258,13 +258,13 @@ 
 	 * @param string $culture the Culture string
 	 * @return array variants of the culture.
 	 */
-	public function getCultureVariants($culture = null)
+	public function getCultureVariants($culture=null)
 	{
-		if($culture === null) $culture = $this->getCulture();
-		$variants = explode('_', $culture);
-		$result = [];
+		if($culture===null) $culture=$this->getCulture();
+		$variants=explode('_', $culture);
+		$result=[];
 		for(; count($variants) > 0; array_pop($variants))
-			$result[] = implode('_', $variants);
+			$result[]=implode('_', $variants);
 		return $result;
 	}
 
@@ -287,17 +287,17 @@ 
 	 * @param string culture string, null to use current culture
 	 * @return array list of possible localized resource files.
 	 */
-	public function getLocalizedResource($file, $culture = null)
+	public function getLocalizedResource($file, $culture=null)
 	{
-		$files = [];
-		$variants = $this->getCultureVariants($culture);
-		$path = pathinfo($file);
+		$files=[];
+		$variants=$this->getCultureVariants($culture);
+		$path=pathinfo($file);
 		foreach($variants as $variant)
-			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $variant . DIRECTORY_SEPARATOR . $path['basename'];
-		$filename = substr($path['basename'], 0, strrpos($path['basename'], '.'));
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$variant.DIRECTORY_SEPARATOR.$path['basename'];
+		$filename=substr($path['basename'], 0, strrpos($path['basename'], '.'));
 		foreach($variants as $variant)
-			$files[] = $path['dirname'] . DIRECTORY_SEPARATOR . $filename . '.' . $variant . '.' . $path['extension'];
-		$files[] = $file;
+			$files[]=$path['dirname'].DIRECTORY_SEPARATOR.$filename.'.'.$variant.'.'.$path['extension'];
+		$files[]=$file;
 		return $files;
 	}
 

framework/Data/SqlMap/Configuration/TResultMap.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',

Spacing +18 added lines, -18 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_columns = new TMap;
+		$this->_columns=new TMap;
 	}
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_ID = $value;
+		$this->_ID=$value;
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setClass($value)
 	{
-		$this->_class = $value;
+		$this->_class=$value;
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function setExtends($value)
 	{
-		$this->_extends = $value;
+		$this->_extends=$value;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setGroupBy($value)
 	{
-		$this->_groupBy = $value;
+		$this->_groupBy=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setDiscriminator(TDiscriminator $value)
 	{
-		$this->_discriminator = $value;
+		$this->_discriminator=$value;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	public function addResultProperty(TResultProperty $property)
 	{
-		$this->_columns[$property->getProperty()] = $property;
+		$this->_columns[$property->getProperty()]=$property;
 	}
 
 	/**
@@ -162,15 +162,15 @@ 
 	 */
 	public function createInstanceOfResult($registry)
 	{
-		$handler = $registry->getTypeHandler($this->getClass());
+		$handler=$registry->getTypeHandler($this->getClass());
 		try
 		{
-			if($handler !== null)
+			if($handler!==null)
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
 		}
-		catch (TSqlMapException $e)
+		catch(TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',
@@ -186,16 +186,16 @@ 
 	 */
 	public function resolveSubMap($registry, $row)
 	{
-		$subMap = $this;
-		if(($disc = $this->getDiscriminator()) !== null)
+		$subMap=$this;
+		if(($disc=$this->getDiscriminator())!==null)
 		{
-			$value = $disc->getMapping()->getPropertyValue($registry, $row);
-			$subMap = $disc->getSubMap((string)$value);
+			$value=$disc->getMapping()->getPropertyValue($registry, $row);
+			$subMap=$disc->getSubMap((string) $value);
 
-			if($subMap === null)
-				$subMap = $this;
-			elseif($subMap !== $this)
-				$subMap = $subMap->resolveSubMap($registry, $row);
+			if($subMap===null)
+				$subMap=$this;
+			elseif($subMap!==$this)
+				$subMap=$subMap->resolveSubMap($registry, $row);
 		}
 		return $subMap;
 	}