pradosoft / prado

framework/Collections/TPagedList.php

Spacing +19 added lines, -19 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');
@@ -136,7 +136,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
+		if ($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
 			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
 	}
 
@@ -169,15 +169,15 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex === $this->_currentPageIndex)
+		if ($pageIndex === $this->_currentPageIndex)
 			return $pageIndex;
-		if($this->_customPaging)
+		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);
 				$this->onFetchData($param);
-				if(($data = $param->getData()) !== null)
+				if (($data = $param->getData()) !== null)
 				{
 					$this->setReadOnly(false);
 					$this->copyFrom($data);
@@ -195,7 +195,7 @@ 
 		}
 		else
 		{
-			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
+			if ($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
 				$this->_currentPageIndex = $pageIndex;
 				$this->onPageIndexChanged(null);
@@ -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;
 	}
@@ -247,15 +247,15 @@ 
 	 */
 	public function getPageCount()
 	{
-		if($this->_customPaging)
+		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);
 	}
 
 	/**
@@ -279,11 +279,11 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex === $this->getPageCount() - 1)
+			if ($this->_currentPageIndex === $this->getPageCount() - 1)
 				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
@@ -295,7 +295,7 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::getIterator();
 		else
 		{
@@ -313,7 +313,7 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($this->_customPaging)
+		if ($this->_customPaging)
 			return parent::itemAt($index);
 		else
 			return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
@@ -326,8 +326,8 @@ 
 	public function indexOf($item)
 	{
 		$c = $this->getCount();
-		for($i = 0;$i < $c;++$i)
-			if($this->itemAt($i) === $item)
+		for ($i = 0; $i < $c; ++$i)
+			if ($this->itemAt($i) === $item)
 				return $i;
 		return -1;
 	}
@@ -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;
 	}

Braces +50 added lines, -42 removed lines

@@ -116,10 +116,11 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
-			$this->_pageSize = $value;
-		else
-			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) > 0) {
+					$this->_pageSize = $value;
+		} else {
+					throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
+		}
 	}
 
 	/**
@@ -136,8 +137,9 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
-			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
+		if($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false) {
+					throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
+		}
 	}
 
 	/**
@@ -169,8 +171,9 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex === $this->_currentPageIndex)
-			return $pageIndex;
+		if($pageIndex === $this->_currentPageIndex) {
+					return $pageIndex;
+		}
 		if($this->_customPaging)
 		{
 			if($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
@@ -186,23 +189,22 @@ 
 					$this->_currentPageIndex = $pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
+				} else {
+									return false;
 				}
-				else
-					return false;
+			} else {
+							return false;
 			}
-			else
-				return false;
-		}
-		else
+		} else
 		{
 			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
 				$this->_currentPageIndex = $pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
+			} else {
+							return false;
 			}
-			else
-				return false;
 		}
 	}
 
@@ -237,8 +239,9 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
+		if(($value = TPropertyValue::ensureInteger($value)) < 0) {
+					$value = -1;
+		}
 		$this->_virtualCount = $value;
 	}
 
@@ -249,13 +252,14 @@ 
 	{
 		if($this->_customPaging)
 		{
-			if($this->_virtualCount >= 0)
-				return (int)(($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
-			else
-				return -1;
+			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);
 		}
-		else
-			return (int)((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -279,14 +283,15 @@ 
 	 */
 	public function getCount()
 	{
-		if($this->_customPaging)
-			return parent::getCount();
-		else
+		if($this->_customPaging) {
+					return parent::getCount();
+		} else
 		{
-			if($this->_currentPageIndex === $this->getPageCount() - 1)
-				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
-			else
-				return $this->_pageSize;
+			if($this->_currentPageIndex === $this->getPageCount() - 1) {
+							return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
+			} else {
+							return $this->_pageSize;
+			}
 		}
 	}
 
@@ -295,9 +300,9 @@ 
 	 */
 	public function getIterator()
 	{
-		if($this->_customPaging)
-			return parent::getIterator();
-		else
+		if($this->_customPaging) {
+					return parent::getIterator();
+		} else
 		{
 			$data = $this->toArray();
 			return new \ArrayIterator($data);
@@ -313,10 +318,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($this->_customPaging)
-			return parent::itemAt($index);
-		else
-			return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
+		if($this->_customPaging) {
+					return parent::itemAt($index);
+		} else {
+					return parent::itemAt($this->_pageSize * $this->_currentPageIndex + $index);
+		}
 	}
 
 	/**
@@ -326,9 +332,10 @@ 
 	public function indexOf($item)
 	{
 		$c = $this->getCount();
-		for($i = 0;$i < $c;++$i)
-			if($this->itemAt($i) === $item)
+		for($i = 0;$i < $c;++$i) {
+					if($this->itemAt($i) === $item)
 				return $i;
+		}
 		return -1;
 	}
 
@@ -362,8 +369,9 @@ 
 	{
 		$c = $this->getCount();
 		$array = [];
-		for($i = 0;$i < $c;++$i)
-			$array[$i] = $this->itemAt($i);
+		for($i = 0;$i < $c;++$i) {
+					$array[$i] = $this->itemAt($i);
+		}
 		return $array;
 	}
 }
\ No newline at end of file

framework/Collections/TList.php

Spacing +24 added lines, -24 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function __construct($data = null, $readOnly = false)
 	{
-		if($data !== null)
+		if ($data !== null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 	}
@@ -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);
@@ -154,11 +154,11 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($index === $this->_c)
+			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++;
@@ -181,9 +181,9 @@ 
 	 */
 	public function remove($item)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if(($index = $this->indexOf($item)) >= 0)
+			if (($index = $this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -204,12 +204,12 @@ 
 	 */
 	public function removeAt($index)
 	{
-		if(!$this->_r)
+		if (!$this->_r)
 		{
-			if($index >= 0 && $index < $this->_c)
+			if ($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
-				if($index === $this->_c)
+				if ($index === $this->_c)
 					return array_pop($this->_d);
 				else
 				{
@@ -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);
 	}
 
@@ -250,7 +250,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index = array_search($item, $this->_d, true)) === false)
+		if (($index = array_search($item, $this->_d, true)) === false)
 			return -1;
 		else
 			return $index;
@@ -267,9 +267,9 @@ 
 	 */
 	public function insertBefore($baseitem, $item)
 	{
-		if(!$this->_r)
+		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);
@@ -291,9 +291,9 @@ 
 	 */
 	public function insertAfter($baseitem, $item)
 	{
-		if(!$this->_r)
+		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);
@@ -320,14 +320,14 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_array($data) || ($data instanceof \Traversable))
+		if (is_array($data) || ($data instanceof \Traversable))
 		{
-			if($this->_c > 0)
+			if ($this->_c > 0)
 				$this->clear();
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		elseif($data !== null)
+		elseif ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -339,12 +339,12 @@ 
 	 */
 	public function mergeWith($data)
 	{
-		if(is_array($data) || ($data instanceof \Traversable))
+		if (is_array($data) || ($data instanceof \Traversable))
 		{
-			foreach($data as $item)
+			foreach ($data as $item)
 				$this->add($item);
 		}
-		elseif($data !== null)
+		elseif ($data !== null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -379,7 +379,7 @@ 
 	 */
 	public function offsetSet($offset, $item)
 	{
-		if($offset === null || $offset === $this->_c)
+		if ($offset === null || $offset === $this->_c)
 			$this->insertAt($this->_c, $item);
 		else
 		{

Braces +60 added lines, -51 removed lines

@@ -67,8 +67,9 @@ 
 	 */
 	public function __construct($data = null, $readOnly = false)
 	{
-		if($data !== null)
-			$this->copyFrom($data);
+		if($data !== null) {
+					$this->copyFrom($data);
+		}
 		$this->setReadOnly($readOnly);
 	}
 
@@ -125,10 +126,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index >= 0 && $index < $this->_c)
-			return $this->_d[$index];
-		else
-			throw new TInvalidDataValueException('list_index_invalid', $index);
+		if($index >= 0 && $index < $this->_c) {
+					return $this->_d[$index];
+		} else {
+					throw new TInvalidDataValueException('list_index_invalid', $index);
+		}
 	}
 
 	/**
@@ -156,18 +158,18 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index === $this->_c)
-				$this->_d[$this->_c++] = $item;
-			elseif($index >= 0 && $index < $this->_c)
+			if($index === $this->_c) {
+							$this->_d[$this->_c++] = $item;
+			} elseif($index >= 0 && $index < $this->_c)
 			{
 				array_splice($this->_d, $index, 0, [$item]);
 				$this->_c++;
+			} else {
+							throw new TInvalidDataValueException('list_index_invalid', $index);
 			}
-			else
-				throw new TInvalidDataValueException('list_index_invalid', $index);
+		} else {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -187,12 +189,12 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
+			} else {
+							throw new TInvalidDataValueException('list_item_inexistent');
 			}
-			else
-				throw new TInvalidDataValueException('list_item_inexistent');
+		} else {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -209,20 +211,20 @@ 
 			if($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
-				if($index === $this->_c)
-					return array_pop($this->_d);
-				else
+				if($index === $this->_c) {
+									return array_pop($this->_d);
+				} else
 				{
 					$item = $this->_d[$index];
 					array_splice($this->_d, $index, 1);
 					return $item;
 				}
+			} else {
+							throw new TInvalidDataValueException('list_index_invalid', $index);
 			}
-			else
-				throw new TInvalidDataValueException('list_index_invalid', $index);
+		} else {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -231,8 +233,9 @@ 
 	 */
 	public function clear()
 	{
-		for($i = $this->_c - 1;$i >= 0;--$i)
-			$this->removeAt($i);
+		for($i = $this->_c - 1;$i >= 0;--$i) {
+					$this->removeAt($i);
+		}
 	}
 
 	/**
@@ -250,10 +253,11 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index = array_search($item, $this->_d, true)) === false)
-			return -1;
-		else
-			return $index;
+		if(($index = array_search($item, $this->_d, true)) === false) {
+					return -1;
+		} else {
+					return $index;
+		}
 	}
 
 	/**
@@ -269,15 +273,16 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
-				throw new TInvalidDataValueException('list_item_inexistent');
+			if(($index = $this->indexOf($baseitem)) == -1) {
+							throw new TInvalidDataValueException('list_item_inexistent');
+			}
 
 			$this->insertAt($index, $item);
 
 			return $index;
+		} else {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -293,15 +298,16 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
-				throw new TInvalidDataValueException('list_item_inexistent');
+			if(($index = $this->indexOf($baseitem)) == -1) {
+							throw new TInvalidDataValueException('list_item_inexistent');
+			}
 
 			$this->insertAt($index + 1, $item);
 
 			return $index + 1;
+		} else {
+					throw new TInvalidOperationException('list_readonly', get_class($this));
 		}
-		else
-			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -322,13 +328,15 @@ 
 	{
 		if(is_array($data) || ($data instanceof \Traversable))
 		{
-			if($this->_c > 0)
-				$this->clear();
-			foreach($data as $item)
-				$this->add($item);
+			if($this->_c > 0) {
+							$this->clear();
+			}
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('list_data_not_iterable');
 		}
-		elseif($data !== null)
-			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
 	/**
@@ -341,11 +349,12 @@ 
 	{
 		if(is_array($data) || ($data instanceof \Traversable))
 		{
-			foreach($data as $item)
-				$this->add($item);
+			foreach($data as $item) {
+							$this->add($item);
+			}
+		} elseif($data !== null) {
+					throw new TInvalidDataTypeException('list_data_not_iterable');
 		}
-		elseif($data !== null)
-			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
 	/**
@@ -379,9 +388,9 @@ 
 	 */
 	public function offsetSet($offset, $item)
 	{
-		if($offset === null || $offset === $this->_c)
-			$this->insertAt($this->_c, $item);
-		else
+		if($offset === null || $offset === $this->_c) {
+					$this->insertAt($this->_c, $item);
+		} else
 		{
 			$this->removeAt($offset);
 			$this->insertAt($offset, $item);

framework/Xml/TXmlElementList.php

Spacing +3 added lines, -3 removed lines

@@ -57,10 +57,10 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TXmlElement)
+		if ($item instanceof TXmlElement)
 		{
 			parent::insertAt($index, $item);
-			if($item->getParent() !== null)
+			if ($item->getParent() !== null)
 				$item->getParent()->getElements()->remove($item);
 			$item->setParent($this->_o);
 		}
@@ -78,7 +78,7 @@ 
 	public function removeAt($index)
 	{
 		$item = parent::removeAt($index);
-		if($item instanceof TXmlElement)
+		if ($item instanceof TXmlElement)
 			$item->setParent(null);
 		return $item;
 	}

Braces +8 added lines, -6 removed lines

@@ -60,12 +60,13 @@ 
 		if($item instanceof TXmlElement)
 		{
 			parent::insertAt($index, $item);
-			if($item->getParent() !== null)
-				$item->getParent()->getElements()->remove($item);
+			if($item->getParent() !== null) {
+							$item->getParent()->getElements()->remove($item);
+			}
 			$item->setParent($this->_o);
+		} else {
+					throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 		}
-		else
-			throw new TInvalidDataTypeException('xmlelementlist_xmlelement_required');
 	}
 
 	/**
@@ -78,8 +79,9 @@ 
 	public function removeAt($index)
 	{
 		$item = parent::removeAt($index);
-		if($item instanceof TXmlElement)
-			$item->setParent(null);
+		if($item instanceof TXmlElement) {
+					$item->setParent(null);
+		}
 		return $item;
 	}
 }
\ No newline at end of file

framework/Xml/TXmlDocument.php

Spacing +20 added lines, -20 removed lines

@@ -125,7 +125,7 @@ 
 	 */
 	public function loadFromFile($file)
 	{
-		if(($str = @file_get_contents($file)) !== false)
+		if (($str = @file_get_contents($file)) !== false)
 			return $this->loadFromString($str);
 		else
 			throw new TIOException('xmldocument_file_read_failed', $file);
@@ -141,7 +141,7 @@ 
 	{
 		// TODO: since PHP 5.1, we can get parsing errors and throw them as exception
 		$doc = new \DOMDocument();
-		if($doc->loadXML($string) === false)
+		if ($doc->loadXML($string) === false)
 			return false;
 
 		$this->setEncoding($doc->encoding);
@@ -156,28 +156,28 @@ 
 		$attributes->clear();
 
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if ($bSimpleXml === null)
+			$bSimpleXml = (boolean) function_exists('simplexml_load_string');
 
-		if($bSimpleXml)
+		if ($bSimpleXml)
 		{
 			$simpleDoc = simplexml_load_string($string);
 			$docNamespaces = $simpleDoc->getDocNamespaces(false);
 			$simpleDoc = null;
-			foreach($docNamespaces as $prefix => $uri)
+			foreach ($docNamespaces as $prefix => $uri)
 			{
-				if($prefix === '')
+				if ($prefix === '')
 					$attributes->add('xmlns', $uri);
 				else
-					$attributes->add('xmlns:' . $prefix, $uri);
+					$attributes->add('xmlns:'.$prefix, $uri);
 			}
 		}
 
-		foreach($element->attributes as $name => $attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
-		foreach($element->childNodes as $child)
+		foreach ($element->attributes as $name => $attr)
+			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix.':').$name, $attr->value);
+		foreach ($element->childNodes as $child)
 		{
-			if($child instanceof \DOMElement)
+			if ($child instanceof \DOMElement)
 				$elements->add($this->buildElement($child));
 		}
 
@@ -191,7 +191,7 @@ 
 	 */
 	public function saveToFile($file)
 	{
-		if(($fw = fopen($file, 'w')) !== false)
+		if (($fw = fopen($file, 'w')) !== false)
 		{
 			fwrite($fw, $this->saveToString());
 			fclose($fw);
@@ -206,9 +206,9 @@ 
 	 */
 	public function saveToString()
 	{
-		$version = empty($this->_version)?' version="1.0"':' version="' . $this->_version . '"';
-		$encoding = empty($this->_encoding)?'':' encoding="' . $this->_encoding . '"';
-		return "<?xml{$version}{$encoding}?>\n" . $this->toString(0);
+		$version = empty($this->_version) ? ' version="1.0"' : ' version="'.$this->_version.'"';
+		$encoding = empty($this->_encoding) ? '' : ' encoding="'.$this->_encoding.'"';
+		return "<?xml{$version}{$encoding}?>\n".$this->toString(0);
 	}
 
 	/**
@@ -240,12 +240,12 @@ 
 	{
 		$element = new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
-		foreach($node->attributes as $name => $attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		foreach ($node->attributes as $name => $attr)
+			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix.':').$name, $attr->value);
 
-		foreach($node->childNodes as $child)
+		foreach ($node->childNodes as $child)
 		{
-			if($child instanceof \DOMElement)
+			if ($child instanceof \DOMElement)
 				$element->getElements()->add($this->buildElement($child));
 		}
 		return $element;

Braces +30 added lines, -22 removed lines

@@ -125,10 +125,11 @@ 
 	 */
 	public function loadFromFile($file)
 	{
-		if(($str = @file_get_contents($file)) !== false)
-			return $this->loadFromString($str);
-		else
-			throw new TIOException('xmldocument_file_read_failed', $file);
+		if(($str = @file_get_contents($file)) !== false) {
+					return $this->loadFromString($str);
+		} else {
+					throw new TIOException('xmldocument_file_read_failed', $file);
+		}
 	}
 
 	/**
@@ -141,8 +142,9 @@ 
 	{
 		// TODO: since PHP 5.1, we can get parsing errors and throw them as exception
 		$doc = new \DOMDocument();
-		if($doc->loadXML($string) === false)
-			return false;
+		if($doc->loadXML($string) === false) {
+					return false;
+		}
 
 		$this->setEncoding($doc->encoding);
 		$this->setVersion($doc->xmlVersion);
@@ -156,8 +158,9 @@ 
 		$attributes->clear();
 
 		static $bSimpleXml;
-		if($bSimpleXml === null)
-			$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		if($bSimpleXml === null) {
+					$bSimpleXml = (boolean)function_exists('simplexml_load_string');
+		}
 
 		if($bSimpleXml)
 		{
@@ -166,19 +169,22 @@ 
 			$simpleDoc = null;
 			foreach($docNamespaces as $prefix => $uri)
 			{
-				if($prefix === '')
-					$attributes->add('xmlns', $uri);
-				else
-					$attributes->add('xmlns:' . $prefix, $uri);
+				if($prefix === '') {
+									$attributes->add('xmlns', $uri);
+				} else {
+									$attributes->add('xmlns:' . $prefix, $uri);
+				}
 			}
 		}
 
-		foreach($element->attributes as $name => $attr)
-			$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		foreach($element->attributes as $name => $attr) {
+					$attributes->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		}
 		foreach($element->childNodes as $child)
 		{
-			if($child instanceof \DOMElement)
-				$elements->add($this->buildElement($child));
+			if($child instanceof \DOMElement) {
+							$elements->add($this->buildElement($child));
+			}
 		}
 
 		return true;
@@ -195,9 +201,9 @@ 
 		{
 			fwrite($fw, $this->saveToString());
 			fclose($fw);
+		} else {
+					throw new TIOException('xmldocument_file_write_failed', $file);
 		}
-		else
-			throw new TIOException('xmldocument_file_write_failed', $file);
 	}
 
 	/**
@@ -240,13 +246,15 @@ 
 	{
 		$element = new TXmlElement($node->tagName);
 		$element->setValue($node->nodeValue);
-		foreach($node->attributes as $name => $attr)
-			$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		foreach($node->attributes as $name => $attr) {
+					$element->getAttributes()->add(($attr->prefix === '' ? '' : $attr->prefix . ':') . $name, $attr->value);
+		}
 
 		foreach($node->childNodes as $child)
 		{
-			if($child instanceof \DOMElement)
-				$element->getElements()->add($this->buildElement($child));
+			if($child instanceof \DOMElement) {
+							$element->getElements()->add($this->buildElement($child));
+			}
 		}
 		return $element;
 	}

framework/Xml/TXmlElement.php

Spacing +19 added lines, -19 removed lines

@@ -131,7 +131,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->_attributes !== null)
+		if ($this->_attributes !== null)
 			return $this->_attributes->itemAt($name);
 		else
 			return null;
@@ -151,7 +151,7 @@ 
 	 */
 	public function getElements()
 	{
-		if(!$this->_elements)
+		if (!$this->_elements)
 			$this->_elements = new TXmlElementList($this);
 		return $this->_elements;
 	}
@@ -161,7 +161,7 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
+		if (!$this->_attributes)
 			$this->_attributes = new TMap;
 		return $this->_attributes;
 	}
@@ -171,10 +171,10 @@ 
 	 */
 	public function getElementByTagName($tagName)
 	{
-		if($this->_elements)
+		if ($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName === $tagName)
+			foreach ($this->_elements as $element)
+				if ($element->_tagName === $tagName)
 					return $element;
 		}
 		return null;
@@ -186,10 +186,10 @@ 
 	public function getElementsByTagName($tagName)
 	{
 		$list = new TList;
-		if($this->_elements)
+		if ($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName === $tagName)
+			foreach ($this->_elements as $element)
+				if ($element->_tagName === $tagName)
 					$list->add($element);
 		}
 		return $list;
@@ -201,30 +201,30 @@ 
 	public function toString($indent = 0)
 	{
 		$attr = '';
-		if($this->_attributes !== null)
+		if ($this->_attributes !== null)
 		{
-			foreach($this->_attributes as $name => $value)
+			foreach ($this->_attributes as $name => $value)
 			{
 				$value = $this->xmlEncode($value);
 				$attr .= " $name=\"$value\"";
 			}
 		}
 		$prefix = str_repeat(' ', $indent * 4);
-		if($this->getHasElement())
+		if ($this->getHasElement())
 		{
-			$str = $prefix . "<{$this->_tagName}$attr>\n";
-			foreach($this->getElements() as $element)
-				$str .= $element->toString($indent + 1) . "\n";
-			$str .= $prefix . "</{$this->_tagName}>";
+			$str = $prefix."<{$this->_tagName}$attr>\n";
+			foreach ($this->getElements() as $element)
+				$str .= $element->toString($indent + 1)."\n";
+			$str .= $prefix."</{$this->_tagName}>";
 			return $str;
 		}
-		elseif(($value = $this->getValue()) !== '')
+		elseif (($value = $this->getValue()) !== '')
 		{
 			$value = $this->xmlEncode($value);
-			return $prefix . "<{$this->_tagName}$attr>$value</{$this->_tagName}>";
+			return $prefix."<{$this->_tagName}$attr>$value</{$this->_tagName}>";
 		}
 		else
-			return $prefix . "<{$this->_tagName}$attr />";
+			return $prefix."<{$this->_tagName}$attr />";
 	}
 
 	/**

Braces +23 added lines, -18 removed lines

@@ -131,10 +131,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->_attributes !== null)
-			return $this->_attributes->itemAt($name);
-		else
-			return null;
+		if($this->_attributes !== null) {
+					return $this->_attributes->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -151,8 +152,9 @@ 
 	 */
 	public function getElements()
 	{
-		if(!$this->_elements)
-			$this->_elements = new TXmlElementList($this);
+		if(!$this->_elements) {
+					$this->_elements = new TXmlElementList($this);
+		}
 		return $this->_elements;
 	}
 
@@ -161,8 +163,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if(!$this->_attributes)
-			$this->_attributes = new TMap;
+		if(!$this->_attributes) {
+					$this->_attributes = new TMap;
+		}
 		return $this->_attributes;
 	}
 
@@ -173,9 +176,10 @@ 
 	{
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName === $tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName === $tagName)
 					return $element;
+			}
 		}
 		return null;
 	}
@@ -188,9 +192,10 @@ 
 		$list = new TList;
 		if($this->_elements)
 		{
-			foreach($this->_elements as $element)
-				if($element->_tagName === $tagName)
+			foreach($this->_elements as $element) {
+							if($element->_tagName === $tagName)
 					$list->add($element);
+			}
 		}
 		return $list;
 	}
@@ -213,18 +218,18 @@ 
 		if($this->getHasElement())
 		{
 			$str = $prefix . "<{$this->_tagName}$attr>\n";
-			foreach($this->getElements() as $element)
-				$str .= $element->toString($indent + 1) . "\n";
+			foreach($this->getElements() as $element) {
+							$str .= $element->toString($indent + 1) . "\n";
+			}
 			$str .= $prefix . "</{$this->_tagName}>";
 			return $str;
-		}
-		elseif(($value = $this->getValue()) !== '')
+		} elseif(($value = $this->getValue()) !== '')
 		{
 			$value = $this->xmlEncode($value);
 			return $prefix . "<{$this->_tagName}$attr>$value</{$this->_tagName}>";
+		} else {
+					return $prefix . "<{$this->_tagName}$attr />";
 		}
-		else
-			return $prefix . "<{$this->_tagName}$attr />";
 	}
 
 	/**

framework/PradoBase.php

Spacing +86 added lines, -86 removed lines

@@ -25,17 +25,17 @@ 
 /**
  * Defines the PRADO framework installation path.
  */
-if(!defined('PRADO_DIR'))
+if (!defined('PRADO_DIR'))
 	define('PRADO_DIR', __DIR__);
 /**
  * Defines the default permission for writable directories and files
  */
-if(!defined('PRADO_CHMOD'))
+if (!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD', 0777);
 /**
  * Defines the Composer's vendor/ path.
  */
-if(!defined('PRADO_VENDORDIR'))
+if (!defined('PRADO_VENDORDIR'))
 {
 	$reflector = new \ReflectionClass('\Composer\Autoload\ClassLoader');
 	define('PRADO_VENDORDIR', dirname(dirname($reflector->getFileName())));
@@ -109,7 +109,7 @@ 
 	 */
 	public static function initAutoloader()
 	{
-		self::$classMap = require(__DIR__ . '/classes.php');
+		self::$classMap = require(__DIR__.'/classes.php');
 
 		spl_autoload_register([get_called_class(), 'autoload']);
 	}
@@ -124,15 +124,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(['\Prado\PradoBase','phpErrorHandler']);
+		set_error_handler(['\Prado\PradoBase', 'phpErrorHandler']);
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(['PradoBase','phpFatalErrorHandler']);
+		register_shutdown_function(['PradoBase', 'phpFatalErrorHandler']);
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(['\Prado\PradoBase','exceptionHandler']);
+		set_exception_handler(['\Prado\PradoBase', 'exceptionHandler']);
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -155,15 +155,15 @@ 
 	 */
 	public static function poweredByPrado($logoType = 0)
 	{
-		$logoName = $logoType == 1?'powered2':'powered';
-		if(self::$_application !== null)
+		$logoName = $logoType == 1 ? 'powered2' : 'powered';
+		if (self::$_application !== null)
 		{
 			$am = self::$_application->getAssetManager();
-			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
+			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\'.$logoName, '.gif'));
 		}
 		else
-			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
-		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
+			$url = 'http://pradosoft.github.io/docs/'.$logoName.'.gif';
+		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if(error_reporting() & $errno)
+		if (error_reporting() & $errno)
 			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
@@ -191,7 +191,7 @@ 
 	public static function phpFatalErrorHandler()
 	{
 		$error = error_get_last();
-		if($error &&
+		if ($error &&
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
@@ -210,7 +210,7 @@ 
 	 */
 	public static function exceptionHandler($exception)
 	{
-		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
+		if (self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
 			$errorHandler->handleError(null, $exception);
 		}
@@ -232,7 +232,7 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application !== null && !defined('PRADO_TEST_RUN'))
+		if (self::$_application !== null && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_application_singleton_required');
 		self::$_application = $application;
 	}
@@ -261,10 +261,10 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if(substr($type, 0, 6) === 'System')
-			$type = 'Prado' . substr($type, 6);
+		if (substr($type, 0, 6) === 'System')
+			$type = 'Prado'.substr($type, 6);
 
-		if(false === strpos($type, '\\'))
+		if (false === strpos($type, '\\'))
 			return str_replace('.', '\\', $type);
 		else
 			return $type;
@@ -286,10 +286,10 @@ 
 	public static function createComponent($requestedType)
 	{
 		$type = static::prado3NamespaceToPhpNamespace($requestedType);
-		if(!isset(self::$classExists[$type]))
+		if (!isset(self::$classExists[$type]))
 			self::$classExists[$type] = class_exists($type, false);
 
-		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if (!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			static::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
@@ -301,13 +301,13 @@ 
 		 * \Application\Common\MyDataModule)
 		 * Skip this if the class is inside the Prado\* namespace, since all Prado classes are now namespaced
 		 */
-		if(($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0)
+		if (($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0)
 			$type = substr($type, $pos + 1);
 
-		if(($n = func_num_args()) > 1)
+		if (($n = func_num_args()) > 1)
 		{
 			$args = func_get_args();
-			switch($n) {
+			switch ($n) {
 				case 2:
 					return new $type($args[1]);
 				break;
@@ -322,7 +322,7 @@ 
 				break;
 				default:
 					$s = '$args[1]';
-					for($i = 2;$i < $n;++$i)
+					for ($i = 2; $i < $n; ++$i)
 						$s .= ",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -346,58 +346,58 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
+		if (isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
 
-		if(array_key_exists($namespace, self::$classMap))
+		if (array_key_exists($namespace, self::$classMap))
 		{
 			// fast autoload a Prado3 class name
 			$phpNamespace = self::$classMap[$namespace];
-			if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
+			if (class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 			{
-				if(!class_exists($namespace) && !interface_exists($namespace))
+				if (!class_exists($namespace) && !interface_exists($namespace))
 					class_alias($phpNamespace, $namespace);
 				return;
 			}
-		} elseif(($pos = strrpos($namespace, '\\')) === false) {
+		} elseif (($pos = strrpos($namespace, '\\')) === false) {
 			// trying to autoload an old class name
-			foreach(self::$_usings as $k => $v)
+			foreach (self::$_usings as $k => $v)
 			{
-				$path = $v . DIRECTORY_SEPARATOR . $namespace . self::CLASS_FILE_EXT;
-				if(file_exists($path))
+				$path = $v.DIRECTORY_SEPARATOR.$namespace.self::CLASS_FILE_EXT;
+				if (file_exists($path))
 				{
-					$phpNamespace = '\\' . $k . '\\' . $namespace;
-					if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
+					$phpNamespace = '\\'.$k.'\\'.$namespace;
+					if (class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 					{
-						if(!class_exists($namespace) && !interface_exists($namespace))
+						if (!class_exists($namespace) && !interface_exists($namespace))
 							class_alias($phpNamespace, $namespace);
 						return;
 					}
 				}
 			}
 
-			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
+			if ($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
 				throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
-		} elseif(($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
+		} elseif (($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
 			$className = substr($namespace, $pos + 1);
-			if($className === '*')  // a directory
+			if ($className === '*')  // a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)] = $path;
 			}
 			else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
+				if (!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
 				{
 					try
 					{
 						include_once($path);
-						if(class_exists($namespace, false) || interface_exists($namespace, false))
+						if (class_exists($namespace, false) || interface_exists($namespace, false))
 							class_alias($namespace, $className);
 					}
-					catch(\Exception $e)
+					catch (\Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className, false))
+						if ($checkClassExistence && !class_exists($className, false))
 							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
@@ -423,20 +423,20 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if (self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
+			if (isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
 
-			if(isset(self::$_aliases[$namespace]))
+			if (isset(self::$_aliases[$namespace]))
 				return self::$_aliases[$namespace];
 		}
 
 		$segs = explode('\\', $namespace);
 		$alias = array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
+		if (null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
+			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $segs), '/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
 
 		return null;
 	}
@@ -447,7 +447,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ?self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -463,11 +463,11 @@ 
 	 */
 	public static function setPathOfAlias($alias, $path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
+		if (isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_alias_redefined', $alias);
-		elseif(($rp = realpath($path)) !== false && is_dir($rp))
+		elseif (($rp = realpath($path)) !== false && is_dir($rp))
 		{
-			if(strpos($alias, '.') === false)
+			if (strpos($alias, '.') === false)
 				self::$_aliases[$alias] = $rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
@@ -485,45 +485,45 @@ 
 	public static function fatalError($msg)
 	{
 		echo '<h1>Fatal Error</h1>';
-		echo '<p>' . $msg . '</p>';
-		if(!function_exists('debug_backtrace'))
+		echo '<p>'.$msg.'</p>';
+		if (!function_exists('debug_backtrace'))
 			return;
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
 		$index = -1;
-		foreach(debug_backtrace() as $t)
+		foreach (debug_backtrace() as $t)
 		{
 			$index++;
-			if($index == 0)  // hide the backtrace of this function
+			if ($index == 0)  // hide the backtrace of this function
 				continue;
-			echo '#' . $index . ' ';
-			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
+			echo '#'.$index.' ';
+			if (isset($t['file']))
+				echo basename($t['file']).':'.$t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
-			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
-			echo $t['function'] . '(';
-			if(isset($t['args']) && count($t['args']) > 0)
+			if (isset($t['class']))
+				echo $t['class'].$t['type'];
+			echo $t['function'].'(';
+			if (isset($t['args']) && count($t['args']) > 0)
 			{
 				$count = 0;
-				foreach($t['args'] as $item)
+				foreach ($t['args'] as $item)
 				{
-					if(is_string($item))
+					if (is_string($item))
 					{
 						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
 						if (strlen($item) > 70)
-							echo "'" . substr($str, 0, 70) . "...'";
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
 					elseif (is_int($item) || is_float($item))
 						echo $item;
 					elseif (is_object($item))
 						echo get_class($item);
 					elseif (is_array($item))
-						echo 'array(' . count($item) . ')';
+						echo 'array('.count($item).')';
 					elseif (is_bool($item))
 						echo $item ? 'true' : 'false';
 					elseif ($item === null)
@@ -551,21 +551,21 @@ 
 	public static function getUserLanguages()
 	{
 		static $languages = null;
-		if($languages === null)
+		if ($languages === null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+			if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
 				$languages[0] = 'en';
 			else
 			{
 				$languages = [];
-				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
 					$array = explode(';q=', trim($language));
-					$languages[trim($array[0])] = isset($array[1])?(float)$array[1]:1.0;
+					$languages[trim($array[0])] = isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages = array_keys($languages);
-				if(empty($languages))
+				if (empty($languages))
 					$languages[0] = 'en';
 			}
 		}
@@ -579,11 +579,11 @@ 
 	public static function getPreferredLanguage()
 	{
 		static $language = null;
-		if($language === null)
+		if ($language === null)
 		{
 			$langs = Prado::getUserLanguages();
 			$lang = explode('-', $langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
+			if (empty($lang[0]) || !ctype_alpha($lang[0]))
 				$language = 'en';
 			else
 				$language = $lang[0];
@@ -605,12 +605,12 @@ 
 	 */
 	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
+		if (self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
 			return;
-		if(!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
+		if (!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
 		{
 			$trace = debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
+			if (isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level = TLogger::DEBUG;
 		}
@@ -633,7 +633,7 @@ 
 	 */
 	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_logger === null)
+		if (self::$_logger === null)
 			self::$_logger = new TLogger;
 		self::$_logger->log($msg, $level, $category, $ctl);
 	}
@@ -643,7 +643,7 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger === null)
+		if (self::$_logger === null)
 			self::$_logger = new TLogger;
 		return self::$_logger;
 	}
@@ -677,15 +677,15 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = [];
-		foreach($parameters as $key => $value)
-			$params['{' . $key . '}'] = $value;
+		foreach ($parameters as $key => $value)
+			$params['{'.$key.'}'] = $value;
 
 		//no translation handler provided
-		if($app === null || ($config = $app->getTranslationConfiguration()) === null)
+		if ($app === null || ($config = $app->getTranslationConfiguration()) === null)
 			return strtr($text, $params);
 
 		if ($catalogue === null)
-			$catalogue = isset($config['catalogue'])?$config['catalogue']:'messages';
+			$catalogue = isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
@@ -696,8 +696,8 @@ 
 		$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if (empty($charset)) $charset = $appCharset;
+		if (empty($charset)) $charset = $defaultCharset;
 
 		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}

Braces +149 added lines, -111 removed lines

@@ -25,13 +25,15 @@ 
 /**
  * Defines the PRADO framework installation path.
  */
-if(!defined('PRADO_DIR'))
+if(!defined('PRADO_DIR')) {
 	define('PRADO_DIR', __DIR__);
+}
 /**
  * Defines the default permission for writable directories and files
  */
-if(!defined('PRADO_CHMOD'))
+if(!defined('PRADO_CHMOD')) {
 	define('PRADO_CHMOD', 0777);
+}
 /**
  * Defines the Composer's vendor/ path.
  */
@@ -160,9 +162,9 @@ 
 		{
 			$am = self::$_application->getAssetManager();
 			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
+		} else {
+					$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
 		}
-		else
-			$url = 'http://pradosoft.github.io/docs/' . $logoName . '.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="' . $url . '" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
 
@@ -178,8 +180,9 @@ 
 	 */
 	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
+		if(error_reporting() & $errno) {
+					throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
+		}
 	}
 
 	/**
@@ -213,8 +216,7 @@ 
 		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
 			$errorHandler->handleError(null, $exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -232,8 +234,9 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if(self::$_application !== null && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_application_singleton_required');
+		if(self::$_application !== null && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_application_singleton_required');
+		}
 		self::$_application = $application;
 	}
 
@@ -261,13 +264,15 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if(substr($type, 0, 6) === 'System')
-			$type = 'Prado' . substr($type, 6);
+		if(substr($type, 0, 6) === 'System') {
+					$type = 'Prado' . substr($type, 6);
+		}
 
-		if(false === strpos($type, '\\'))
-			return str_replace('.', '\\', $type);
-		else
-			return $type;
+		if(false === strpos($type, '\\')) {
+					return str_replace('.', '\\', $type);
+		} else {
+					return $type;
+		}
 	}
 
 	/**
@@ -286,8 +291,9 @@ 
 	public static function createComponent($requestedType)
 	{
 		$type = static::prado3NamespaceToPhpNamespace($requestedType);
-		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+		if(!isset(self::$classExists[$type])) {
+					self::$classExists[$type] = class_exists($type, false);
+		}
 
 		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			static::using($type);
@@ -301,8 +307,9 @@ 
 		 * \Application\Common\MyDataModule)
 		 * Skip this if the class is inside the Prado\* namespace, since all Prado classes are now namespaced
 		 */
-		if(($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0)
-			$type = substr($type, $pos + 1);
+		if(($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0) {
+					$type = substr($type, $pos + 1);
+		}
 
 		if(($n = func_num_args()) > 1)
 		{
@@ -322,15 +329,16 @@ 
 				break;
 				default:
 					$s = '$args[1]';
-					for($i = 2;$i < $n;++$i)
-						$s .= ",\$args[$i]";
+					for($i = 2;$i < $n;++$i) {
+											$s .= ",\$args[$i]";
+					}
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
 			}
+		} else {
+					return new $type;
 		}
-		else
-			return new $type;
 	}
 
 	/**
@@ -346,8 +354,9 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
-			return;
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false)) {
+					return;
+		}
 
 		if(array_key_exists($namespace, self::$classMap))
 		{
@@ -355,8 +364,9 @@ 
 			$phpNamespace = self::$classMap[$namespace];
 			if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 			{
-				if(!class_exists($namespace) && !interface_exists($namespace))
-					class_alias($phpNamespace, $namespace);
+				if(!class_exists($namespace) && !interface_exists($namespace)) {
+									class_alias($phpNamespace, $namespace);
+				}
 				return;
 			}
 		} elseif(($pos = strrpos($namespace, '\\')) === false) {
@@ -369,22 +379,25 @@ 
 					$phpNamespace = '\\' . $k . '\\' . $namespace;
 					if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true))
 					{
-						if(!class_exists($namespace) && !interface_exists($namespace))
-							class_alias($phpNamespace, $namespace);
+						if(!class_exists($namespace) && !interface_exists($namespace)) {
+													class_alias($phpNamespace, $namespace);
+						}
 						return;
 					}
 				}
 			}
 
-			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false))
-				throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
+			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false)) {
+							throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
+			}
 		} elseif(($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
 			$className = substr($namespace, $pos + 1);
-			if($className === '*')  // a directory
+			if($className === '*') {
+				// a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)] = $path;
 			}
-			else  // a file
+			} else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
@@ -392,15 +405,16 @@ 
 					try
 					{
 						include_once($path);
-						if(class_exists($namespace, false) || interface_exists($namespace, false))
-							class_alias($namespace, $className);
-					}
-					catch(\Exception $e)
+						if(class_exists($namespace, false) || interface_exists($namespace, false)) {
+													class_alias($namespace, $className);
+						}
+					} catch(\Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className, false))
-							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
-						else
-							throw $e;
+						if($checkClassExistence && !class_exists($className, false)) {
+													throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
+						} else {
+													throw $e;
+						}
 					}
 				}
 			}
@@ -425,18 +439,21 @@ 
 
 		if(self::CLASS_FILE_EXT === $ext || empty($ext))
 		{
-			if(isset(self::$_usings[$namespace]))
-				return self::$_usings[$namespace];
+			if(isset(self::$_usings[$namespace])) {
+							return self::$_usings[$namespace];
+			}
 
-			if(isset(self::$_aliases[$namespace]))
-				return self::$_aliases[$namespace];
+			if(isset(self::$_aliases[$namespace])) {
+							return self::$_aliases[$namespace];
+			}
 		}
 
 		$segs = explode('\\', $namespace);
 		$alias = array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
+		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias))) {
+					return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
+		}
 
 		return null;
 	}
@@ -463,17 +480,18 @@ 
 	 */
 	public static function setPathOfAlias($alias, $path)
 	{
-		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined', $alias);
-		elseif(($rp = realpath($path)) !== false && is_dir($rp))
+		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) {
+					throw new TInvalidOperationException('prado_alias_redefined', $alias);
+		} elseif(($rp = realpath($path)) !== false && is_dir($rp))
 		{
-			if(strpos($alias, '.') === false)
-				self::$_aliases[$alias] = $rp;
-			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
+			if(strpos($alias, '.') === false) {
+							self::$_aliases[$alias] = $rp;
+			} else {
+							throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
+			}
+		} else {
+					throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 		}
-		else
-			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -486,24 +504,29 @@ 
 	{
 		echo '<h1>Fatal Error</h1>';
 		echo '<p>' . $msg . '</p>';
-		if(!function_exists('debug_backtrace'))
-			return;
+		if(!function_exists('debug_backtrace')) {
+					return;
+		}
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
 		$index = -1;
 		foreach(debug_backtrace() as $t)
 		{
 			$index++;
-			if($index == 0)  // hide the backtrace of this function
+			if($index == 0) {
+				// hide the backtrace of this function
 				continue;
+			}
 			echo '#' . $index . ' ';
-			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
-			else
-				 echo '<PHP inner-code>';
+			if(isset($t['file'])) {
+							echo basename($t['file']) . ':' . $t['line'];
+			} else {
+							 echo '<PHP inner-code>';
+			}
 			echo ' -- ';
-			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
+			if(isset($t['class'])) {
+							echo $t['class'] . $t['type'];
+			}
 			echo $t['function'] . '(';
 			if(isset($t['args']) && count($t['args']) > 0)
 			{
@@ -513,26 +536,28 @@ 
 					if(is_string($item))
 					{
 						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'" . substr($str, 0, 70) . "...'";
-						else
-							echo "'" . $str . "'";
+						if (strlen($item) > 70) {
+													echo "'" . substr($str, 0, 70) . "...'";
+						} else {
+													echo "'" . $str . "'";
+						}
+					} elseif (is_int($item) || is_float($item)) {
+											echo $item;
+					} elseif (is_object($item)) {
+											echo get_class($item);
+					} elseif (is_array($item)) {
+											echo 'array(' . count($item) . ')';
+					} elseif (is_bool($item)) {
+											echo $item ? 'true' : 'false';
+					} elseif ($item === null) {
+											echo 'NULL';
+					} elseif (is_resource($item)) {
+											echo get_resource_type($item);
 					}
-					elseif (is_int($item) || is_float($item))
-						echo $item;
-					elseif (is_object($item))
-						echo get_class($item);
-					elseif (is_array($item))
-						echo 'array(' . count($item) . ')';
-					elseif (is_bool($item))
-						echo $item ? 'true' : 'false';
-					elseif ($item === null)
-						echo 'NULL';
-					elseif (is_resource($item))
-						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
-						echo ', ';
+					if (count($t['args']) > $count) {
+											echo ', ';
+					}
 				}
 			}
 			echo ")\n";
@@ -553,9 +578,9 @@ 
 		static $languages = null;
 		if($languages === null)
 		{
-			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-				$languages[0] = 'en';
-			else
+			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+							$languages[0] = 'en';
+			} else
 			{
 				$languages = [];
 				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
@@ -565,8 +590,9 @@ 
 				}
 				arsort($languages);
 				$languages = array_keys($languages);
-				if(empty($languages))
-					$languages[0] = 'en';
+				if(empty($languages)) {
+									$languages[0] = 'en';
+				}
 			}
 		}
 		return $languages;
@@ -583,10 +609,11 @@ 
 		{
 			$langs = Prado::getUserLanguages();
 			$lang = explode('-', $langs[0]);
-			if(empty($lang[0]) || !ctype_alpha($lang[0]))
-				$language = 'en';
-			else
-				$language = $lang[0];
+			if(empty($lang[0]) || !ctype_alpha($lang[0])) {
+							$language = 'en';
+			} else {
+							$language = $lang[0];
+			}
 		}
 		return $language;
 	}
@@ -605,17 +632,19 @@ 
 	 */
 	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_application && self::$_application->getMode() === TApplicationMode::Performance)
-			return;
+		if(self::$_application && self::$_application->getMode() === TApplicationMode::Performance) {
+					return;
+		}
 		if(!self::$_application || self::$_application->getMode() === TApplicationMode::Debug)
 		{
 			$trace = debug_backtrace();
-			if(isset($trace[0]['file']) && isset($trace[0]['line']))
-				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
+			if(isset($trace[0]['file']) && isset($trace[0]['line'])) {
+							$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
+			}
 			$level = TLogger::DEBUG;
+		} else {
+					$level = TLogger::INFO;
 		}
-		else
-			$level = TLogger::INFO;
 		self::log($msg, $level, $category, $ctl);
 	}
 
@@ -633,8 +662,9 @@ 
 	 */
 	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if(self::$_logger === null)
-			self::$_logger = new TLogger;
+		if(self::$_logger === null) {
+					self::$_logger = new TLogger;
+		}
 		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
@@ -643,8 +673,9 @@ 
 	 */
 	public static function getLogger()
 	{
-		if(self::$_logger === null)
-			self::$_logger = new TLogger;
+		if(self::$_logger === null) {
+					self::$_logger = new TLogger;
+		}
 		return self::$_logger;
 	}
 
@@ -677,15 +708,18 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = [];
-		foreach($parameters as $key => $value)
-			$params['{' . $key . '}'] = $value;
+		foreach($parameters as $key => $value) {
+					$params['{' . $key . '}'] = $value;
+		}
 
 		//no translation handler provided
-		if($app === null || ($config = $app->getTranslationConfiguration()) === null)
-			return strtr($text, $params);
+		if($app === null || ($config = $app->getTranslationConfiguration()) === null) {
+					return strtr($text, $params);
+		}
 
-		if ($catalogue === null)
-			$catalogue = isset($config['catalogue'])?$config['catalogue']:'messages';
+		if ($catalogue === null) {
+					$catalogue = isset($config['catalogue'])?$config['catalogue']:'messages';
+		}
 
 		Translation::init($catalogue);
 
@@ -696,8 +730,12 @@ 
 		$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if(empty($charset)) {
+			$charset = $appCharset;
+		}
+		if(empty($charset)) {
+			$charset = $defaultCharset;
+		}
 
 		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}

framework/TComponentReflection.php

Spacing +16 added lines, -16 removed lines

@@ -47,9 +47,9 @@ 
 	 */
 	public function __construct($component)
 	{
-		if(is_string($component) && class_exists($component, false))
+		if (is_string($component) && class_exists($component, false))
 			$this->_className = $component;
-		elseif(is_object($component))
+		elseif (is_object($component))
 			$this->_className = get_class($component);
 		else
 			throw new TInvalidDataTypeException('componentreflection_class_invalid');
@@ -78,41 +78,41 @@ 
 		$events = [];
 		$methods = [];
 		$isComponent = is_subclass_of($this->_className, 'TComponent') || strcasecmp($this->_className, 'TComponent') === 0;
-		foreach($class->getMethods() as $method)
+		foreach ($class->getMethods() as $method)
 		{
-			if($method->isPublic() || $method->isProtected())
+			if ($method->isPublic() || $method->isProtected())
 			{
 				$methodName = $method->getName();
-				if(!$method->isStatic() && $isComponent)
+				if (!$method->isStatic() && $isComponent)
 				{
-					if($this->isPropertyMethod($method))
+					if ($this->isPropertyMethod($method))
 						$properties[substr($methodName, 3)] = $method;
-					elseif($this->isEventMethod($method))
+					elseif ($this->isEventMethod($method))
 					{
 						$methodName[0] = 'O';
 						$events[$methodName] = $method;
 					}
 				}
-				if(strncmp($methodName, '__', 2) !== 0)
+				if (strncmp($methodName, '__', 2) !== 0)
 					$methods[$methodName] = $method;
 			}
 		}
 		$reserved = [];
 		ksort($properties);
-		foreach($properties as $name => $method)
+		foreach ($properties as $name => $method)
 		{
 			$this->_properties[$name] = [
 				'type' => $this->determinePropertyType($method),
-				'readonly' => !$class->hasMethod('set' . $name),
+				'readonly' => !$class->hasMethod('set'.$name),
 				'protected' => $method->isProtected(),
 				'class' => $method->getDeclaringClass()->getName(),
 				'comments' => $method->getDocComment()
 			];
-			$reserved['get' . strtolower($name)] = 1;
-			$reserved['set' . strtolower($name)] = 1;
+			$reserved['get'.strtolower($name)] = 1;
+			$reserved['set'.strtolower($name)] = 1;
 		}
 		ksort($events);
-		foreach($events as $name => $method)
+		foreach ($events as $name => $method)
 		{
 			$this->_events[$name] = [
 				'class' => $method->getDeclaringClass()->getName(),
@@ -122,9 +122,9 @@ 
 			$reserved[strtolower($name)] = 1;
 		}
 		ksort($methods);
-		foreach($methods as $name => $method)
+		foreach ($methods as $name => $method)
 		{
-			if(!isset($reserved[strtolower($name)]))
+			if (!isset($reserved[strtolower($name)]))
 				$this->_methods[$name] = [
 					'class' => $method->getDeclaringClass()->getName(),
 					'protected' => $method->isProtected(),
@@ -143,7 +143,7 @@ 
 	protected function determinePropertyType($method)
 	{
 		$comment = $method->getDocComment();
-		if(preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches))
+		if (preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches))
 			return $matches[1];
 		else
 			return '{unknown}';

Braces +21 added lines, -17 removed lines

@@ -47,12 +47,13 @@ 
 	 */
 	public function __construct($component)
 	{
-		if(is_string($component) && class_exists($component, false))
-			$this->_className = $component;
-		elseif(is_object($component))
-			$this->_className = get_class($component);
-		else
-			throw new TInvalidDataTypeException('componentreflection_class_invalid');
+		if(is_string($component) && class_exists($component, false)) {
+					$this->_className = $component;
+		} elseif(is_object($component)) {
+					$this->_className = get_class($component);
+		} else {
+					throw new TInvalidDataTypeException('componentreflection_class_invalid');
+		}
 		$this->reflect();
 	}
 
@@ -85,16 +86,17 @@ 
 				$methodName = $method->getName();
 				if(!$method->isStatic() && $isComponent)
 				{
-					if($this->isPropertyMethod($method))
-						$properties[substr($methodName, 3)] = $method;
-					elseif($this->isEventMethod($method))
+					if($this->isPropertyMethod($method)) {
+											$properties[substr($methodName, 3)] = $method;
+					} elseif($this->isEventMethod($method))
 					{
 						$methodName[0] = 'O';
 						$events[$methodName] = $method;
 					}
 				}
-				if(strncmp($methodName, '__', 2) !== 0)
-					$methods[$methodName] = $method;
+				if(strncmp($methodName, '__', 2) !== 0) {
+									$methods[$methodName] = $method;
+				}
 			}
 		}
 		$reserved = [];
@@ -124,13 +126,14 @@ 
 		ksort($methods);
 		foreach($methods as $name => $method)
 		{
-			if(!isset($reserved[strtolower($name)]))
-				$this->_methods[$name] = [
+			if(!isset($reserved[strtolower($name)])) {
+							$this->_methods[$name] = [
 					'class' => $method->getDeclaringClass()->getName(),
 					'protected' => $method->isProtected(),
 					'static' => $method->isStatic(),
 					'comments' => $method->getDocComment()
 				];
+			}
 		}
 	}
 
@@ -143,10 +146,11 @@ 
 	protected function determinePropertyType($method)
 	{
 		$comment = $method->getDocComment();
-		if(preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches))
-			return $matches[1];
-		else
-			return '{unknown}';
+		if(preg_match('/@return\\s+(.*?)\\s+/', $comment, $matches)) {
+					return $matches[1];
+		} else {
+					return '{unknown}';
+		}
 	}
 
 	/**

framework/Exceptions/TException.php

Spacing +8 added lines, -8 removed lines

@@ -55,8 +55,8 @@ 
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for($i = 0;$i < $n;++$i)
-			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		for ($i = 0; $i < $n; ++$i)
+			$tokens['{'.$i.'}'] = TPropertyValue::ensureString($args[$i]);
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
@@ -72,11 +72,11 @@ 
 		// Cache messages
 		if (!isset(self::$_messageCache[$msgFile]))
 		{
-			if(($entries = @file($msgFile)) !== false)
+			if (($entries = @file($msgFile)) !== false)
 			{
-				foreach($entries as $entry)
+				foreach ($entries as $entry)
 				{
-					list($code, $message) = array_merge(explode('=', $entry, 2), [ '' ]);
+					list($code, $message) = array_merge(explode('=', $entry, 2), ['']);
 					self::$_messageCache[$msgFile][trim($code)] = trim($message);
 				}
 			}
@@ -90,9 +90,9 @@ 
 	protected function getErrorMessageFile()
 	{
 		$lang = Prado::getPreferredLanguage();
-		$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages-' . $lang . '.txt';
-		if(!is_file($msgFile))
-			$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages.txt';
+		$msgFile = Prado::getFrameworkPath().'/Exceptions/messages/messages-'.$lang.'.txt';
+		if (!is_file($msgFile))
+			$msgFile = Prado::getFrameworkPath().'/Exceptions/messages/messages.txt';
 		return $msgFile;
 	}
 

Braces +6 added lines, -4 removed lines

@@ -55,8 +55,9 @@ 
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for($i = 0;$i < $n;++$i)
-			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		for($i = 0;$i < $n;++$i) {
+					$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		}
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
 
@@ -91,8 +92,9 @@ 
 	{
 		$lang = Prado::getPreferredLanguage();
 		$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages-' . $lang . '.txt';
-		if(!is_file($msgFile))
-			$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages.txt';
+		if(!is_file($msgFile)) {
+					$msgFile = Prado::getFrameworkPath() . '/Exceptions/messages/messages.txt';
+		}
 		return $msgFile;
 	}
 

framework/Exceptions/TErrorHandler.php

Spacing +61 added lines, -61 removed lines

@@ -91,8 +91,8 @@ 
 	 */
 	public function getErrorTemplatePath()
 	{
-		if($this->_templatePath === null)
-			$this->_templatePath = Prado::getFrameworkPath() . '/Exceptions/templates';
+		if ($this->_templatePath === null)
+			$this->_templatePath = Prado::getFrameworkPath().'/Exceptions/templates';
 		return $this->_templatePath;
 	}
 
@@ -104,7 +104,7 @@ 
 	 */
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath))
+		if (($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath))
 			$this->_templatePath = $templatePath;
 		else
 			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
@@ -128,18 +128,18 @@ 
 		restore_error_handler();
 		restore_exception_handler();
 		// ensure that we do not enter infinite loop of error handling
-		if($handling)
+		if ($handling)
 			$this->handleRecursiveError($param);
 		else
 		{
 			$handling = true;
-			if(($response = $this->getResponse()) !== null)
+			if (($response = $this->getResponse()) !== null)
 				$response->clear();
-			if(!headers_sent())
+			if (!headers_sent())
 				header('Content-Type: text/html; charset=UTF-8');
-			if($param instanceof THttpException)
+			if ($param instanceof THttpException)
 				$this->handleExternalError($param->getStatusCode(), $param);
-			elseif($this->getApplication()->getMode() === TApplicationMode::Debug)
+			elseif ($this->getApplication()->getMode() === TApplicationMode::Debug)
 				$this->displayException($param);
 			else
 				$this->handleExternalError(500, $param);
@@ -156,9 +156,9 @@ 
 	protected static function hideSecurityRelated($value, $exception = null)
 	{
 		$aRpl = [];
-		if($exception !== null && $exception instanceof \Exception)
+		if ($exception !== null && $exception instanceof \Exception)
 		{
-			if($exception instanceof TPhpFatalErrorException &&
+			if ($exception instanceof TPhpFatalErrorException &&
 				function_exists('xdebug_get_function_stack'))
 			{
 				$aTrace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
@@ -166,16 +166,16 @@ 
 				$aTrace = $exception->getTrace();
 			}
 
-			foreach($aTrace as $item)
+			foreach ($aTrace as $item)
 			{
-				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+				if (isset($item['file']))
+					$aRpl[dirname($item['file']).DIRECTORY_SEPARATOR] = '<hidden>'.DIRECTORY_SEPARATOR;
 			}
 		}
 		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
 		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
-		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
-		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
+		$aRpl[PRADO_DIR.DIRECTORY_SEPARATOR] = '${PradoFramework}'.DIRECTORY_SEPARATOR;
+		if (isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
 		$aRpl = array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
@@ -190,18 +190,18 @@ 
 	 */
 	protected function handleExternalError($statusCode, $exception)
 	{
-		if(!($exception instanceof THttpException))
+		if (!($exception instanceof THttpException))
 			error_log($exception->__toString());
 
 		$content = $this->getErrorTemplate($statusCode, $exception);
 
-		$serverAdmin = isset($_SERVER['SERVER_ADMIN'])?$_SERVER['SERVER_ADMIN']:'';
+		$serverAdmin = isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN'] : '';
 
 		$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
 
 		$errorMessage = $exception->getMessage();
-		if($isDebug)
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
+		if ($isDebug)
+			$version = $_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
 		{
 			$version = '';
@@ -229,16 +229,16 @@ 
 	 */
 	protected function handleRecursiveError($exception)
 	{
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
+		if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 		{
 			echo "<html><head><title>Recursive Error</title></head>\n";
 			echo "<body><h1>Recursive Error</h1>\n";
-			echo "<pre>" . $exception->__toString() . "</pre>\n";
+			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
 		}
 		else
 		{
-			error_log("Error happened while processing an existing error:\n" . $exception->__toString());
+			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
 		}
 	}
@@ -252,25 +252,25 @@ 
 	 */
 	protected function displayException($exception)
 	{
-		if(php_sapi_name() === 'cli')
+		if (php_sapi_name() === 'cli')
 		{
-			echo $exception->getMessage() . "\n";
+			echo $exception->getMessage()."\n";
 			echo $this->getExactTraceAsString($exception);
 			return;
 		}
 
-		if($exception instanceof TTemplateException)
+		if ($exception instanceof TTemplateException)
 		{
 			$fileName = $exception->getTemplateFile();
-			$lines = empty($fileName)?explode("\n", $exception->getTemplateSource()):@file($fileName);
+			$lines = empty($fileName) ?explode("\n", $exception->getTemplateSource()) : @file($fileName);
 			$source = $this->getSourceCode($lines, $exception->getLineNumber());
-			if($fileName === '')
+			if ($fileName === '')
 				$fileName = '---embedded template---';
 			$errorLine = $exception->getLineNumber();
 		}
 		else
 		{
-			if(($trace = $this->getExactTrace($exception)) !== null)
+			if (($trace = $this->getExactTrace($exception)) !== null)
 			{
 				$fileName = $trace['file'];
 				$errorLine = $trace['line'];
@@ -283,15 +283,15 @@ 
 			$source = $this->getSourceCode(@file($fileName), $errorLine);
 		}
 
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
+		if ($this->getApplication()->getMode() === TApplicationMode::Debug)
+			$version = $_SERVER['SERVER_SOFTWARE'].' <a href="https://github.com/pradosoft/prado">PRADO</a>/'.Prado::getVersion();
 		else
 			$version = '';
 
 		$tokens = [
 			'%%ErrorType%%' => get_class($exception),
 			'%%ErrorMessage%%' => $this->addLink(htmlspecialchars($exception->getMessage())),
-			'%%SourceFile%%' => htmlspecialchars($fileName) . ' (' . $errorLine . ')',
+			'%%SourceFile%%' => htmlspecialchars($fileName).' ('.$errorLine.')',
 			'%%SourceCode%%' => $source,
 			'%%StackTrace%%' => htmlspecialchars($this->getExactTraceAsString($exception)),
 			'%%Version%%' => $version,
@@ -313,10 +313,10 @@ 
 	protected function getExceptionTemplate($exception)
 	{
 		$lang = Prado::getPreferredLanguage();
-		$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '-' . $lang . '.html';
-		if(!is_file($exceptionFile))
-			$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '.html';
-		if(($content = @file_get_contents($exceptionFile)) === false)
+		$exceptionFile = Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'-'.$lang.'.html';
+		if (!is_file($exceptionFile))
+			$exceptionFile = Prado::getFrameworkPath().'/Exceptions/templates/'.self::EXCEPTION_FILE_NAME.'.html';
+		if (($content = @file_get_contents($exceptionFile)) === false)
 			die("Unable to open exception template file '$exceptionFile'.");
 		return $content;
 	}
@@ -339,17 +339,17 @@ 
 	 */
 	protected function getErrorTemplate($statusCode, $exception)
 	{
-		$base = $this->getErrorTemplatePath() . DIRECTORY_SEPARATOR . self::ERROR_FILE_NAME;
+		$base = $this->getErrorTemplatePath().DIRECTORY_SEPARATOR.self::ERROR_FILE_NAME;
 		$lang = Prado::getPreferredLanguage();
-		if(is_file("$base$statusCode-$lang.html"))
+		if (is_file("$base$statusCode-$lang.html"))
 			$errorFile = "$base$statusCode-$lang.html";
-		elseif(is_file("$base$statusCode.html"))
+		elseif (is_file("$base$statusCode.html"))
 			$errorFile = "$base$statusCode.html";
-		elseif(is_file("$base-$lang.html"))
+		elseif (is_file("$base-$lang.html"))
 			$errorFile = "$base-$lang.html";
 		else
 			$errorFile = "$base.html";
-		if(($content = @file_get_contents($errorFile)) === false)
+		if (($content = @file_get_contents($errorFile)) === false)
 			die("Unable to open error template file '$errorFile'.");
 		return $content;
 	}
@@ -357,7 +357,7 @@ 
 	private function getExactTrace($exception)
 	{
 		$result = null;
-		if($exception instanceof TPhpFatalErrorException &&
+		if ($exception instanceof TPhpFatalErrorException &&
 			function_exists('xdebug_get_function_stack'))
 		{
 			$trace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
@@ -367,17 +367,17 @@ 
 		
 		// if PHP exception, we want to show the 2nd stack level context
 		// because the 1st stack level is of little use (it's in error handler)
-		if($exception instanceof TPhpErrorException) {
-			if(isset($trace[0]['file']))
+		if ($exception instanceof TPhpErrorException) {
+			if (isset($trace[0]['file']))
 				$result = $trace[0];
-			elseif(isset($trace[1]))
+			elseif (isset($trace[1]))
 				$result = $trace[1];
-		} elseif($exception instanceof TInvalidOperationException) {
+		} elseif ($exception instanceof TInvalidOperationException) {
 			// in case of getter or setter error, find out the exact file and row
-			if(($result = $this->getPropertyAccessTrace($trace, '__get')) === null)
+			if (($result = $this->getPropertyAccessTrace($trace, '__get')) === null)
 				$result = $this->getPropertyAccessTrace($trace, '__set');
 		}
-		if($result !== null && strpos($result['file'], ': eval()\'d code') !== false)
+		if ($result !== null && strpos($result['file'], ': eval()\'d code') !== false)
 			return null;
 
 		return $result;
@@ -385,7 +385,7 @@ 
 
 	private function getExactTraceAsString($exception)
 	{
-		if($exception instanceof TPhpFatalErrorException &&
+		if ($exception instanceof TPhpFatalErrorException &&
 			function_exists('xdebug_get_function_stack'))
 		{
 			$trace = array_slice(array_reverse(xdebug_get_function_stack()), self::FATAL_ERROR_TRACE_DROP_LINES, -1);
@@ -393,14 +393,14 @@ 
 			$row = 0;
 
 			// try to mimic Exception::getTraceAsString()
-			foreach($trace as $line)
+			foreach ($trace as $line)
 			{
-				if(array_key_exists('function', $line))
-					$func = $line['function'] . '(' . implode(',', $line['params']) . ')';
+				if (array_key_exists('function', $line))
+					$func = $line['function'].'('.implode(',', $line['params']).')';
 				else
 					$func = 'unknown';
 
-				$txt .= '#' . $row . ' ' . $line['file'] . '(' . $line['line'] . '): ' . $func . "\n";
+				$txt .= '#'.$row.' '.$line['file'].'('.$line['line'].'): '.$func."\n";
 				$row++;
 			}
 
@@ -413,9 +413,9 @@ 
 	private function getPropertyAccessTrace($trace, $pattern)
 	{
 		$result = null;
-		foreach($trace as $t)
+		foreach ($trace as $t)
 		{
-			if(isset($t['function']) && $t['function'] === $pattern)
+			if (isset($t['function']) && $t['function'] === $pattern)
 				$result = $t;
 			else
 				break;
@@ -425,16 +425,16 @@ 
 
 	private function getSourceCode($lines, $errorLine)
 	{
-		$beginLine = $errorLine - self::SOURCE_LINES >= 0?$errorLine - self::SOURCE_LINES:0;
-		$endLine = $errorLine + self::SOURCE_LINES <= count($lines)?$errorLine + self::SOURCE_LINES:count($lines);
+		$beginLine = $errorLine - self::SOURCE_LINES >= 0 ? $errorLine - self::SOURCE_LINES : 0;
+		$endLine = $errorLine + self::SOURCE_LINES <= count($lines) ? $errorLine + self::SOURCE_LINES : count($lines);
 
 		$source = '';
-		for($i = $beginLine;$i < $endLine;++$i)
+		for ($i = $beginLine; $i < $endLine; ++$i)
 		{
-			if($i === $errorLine - 1)
+			if ($i === $errorLine - 1)
 			{
 				$line = htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
-				$source .= "<div class=\"error\">" . $line . "</div>";
+				$source .= "<div class=\"error\">".$line."</div>";
 			}
 			else
 				$source .= htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
@@ -444,7 +444,7 @@ 
 
 	private function addLink($message) {
 		if (null !== ($class = $this->getErrorClassNameSpace($message))) {
-			return str_replace($class['name'], '<a href="' . $class['url'] . '" target="_blank">' . $class['name'] . '</a>', $message);
+			return str_replace($class['name'], '<a href="'.$class['url'].'" target="_blank">'.$class['name'].'</a>', $message);
 		}
 		return $message;
 	}
@@ -462,7 +462,7 @@ 
 			}
 			$classname = $function->getNamespaceName();
 			return [
-				'url' => 'http://pradosoft.github.io/docs/manual/class-' . str_replace('\\', '.', (string) $classname) . '.' . $class . '.html',
+				'url' => 'http://pradosoft.github.io/docs/manual/class-'.str_replace('\\', '.', (string) $classname).'.'.$class.'.html',
 				'name' => $class,
 			];
 		}

Braces +89 added lines, -73 removed lines

@@ -91,8 +91,9 @@ 
 	 */
 	public function getErrorTemplatePath()
 	{
-		if($this->_templatePath === null)
-			$this->_templatePath = Prado::getFrameworkPath() . '/Exceptions/templates';
+		if($this->_templatePath === null) {
+					$this->_templatePath = Prado::getFrameworkPath() . '/Exceptions/templates';
+		}
 		return $this->_templatePath;
 	}
 
@@ -104,10 +105,11 @@ 
 	 */
 	public function setErrorTemplatePath($value)
 	{
-		if(($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath))
-			$this->_templatePath = $templatePath;
-		else
-			throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
+		if(($templatePath = Prado::getPathOfNamespace($value)) !== null && is_dir($templatePath)) {
+					$this->_templatePath = $templatePath;
+		} else {
+					throw new TConfigurationException('errorhandler_errortemplatepath_invalid', $value);
+		}
 	}
 
 	/**
@@ -128,21 +130,24 @@ 
 		restore_error_handler();
 		restore_exception_handler();
 		// ensure that we do not enter infinite loop of error handling
-		if($handling)
-			$this->handleRecursiveError($param);
-		else
+		if($handling) {
+					$this->handleRecursiveError($param);
+		} else
 		{
 			$handling = true;
-			if(($response = $this->getResponse()) !== null)
-				$response->clear();
-			if(!headers_sent())
-				header('Content-Type: text/html; charset=UTF-8');
-			if($param instanceof THttpException)
-				$this->handleExternalError($param->getStatusCode(), $param);
-			elseif($this->getApplication()->getMode() === TApplicationMode::Debug)
-				$this->displayException($param);
-			else
-				$this->handleExternalError(500, $param);
+			if(($response = $this->getResponse()) !== null) {
+							$response->clear();
+			}
+			if(!headers_sent()) {
+							header('Content-Type: text/html; charset=UTF-8');
+			}
+			if($param instanceof THttpException) {
+							$this->handleExternalError($param->getStatusCode(), $param);
+			} elseif($this->getApplication()->getMode() === TApplicationMode::Debug) {
+							$this->displayException($param);
+			} else {
+							$this->handleExternalError(500, $param);
+			}
 		}
 	}
 
@@ -168,14 +173,17 @@ 
 
 			foreach($aTrace as $item)
 			{
-				if(isset($item['file']))
-					$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+				if(isset($item['file'])) {
+									$aRpl[dirname($item['file']) . DIRECTORY_SEPARATOR] = '<hidden>' . DIRECTORY_SEPARATOR;
+				}
 			}
 		}
 		$aRpl[$_SERVER['DOCUMENT_ROOT']] = '${DocumentRoot}';
 		$aRpl[str_replace('/', DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT'])] = '${DocumentRoot}';
 		$aRpl[PRADO_DIR . DIRECTORY_SEPARATOR] = '${PradoFramework}' . DIRECTORY_SEPARATOR;
-		if(isset($aRpl[DIRECTORY_SEPARATOR])) unset($aRpl[DIRECTORY_SEPARATOR]);
+		if(isset($aRpl[DIRECTORY_SEPARATOR])) {
+			unset($aRpl[DIRECTORY_SEPARATOR]);
+		}
 		$aRpl = array_reverse($aRpl, true);
 
 		return str_replace(array_keys($aRpl), $aRpl, $value);
@@ -190,8 +198,9 @@ 
 	 */
 	protected function handleExternalError($statusCode, $exception)
 	{
-		if(!($exception instanceof THttpException))
-			error_log($exception->__toString());
+		if(!($exception instanceof THttpException)) {
+					error_log($exception->__toString());
+		}
 
 		$content = $this->getErrorTemplate($statusCode, $exception);
 
@@ -200,9 +209,9 @@ 
 		$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
 
 		$errorMessage = $exception->getMessage();
-		if($isDebug)
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
-		else
+		if($isDebug) {
+					$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
+		} else
 		{
 			$version = '';
 			$errorMessage = self::hideSecurityRelated($errorMessage, $exception);
@@ -235,8 +244,7 @@ 
 			echo "<body><h1>Recursive Error</h1>\n";
 			echo "<pre>" . $exception->__toString() . "</pre>\n";
 			echo "</body></html>";
-		}
-		else
+		} else
 		{
 			error_log("Error happened while processing an existing error:\n" . $exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
@@ -264,18 +272,17 @@ 
 			$fileName = $exception->getTemplateFile();
 			$lines = empty($fileName)?explode("\n", $exception->getTemplateSource()):@file($fileName);
 			$source = $this->getSourceCode($lines, $exception->getLineNumber());
-			if($fileName === '')
-				$fileName = '---embedded template---';
+			if($fileName === '') {
+							$fileName = '---embedded template---';
+			}
 			$errorLine = $exception->getLineNumber();
-		}
-		else
+		} else
 		{
 			if(($trace = $this->getExactTrace($exception)) !== null)
 			{
 				$fileName = $trace['file'];
 				$errorLine = $trace['line'];
-			}
-			else
+			} else
 			{
 				$fileName = $exception->getFile();
 				$errorLine = $exception->getLine();
@@ -283,10 +290,11 @@ 
 			$source = $this->getSourceCode(@file($fileName), $errorLine);
 		}
 
-		if($this->getApplication()->getMode() === TApplicationMode::Debug)
-			$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
-		else
-			$version = '';
+		if($this->getApplication()->getMode() === TApplicationMode::Debug) {
+					$version = $_SERVER['SERVER_SOFTWARE'] . ' <a href="https://github.com/pradosoft/prado">PRADO</a>/' . Prado::getVersion();
+		} else {
+					$version = '';
+		}
 
 		$tokens = [
 			'%%ErrorType%%' => get_class($exception),
@@ -314,10 +322,12 @@ 
 	{
 		$lang = Prado::getPreferredLanguage();
 		$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '-' . $lang . '.html';
-		if(!is_file($exceptionFile))
-			$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '.html';
-		if(($content = @file_get_contents($exceptionFile)) === false)
-			die("Unable to open exception template file '$exceptionFile'.");
+		if(!is_file($exceptionFile)) {
+					$exceptionFile = Prado::getFrameworkPath() . '/Exceptions/templates/' . self::EXCEPTION_FILE_NAME . '.html';
+		}
+		if(($content = @file_get_contents($exceptionFile)) === false) {
+					die("Unable to open exception template file '$exceptionFile'.");
+		}
 		return $content;
 	}
 
@@ -341,16 +351,18 @@ 
 	{
 		$base = $this->getErrorTemplatePath() . DIRECTORY_SEPARATOR . self::ERROR_FILE_NAME;
 		$lang = Prado::getPreferredLanguage();
-		if(is_file("$base$statusCode-$lang.html"))
-			$errorFile = "$base$statusCode-$lang.html";
-		elseif(is_file("$base$statusCode.html"))
-			$errorFile = "$base$statusCode.html";
-		elseif(is_file("$base-$lang.html"))
-			$errorFile = "$base-$lang.html";
-		else
-			$errorFile = "$base.html";
-		if(($content = @file_get_contents($errorFile)) === false)
-			die("Unable to open error template file '$errorFile'.");
+		if(is_file("$base$statusCode-$lang.html")) {
+					$errorFile = "$base$statusCode-$lang.html";
+		} elseif(is_file("$base$statusCode.html")) {
+					$errorFile = "$base$statusCode.html";
+		} elseif(is_file("$base-$lang.html")) {
+					$errorFile = "$base-$lang.html";
+		} else {
+					$errorFile = "$base.html";
+		}
+		if(($content = @file_get_contents($errorFile)) === false) {
+					die("Unable to open error template file '$errorFile'.");
+		}
 		return $content;
 	}
 
@@ -368,17 +380,20 @@ 
 		// if PHP exception, we want to show the 2nd stack level context
 		// because the 1st stack level is of little use (it's in error handler)
 		if($exception instanceof TPhpErrorException) {
-			if(isset($trace[0]['file']))
-				$result = $trace[0];
-			elseif(isset($trace[1]))
-				$result = $trace[1];
+			if(isset($trace[0]['file'])) {
+							$result = $trace[0];
+			} elseif(isset($trace[1])) {
+							$result = $trace[1];
+			}
 		} elseif($exception instanceof TInvalidOperationException) {
 			// in case of getter or setter error, find out the exact file and row
-			if(($result = $this->getPropertyAccessTrace($trace, '__get')) === null)
-				$result = $this->getPropertyAccessTrace($trace, '__set');
+			if(($result = $this->getPropertyAccessTrace($trace, '__get')) === null) {
+							$result = $this->getPropertyAccessTrace($trace, '__set');
+			}
+		}
+		if($result !== null && strpos($result['file'], ': eval()\'d code') !== false) {
+					return null;
 		}
-		if($result !== null && strpos($result['file'], ': eval()\'d code') !== false)
-			return null;
 
 		return $result;
 	}
@@ -395,10 +410,11 @@ 
 			// try to mimic Exception::getTraceAsString()
 			foreach($trace as $line)
 			{
-				if(array_key_exists('function', $line))
-					$func = $line['function'] . '(' . implode(',', $line['params']) . ')';
-				else
-					$func = 'unknown';
+				if(array_key_exists('function', $line)) {
+									$func = $line['function'] . '(' . implode(',', $line['params']) . ')';
+				} else {
+									$func = 'unknown';
+				}
 
 				$txt .= '#' . $row . ' ' . $line['file'] . '(' . $line['line'] . '): ' . $func . "\n";
 				$row++;
@@ -415,10 +431,11 @@ 
 		$result = null;
 		foreach($trace as $t)
 		{
-			if(isset($t['function']) && $t['function'] === $pattern)
-				$result = $t;
-			else
-				break;
+			if(isset($t['function']) && $t['function'] === $pattern) {
+							$result = $t;
+			} else {
+							break;
+			}
 		}
 		return $result;
 	}
@@ -435,9 +452,9 @@ 
 			{
 				$line = htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 				$source .= "<div class=\"error\">" . $line . "</div>";
+			} else {
+							$source .= htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 			}
-			else
-				$source .= htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
 	}
@@ -456,8 +473,7 @@ 
 			$class = $matches[0];
 			try {
 				$function = new \ReflectionClass($class);
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				return null;
 			}
 			$classname = $function->getNamespaceName();