pradosoft / prado

framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 		if (($total = count($fkObjects)) > 0) {
 			$source = $this->getSourceRecord();
 			$fkeys = $this->findForeignKeys($fkObjects[0], $source);
-			for ($i = 0;$i < $total;$i++) {
+			for ($i = 0; $i < $total; $i++) {
 				foreach ($fkeys as $fKey => $srcKey) {
 					$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
 				}

framework/Data/SqlMap/Statements/TMappedStatement.php

Spacing +3 added lines, -6 removed lines

@@ -236,8 +236,7 @@ 
 	public function runQueryForList($connection, $parameter, $sql, $result, $delegate = null)
 	{
 		$registry = $this->getManager()->getTypeHandlers();
-		$list = $result instanceof \ArrayAccess ? $result :
-							$this->_statement->createInstanceOfListClass($registry);
+		$list = $result instanceof \ArrayAccess ? $result : $this->_statement->createInstanceOfListClass($registry);
 		$connection->setActive(true);
 		$reader = $sql->query();
 		//$reader = $this->executeSQLQueryLimit($connection, $sql, $max, $skip);
@@ -313,8 +312,7 @@ 
 			foreach ($reader as $row) {
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$value = ($valueProperty === null) ? $obj :
-							TPropertyAccess::get($obj, $valueProperty);
+				$value = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
@@ -323,8 +321,7 @@ 
 			foreach ($reader as $row) {
 				$obj = $this->applyResultMap($row);
 				$key = TPropertyAccess::get($obj, $keyProperty);
-				$map[$key] = ($valueProperty === null) ? $obj :
-								TPropertyAccess::get($obj, $valueProperty);
+				$map[$key] = ($valueProperty === null) ? $obj : TPropertyAccess::get($obj, $valueProperty);
 			}
 		}
 		$this->onExecuteQuery($command);

Doc Comments +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
 	}
 
 	/**
-	 * @return TSqlMapper The SqlMap used by this MappedStatement
+	 * @return TSqlMapManager The SqlMap used by this MappedStatement
 	 */
 	public function getManager()
 	{
@@ -122,7 +122,7 @@ 
 
 	/**
 	 * Creates a new mapped statement.
-	 * @param TSqlMapper $sqlMap an sqlmap.
+	 * @param TSqlMapManager $sqlMap an sqlmap.
 	 * @param TSqlMapStatement $statement An SQL statement.
 	 */
 	public function __construct(TSqlMapManager $sqlMap, TSqlMapStatement $statement)
@@ -337,7 +337,7 @@ 
 	 * Raises delegate handler.
 	 * This method is invoked for each new list item. It is the responsibility
 	 * of the handler to add the item to the list.
-	 * @param object $handler event parameter
+	 * @param callable $handler event parameter
 	 * @param mixed $param
 	 */
 	protected function raiseRowDelegate($handler, $param)
@@ -468,7 +468,7 @@ 
 	 * Execute the select key statement, used to obtain last insert ID.
 	 * @param IDbConnection $connection database connection
 	 * @param mixed $parameter insert statement parameter
-	 * @param TSqlMapSelectKey $selectKey select key statement
+	 * @param \Prado\Data\SqlMap\Configuration\TSqlMapSelectKey $selectKey select key statement
 	 * @return string last insert ID.
 	 */
 	protected function executeSelectKey($connection, $parameter, $selectKey)
@@ -595,7 +595,7 @@ 
 	/**
 	 * Apply the result to a TList or an array.
 	 * @param array $row a result set row retrieved from the database
-	 * @param object $resultObject result object, array or list
+	 * @param \ArrayAccess $resultObject result object, array or list
 	 * @return object result filled with data.
 	 */
 	protected function fillResultArrayList($row, $resultObject)
@@ -640,7 +640,7 @@ 
 	 * Fills the result object according to result mappings.
 	 * @param string $resultMapName result map name.
 	 * @param array $row a result set row retrieved from the database
-	 * @param null|mixed $parentGroup
+	 * @param null|string $parentGroup
 	 * @param null|&object $resultObject result object to fill, will create new instances if required.
 	 * @return object result object filled with data.
 	 */

framework/Web/UI/JuiControls/TJuiDialogButton.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 			'text' => $this->getText(),
 			'click' => new TJavaScriptLiteral(
 				"function(){new Prado.Callback('" . $this->getUniqueID() . "', 'onClick');}"
-			)] ;
+			)];
 	}
 
 	/**

framework/Web/UI/TControl.php

Spacing +15 added lines, -15 removed lines

@@ -114,17 +114,17 @@ 
 	 * Indexes for the rare fields.
 	 * In order to save memory, rare fields will only be created if they are needed.
 	 */
-	const RF_CONTROLS = 0;			// child controls
-	const RF_CHILD_STATE = 1;			// child state field
-	const RF_NAMED_CONTROLS = 2;		// list of controls whose namingcontainer is this control
-	const RF_NAMED_CONTROLS_ID = 3;	// counter for automatic id
-	const RF_SKIN_ID = 4;				// skin ID
-	const RF_DATA_BINDINGS = 5;		// data bindings
-	const RF_EVENTS = 6;				// event handlers
-	const RF_CONTROLSTATE = 7;		// controlstate
-	const RF_NAMED_OBJECTS = 8;		// controls declared with ID on template
-	const RF_ADAPTER = 9;				// adapter
-	const RF_AUTO_BINDINGS = 10;		// auto data bindings
+	const RF_CONTROLS = 0; // child controls
+	const RF_CHILD_STATE = 1; // child state field
+	const RF_NAMED_CONTROLS = 2; // list of controls whose namingcontainer is this control
+	const RF_NAMED_CONTROLS_ID = 3; // counter for automatic id
+	const RF_SKIN_ID = 4; // skin ID
+	const RF_DATA_BINDINGS = 5; // data bindings
+	const RF_EVENTS = 6; // event handlers
+	const RF_CONTROLSTATE = 7; // controlstate
+	const RF_NAMED_OBJECTS = 8; // controls declared with ID on template
+	const RF_ADAPTER = 9; // adapter
+	const RF_AUTO_BINDINGS = 10; // auto data bindings
 
 	/**
 	 * @var string control ID
@@ -402,7 +402,7 @@ 
 	public function getUniqueID()
 	{
 		if ($this->_uid === '' || $this->_uid === null) {	// need to build the UniqueID
-			$this->_uid = '';  // set to not-null, so that clearCachedUniqueID() may take action
+			$this->_uid = ''; // set to not-null, so that clearCachedUniqueID() may take action
 			if ($namingContainer = $this->getNamingContainer()) {
 				if ($this->getPage() === $namingContainer) {
 					return ($this->_uid = $this->_id);
@@ -568,7 +568,7 @@ 
 	public function getVisible($checkParents = true)
 	{
 		if ($checkParents) {
-			for ($control = $this;$control;$control = $control->_parent) {
+			for ($control = $this; $control; $control = $control->_parent) {
 				if (!$control->getVisible(false)) {
 					return false;
 				}
@@ -600,7 +600,7 @@ 
 	public function getEnabled($checkParents = false)
 	{
 		if ($checkParents) {
-			for ($control = $this;$control;$control = $control->_parent) {
+			for ($control = $this; $control; $control = $control->_parent) {
 				if (!$control->getViewState('Enabled', true)) {
 					return false;
 				}
@@ -702,7 +702,7 @@ 
 	public function getEnableViewState($checkParents = false)
 	{
 		if ($checkParents) {
-			for ($control = $this;$control !== null;$control = $control->getParent()) {
+			for ($control = $this; $control !== null; $control = $control->getParent()) {
 				if ($control->_flags & self::IS_DISABLE_VIEWSTATE) {
 					return false;
 				}

Doc Comments +9 added lines, -9 removed lines

@@ -214,7 +214,7 @@ 
 	 * the control ID will take the precedence.
 	 *
 	 * @param string $name the property name or control ID
-	 * @return bool wether the control or property exists
+	 * @return boolean|null wether the control or property exists
 	 * @see __get
 	 */
 	public function __isset($name)
@@ -471,7 +471,7 @@ 
 	}
 
 	/**
-	 * @return bool if a skin is applied.
+	 * @return integer if a skin is applied.
 	 */
 	public function getIsSkinApplied()
 	{
@@ -648,7 +648,7 @@ 
 	}
 
 	/**
-	 * @param mixed $name
+	 * @param string $name
 	 * @return bool whether the named attribute exists
 	 */
 	public function hasAttribute($name)
@@ -661,7 +661,7 @@ 
 	}
 
 	/**
-	 * @param mixed $name
+	 * @param string $name
 	 * @return string attribute value, null if attribute does not exist
 	 */
 	public function getAttribute($name)
@@ -698,7 +698,7 @@ 
 	}
 
 	/**
-	 * @param mixed $checkParents
+	 * @param boolean $checkParents
 	 * @return bool whether viewstate is enabled
 	 */
 	public function getEnableViewState($checkParents = false)
@@ -733,7 +733,7 @@ 
 	 * This function is mainly used in defining getter functions for control properties
 	 * that must be kept in controlstate.
 	 * @param string $key the name of the controlstate value to be returned
-	 * @param mixed $defaultValue the default value. If $key is not found in controlstate, $defaultValue will be returned
+	 * @param integer|null $defaultValue the default value. If $key is not found in controlstate, $defaultValue will be returned
 	 * @return mixed the controlstate value corresponding to $key
 	 */
 	protected function getControlState($key, $defaultValue = null)
@@ -749,7 +749,7 @@ 
 	 * Make sure that the controlstate value must be serializable and unserializable.
 	 * @param string $key the name of the controlstate value
 	 * @param mixed $value the controlstate value to be set
-	 * @param null|mixed $defaultValue default value. If $value===$defaultValue, the item will be cleared from controlstate
+	 * @param integer $defaultValue default value. If $value===$defaultValue, the item will be cleared from controlstate
 	 */
 	protected function setControlState($key, $value, $defaultValue = null)
 	{
@@ -1084,7 +1084,7 @@ 
 	 * A registered object can be accessed like a public member variable.
 	 * This method should only be used by framework and control developers.
 	 * @param string $name name of the object
-	 * @param object $object object to be declared
+	 * @param \Prado\TComponent $object object to be declared
 	 * @see __get
 	 */
 	public function registerObject($name, $object)
@@ -1160,7 +1160,7 @@ 
 	 * A component with explicit ID on a template will be registered to
 	 * the template owner. This method allows you to obtain this component
 	 * with the ID.
-	 * @param mixed $name
+	 * @param string $name
 	 * @return mixed the named registered object. Null if object is not found.
 	 */
 	public function getRegisteredObject($name)

framework/Web/UI/WebControls/TCaptchaValidator.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 	private function generateTokenHash($token)
 	{
-		for ($h = 0,$i = strlen($token) - 1;$i >= 0;--$i) {
+		for ($h = 0, $i = strlen($token) - 1; $i >= 0; --$i) {
 			$h += ord($token[$i]);
 		}
 		return $h;

Doc Comments +4 added lines, -1 removed lines

@@ -82,7 +82,7 @@ 
 
 	/**
 	 * @throws TConfigurationException if the CAPTCHA cannot be found according to {@link setCaptchaControl CaptchaControl}
-	 * @return TCaptchaControl the CAPTCHA control to be validated against
+	 * @return TCaptcha the CAPTCHA control to be validated against
 	 */
 	protected function findCaptchaControl()
 	{
@@ -115,6 +115,9 @@ 
 		return $options;
 	}
 
+	/**
+	 * @param string $token
+	 */
 	private function generateTokenHash($token)
 	{
 		for ($h = 0,$i = strlen($token) - 1;$i >= 0;--$i) {

framework/Web/UI/WebControls/TFileUpload.php

Spacing +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
 	 */
 	public function getValidationPropertyValue()
 	{
-		return implode(',', array_map(function ($file) {
+		return implode(',', array_map(function($file) {
 			return $file->getFileName();
 		}, $this->_files));
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
 	/**
 	 * Returns the comma separated list of original file names as the property value to be validated.
 	 * This method is required by \Prado\Web\UI\IValidatable property.
-	 * @return mixed the property value to be validated
+	 * @return string the property value to be validated
 	 */
 	public function getValidationPropertyValue()
 	{

framework/Web/UI/WebControls/TRepeater.php

Spacing +1 added lines, -1 removed lines

@@ -629,7 +629,7 @@
 			$items = $this->getItems();
 			$hasSeparator = $this->_separatorTemplate !== null || $this->getSeparatorRenderer() !== '';
 			$this->_header = $this->createItemInternal(-1, TListItemType::Header);
-			for ($i = 0;$i < $itemCount;++$i) {
+			for ($i = 0; $i < $itemCount; ++$i) {
 				if ($hasSeparator && $i > 0) {
 					$this->createItemInternal($i - 1, TListItemType::Separator);
 				}

Doc Comments +5 added lines, -5 removed lines

@@ -286,7 +286,7 @@ 
 	}
 
 	/**
-	 * @param ITemplate $value the template for repeater items
+	 * @param \Prado\Web\UI\TTemplate $value the template for repeater items
 	 * @throws TInvalidDataTypeException if the input is not an {@link ITemplate} or not null.
 	 */
 	public function setItemTemplate($value)
@@ -463,7 +463,7 @@ 
 	 * This method invokes {@link createItem} to create a new repeater item.
 	 * @param int $itemIndex zero-based item index.
 	 * @param TListItemType $itemType item type
-	 * @return TControl the created item, null if item is not created
+	 * @return \Prado\TComponent|null the created item, null if item is not created
 	 */
 	private function createItemInternal($itemIndex, $itemType)
 	{
@@ -483,7 +483,7 @@ 
 	 * @param int $itemIndex zero-based item index.
 	 * @param TListItemType $itemType item type
 	 * @param mixed $dataItem data to be associated with the item
-	 * @return TControl the created item, null if item is not created
+	 * @return \Prado\TComponent|null the created item, null if item is not created
 	 */
 	private function createItemWithDataInternal($itemIndex, $itemType, $dataItem)
 	{
@@ -506,7 +506,7 @@ 
 	 * Creates a repeater item instance based on the item type and index.
 	 * @param int $itemIndex zero-based item index
 	 * @param TListItemType $itemType item type
-	 * @return TControl created repeater item
+	 * @return null|\Prado\TComponent created repeater item
 	 */
 	protected function createItem($itemIndex, $itemType)
 	{
@@ -759,7 +759,7 @@ 
 	 * as the field name, the property value will be returned.
 	 * Otherwise, an exception will be raised.
 	 * @param mixed $data data item
-	 * @param mixed $field field name
+	 * @param string $field field name
 	 * @throws TInvalidDataValueException if the data is invalid
 	 * @return mixed data value at the specified field
 	 */

framework/Exceptions/TErrorHandler.php

Spacing +1 added lines, -1 removed lines

@@ -430,7 +430,7 @@
 		$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) {
 				$line = htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 				$source .= "<div class=\"error\">" . $line . "</div>";

Doc Comments +10 added lines, -1 removed lines

@@ -118,7 +118,7 @@ 
 	 * raised in {@link TApplication}.
 	 * The method mainly uses appropriate template to display the error/exception.
 	 * It terminates the application immediately after the error is displayed.
-	 * @param mixed $sender sender of the event
+	 * @param null|\Prado\TApplication $sender sender of the event
 	 * @param mixed $param event parameter (if the event is raised by TApplication, it refers to the exception instance)
 	 */
 	public function handleError($sender, $param)
@@ -385,6 +385,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function getExactTraceAsString($exception)
 	{
 		if ($exception instanceof TPhpFatalErrorException &&
@@ -411,6 +414,9 @@ 
 		return $exception->getTraceAsString();
 	}
 
+	/**
+	 * @param string $pattern
+	 */
 	private function getPropertyAccessTrace($trace, $pattern)
 	{
 		$result = null;
@@ -441,6 +447,9 @@ 
 		return $source;
 	}
 
+	/**
+	 * @param string $message
+	 */
 	private function addLink($message)
 	{
 		if (null !== ($class = $this->getErrorClassNameSpace($message))) {

framework/Exceptions/THttpException.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for ($i = 0;$i < $n;++$i) {
+		for ($i = 0; $i < $n; ++$i) {
 			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
 		}
 		parent::__construct(strtr($errorMessage, $tokens));