pradosoft / prado

framework/Data/SqlMap/Statements/TStaticSql.php

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
 
 	public function buildPreparedStatement($statement, $sqlString)
 	{
-		$factory = new TPreparedStatementFactory($statement, $sqlString);
-		$this->_preparedStatement = $factory->prepare();
+		$factory=new TPreparedStatementFactory($statement, $sqlString);
+		$this->_preparedStatement=$factory->prepare();
 	}
 
 	public function getPreparedStatement($parameter=null)

framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public function registerTypeHandler(TSqlMapTypeHandler $handler)
 	{
-		$this->_typeHandlers[$handler->getType()] = $handler;
+		$this->_typeHandlers[$handler->getType()]=$handler;
 	}
 
 	/**
@@ -90,13 +90,13 @@ 
 		switch(strtolower($type))
 		{
 			case 'integer': case 'int':
-				$type = 'integer'; break;
+				$type='integer'; break;
 			case 'float': case 'double': case 'decimal':
-				$type = 'float'; break;
+				$type='float'; break;
 			case 'boolean': case 'bool':
-				$type = 'boolean'; break;
+				$type='boolean'; break;
 			case 'string' :
-				$type = 'string'; break;
+				$type='string'; break;
 			default:
 				return $value;
 		}

framework/Collections/TPagedList.php

Braces +5 added lines, -10 removed lines

@@ -181,22 +181,18 @@ 
 					$this->_currentPageIndex=$pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
-				}
-				else
+				} else
 					return false;
-			}
-			else
+			} else
 				return false;
-		}
-		else
+		} else
 		{
 			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
 			{
 				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
-			}
-			else
+			} else
 				return false;
 		}
 	}
@@ -248,8 +244,7 @@ 
 				return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
 			else
 				return -1;
-		}
-		else
+		} else
 			return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
 	}
 

Doc Comments +4 added lines, -1 removed lines

@@ -96,6 +96,7 @@ 
 
 	/**
 	 * @param boolean whether to allow custom paging
+	 * @param boolean $value
 	 */
 	public function setCustomPaging($value)
 	{
@@ -143,6 +144,7 @@ 
 	 * Raises <b>OnPageIndexChanged</b> event.
 	 * This event is raised each time when the list changes to a different page.
 	 * @param TPagedListPageChangedEventParameter event parameter
+	 * @param TPagedListPageChangedEventParameter|null $param
 	 */
 	public function onPageIndexChanged($param)
 	{
@@ -155,6 +157,7 @@ 
 	 * and needs the new page of data. This event can only be raised when
 	 * {@link setCustomPaging CustomPaging} is true.
 	 * @param TPagedListFetchDataEventParameter event parameter
+	 * @param TPagedListFetchDataEventParameter $param
 	 */
 	public function onFetchData($param)
 	{
@@ -290,7 +293,7 @@ 
 	}
 
 	/**
-	 * @return Iterator iterator
+	 * @return \ArrayIterator iterator
 	 */
 	public function getIterator()
 	{

Spacing +17 added lines, -17 removed lines

@@ -116,7 +116,7 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>0)
+		if(($value=TPropertyValue::ensureInteger($value)) > 0)
 			$this->_pageSize=$value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
@@ -173,9 +173,9 @@ 
 			return $pageIndex;
 		if($this->_customPaging)
 		{
-			if($pageIndex>=0 && ($this->_virtualCount<0 || $pageIndex<$this->getPageCount()))
+			if($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
 			{
-				$param=new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize*$pageIndex, $this->_pageSize);
+				$param=new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
 				$this->onFetchData($param);
 				if(($data=$param->getData())!==null)
 				{
@@ -195,7 +195,7 @@ 
 		}
 		else
 		{
-			if($pageIndex>=0 && $pageIndex<$this->getPageCount())
+			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
 				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
@@ -212,7 +212,7 @@ 
 	 */
 	public function nextPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex+1);
+		return $this->gotoPage($this->_currentPageIndex + 1);
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function previousPage()
 	{
-		return $this->gotoPage($this->_currentPageIndex-1);
+		return $this->gotoPage($this->_currentPageIndex - 1);
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))<0)
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
 			$value=-1;
 		$this->_virtualCount=$value;
 	}
@@ -249,13 +249,13 @@ 
 	{
 		if($this->_customPaging)
 		{
-			if($this->_virtualCount>=0)
-				return (int)(($this->_virtualCount+$this->_pageSize-1)/$this->_pageSize);
+			if($this->_virtualCount >= 0)
+				return (int) (($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
 		}
 		else
-			return (int)((parent::getCount()+$this->_pageSize-1)/$this->_pageSize);
+			return (int) ((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex===$this->getPageCount()-1;
+		return $this->_currentPageIndex===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -283,8 +283,8 @@ 
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex===$this->getPageCount()-1)
-				return parent::getCount()-$this->_pageSize*$this->_currentPageIndex;
+			if($this->_currentPageIndex===$this->getPageCount() - 1)
+				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
 		}
@@ -316,7 +316,7 @@ 
 		if($this->_customPaging)
 			return parent::itemAt($index);
 		else
-			return parent::itemAt($this->_pageSize*$this->_currentPageIndex+$index);
+			return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
 	}
 
 	/**
@@ -326,7 +326,7 @@ 
 	public function indexOf($item)
 	{
 		$c=$this->getCount();
-		for($i=0;$i<$c;++$i)
+		for($i=0; $i < $c; ++$i)
 			if($this->itemAt($i)===$item)
 				return $i;
 		return -1;
@@ -340,7 +340,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->getCount());
+		return ($offset >= 0 && $offset < $this->getCount());
 	}
 
 	/**
@@ -362,7 +362,7 @@ 
 	{
 		$c=$this->getCount();
 		$array=[];
-		for($i=0;$i<$c;++$i)
+		for($i=0; $i < $c; ++$i)
 			$array[$i]=$this->itemAt($i);
 		return $array;
 	}

framework/I18N/TTranslateParameter.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 	 * To trim or not to trim the contents.
 	 * @var boolean
 	 */
-	protected $trim = true;
+	protected $trim=true;
 
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setKey($value)
 	{
-		$this->key = $value;
+		$this->key=$value;
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setTrim($value)
 	{
-		$this->trim = TPropertyValue::ensureBoolean($value);
+		$this->trim=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -106,10 +106,10 @@ 
 	 */
 	public function getParameter()
 	{
-		$value = $this->getValue();
+		$value=$this->getValue();
 		if(strlen($value) > 0)
 			return $value;
-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+		$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 		$this->renderControl($htmlWriter);
 		return $this->getTrim() ?
 			trim($htmlWriter->flush()) : $htmlWriter->flush();

framework/Web/UI/ActiveControls/TActiveHyperLink.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -64,14 +64,14 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide() && $value !== '')
+		if($this->getActiveControl()->canUpdateClientSide() && $value!=='')
 		{
-			$textWriter = new TTextWriter;
-			$renderer = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
+			$textWriter=new TTextWriter;
+			$renderer=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
 			$this->createImage($value)->renderControl($renderer);
 			$this->getPage()->getCallbackClient()->update($this, $textWriter->flush());
 		}
@@ -83,14 +83,14 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		if(parent::getNavigateUrl() === $value)
+		if(parent::getNavigateUrl()===$value)
 			return;
 
 		parent::setNavigateUrl($value);
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
 			//replace & with & and urldecode the url (setting the href using javascript is literal)
-			$url = urldecode(str_replace('&', '&', $value));
+			$url=urldecode(str_replace('&', '&', $value));
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $url);
 		}
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		if(parent::getTarget() === $value)
+		if(parent::getTarget()===$value)
 			return;
 
 		parent::setTarget($value);

framework/Web/UI/ActiveControls/TActiveImage.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public function setAlternateText($value)
 	{
-		if(parent::getAlternateText() === $value)
+		if(parent::getAlternateText()===$value)
 			return;
 
 		parent::setAlternateText($value);
@@ -65,7 +65,7 @@ 
 	 */
 	public function setImageAlign($value)
 	{
-		if(parent::getImageAlign() === $value)
+		if(parent::getImageAlign()===$value)
 			return;
 
 		parent::setImageAlign($value);
@@ -78,7 +78,7 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
@@ -91,7 +91,7 @@ 
 	 */
 	public function setDescriptionUrl($value)
 	{
-		if(parent::getDescriptionUrl() === $value)
+		if(parent::getDescriptionUrl()===$value)
 			return;
 
 		parent::setDescriptionUrl($value);

Doc Comments +2 added lines

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

framework/Collections/TDummyDataSource.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	}
 
 	/**
-	 * @return Iterator iterator
+	 * @return TDummyDataSourceIterator iterator
 	 */
 	public function getIterator()
 	{

framework/Collections/TList.php

Doc Comments +4 added lines, -2 removed lines

@@ -81,6 +81,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -90,7 +91,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the list.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the list.
+	 * @return \ArrayIterator an iterator for traversing the items in the list.
 	 */
 	public function getIterator()
 	{
@@ -283,7 +284,7 @@ 
 	 * Finds the base item.  If found, the item is inserted after it.
 	 * @param mixed the base item which comes before the second parameter when added to the list
 	 * @param mixed the item
-	 * @return int the index where the item is inserted
+	 * @return double the index where the item is inserted
 	 * @throws TInvalidDataValueException if the base item is not within this list
 	 * @throws TInvalidOperationException if the list is read-only
 	 * @since 3.2a
@@ -334,6 +335,7 @@ 
 	 * Merges iterable data into the map.
 	 * New data will be appended to the end of the existing data.
 	 * @param mixed the data to be merged with, must be an array or object implementing Traversable
+	 * @param \Prado\Web\UI\WebControls\TDataGridColumnCollection|null $data
 	 * @throws TInvalidDataTypeException If data is neither an array nor an iterator.
 	 */
 	public function mergeWith($data)

Spacing +11 added lines, -11 removed lines

@@ -125,7 +125,7 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
+		if($index >= 0 && $index < $this->_c)
 			return $this->_d[$index];
 		else
 			throw new TInvalidDataValueException('list_index_invalid', $index);
@@ -140,7 +140,7 @@ 
 	public function add($item)
 	{
 		$this->insertAt($this->_c, $item);
-		return $this->_c-1;
+		return $this->_c - 1;
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 		{
 			if($index===$this->_c)
 				$this->_d[$this->_c++]=$item;
-			elseif($index>=0 && $index<$this->_c)
+			elseif($index >= 0 && $index < $this->_c)
 			{
 				array_splice($this->_d, $index, 0, [$item]);
 				$this->_c++;
@@ -183,7 +183,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if(($index=$this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -206,7 +206,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
 				if($index===$this->_c)
@@ -231,7 +231,7 @@ 
 	 */
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for($i=$this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 
@@ -241,7 +241,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index, $item);
@@ -293,7 +293,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index + 1, $item);
@@ -322,7 +322,7 @@ 
 	{
 		if(is_array($data) || ($data instanceof \Traversable))
 		{
-			if($this->_c>0)
+			if($this->_c > 0)
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
@@ -356,7 +356,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 
 	/**

Braces +10 added lines, -20 removed lines

@@ -162,11 +162,9 @@ 
 			{
 				array_splice($this->_d, $index, 0, [$item]);
 				$this->_c++;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid', $index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
@@ -187,11 +185,9 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_item_inexistent');
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
@@ -217,11 +213,9 @@ 
 					array_splice($this->_d, $index, 1);
 					return $item;
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid', $index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
@@ -275,8 +269,7 @@ 
 			$this->insertAt($index, $item);
 
 			return $index;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
@@ -299,8 +292,7 @@ 
 			$this->insertAt($index + 1, $item);
 
 			return $index + 1;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
@@ -326,8 +318,7 @@ 
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
-		}
-		elseif($data!==null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -343,8 +334,7 @@ 
 		{
 			foreach($data as $item)
 				$this->add($item);
-		}
-		elseif($data!==null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 

framework/Collections/TMap.php

Doc Comments +2 added lines, -1 removed lines

@@ -86,6 +86,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -95,7 +96,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the list.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the list.
+	 * @return \ArrayIterator an iterator for traversing the items in the list.
 	 */
 	public function getIterator()
 	{

Spacing +5 added lines, -5 removed lines

@@ -57,10 +57,10 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_d===[])
-			$exprops[] = "\0Prado\Collections\TMap\0_d";
-		if ($this->_r===false)
-			$exprops[] = "\0Prado\Collections\TMap\0_r";
+		if($this->_d===[])
+			$exprops[]="\0Prado\Collections\TMap\0_d";
+		if($this->_r===false)
+			$exprops[]="\0Prado\Collections\TMap\0_r";
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	{
 		if(is_array($data) || $data instanceof Traversable)
 		{
-			if($this->getCount()>0)
+			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key=>$value)
 				$this->add($key, $value);

Braces +4 added lines, -8 removed lines

@@ -170,11 +170,9 @@ 
 				$value=$this->_d[$key];
 				unset($this->_d[$key]);
 				return $value;
-			}
-			else
+			} else
 				return null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
@@ -218,8 +216,7 @@ 
 				$this->clear();
 			foreach($data as $key=>$value)
 				$this->add($key, $value);
-		}
-		elseif($data!==null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -235,8 +232,7 @@ 
 		{
 			foreach($data as $key=>$value)
 				$this->add($key, $value);
-		}
-		elseif($data!==null)
+		} elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}