pradosoft / prado

framework/Collections/TStack.php

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
 				$this->_d[] = $item;
 				++$this->_c;
 			}
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 

framework/Collections/TPriorityMap.php

Braces +9 added lines, -18 removed lines

@@ -365,13 +365,11 @@ 
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority] = [$key => $value];
 				$this->_o = false;
-			}
-			else
+			} else
 				$this->_d[$priority][$key] = $value;
 			$this->_c++;
 			$this->_fd = null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
 		return $priority;
 	}
@@ -413,8 +411,7 @@ 
 						return $value;
 					}
 				return null;
-			}
-			else
+			} else
 			{
 				$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
 				if(isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
@@ -428,12 +425,10 @@ 
 					}
 					$this->_fd = null;
 					return $value;
-				}
-				else
+				} else
 					return null;
 			}
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
 	}
 
@@ -526,15 +521,13 @@ 
 					$this->add($key, $value, $priority);
 				}
 			}
-		}
-		elseif(is_array($data) || $data instanceof \Traversable)
+		} elseif(is_array($data) || $data instanceof \Traversable)
 		{
 			if($this->getCount() > 0)
 				$this->clear();
 			foreach($data as $key => $value)
 				$this->add($key, $value);
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -554,13 +547,11 @@ 
 				foreach($data->itemsAtPriority($priority) as $key => $value)
 					$this->add($key, $value, $priority);
 			}
-		}
-		elseif(is_array($data) || $data instanceof \Traversable)
+		} elseif(is_array($data) || $data instanceof \Traversable)
 		{
 			foreach($data as $key => $value)
 				$this->add($key, $value);
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Collections/TPriorityList.php

Braces +3 added lines, -6 removed lines

@@ -391,8 +391,7 @@ 
 			}
 			$this->removeAtIndexInPriority($p[1], $p[0]);
 			return $p[2];
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 
@@ -676,14 +675,12 @@ 
 				foreach($data->itemsAtPriority($priority) as $index => $item)
 					$this->insertAtIndexInPriority($item, false, $priority);
 			}
-		}
-		elseif(is_array($data) || $data instanceof \Traversable)
+		} elseif(is_array($data) || $data instanceof \Traversable)
 		{
 			foreach($data as $priority => $item)
 				$this->add($item);
 
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Collections/TList.php

Braces +10 added lines, -20 removed lines

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

framework/Collections/TMap.php

Braces +4 added lines, -8 removed lines

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

framework/Collections/TPagedList.php

Braces +5 added lines, -10 removed lines

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

framework/Collections/TQueue.php

Braces +1 added lines, -2 removed lines

@@ -84,8 +84,7 @@
 				$this->_d[] = $item;
 				++$this->_c;
 			}
-		}
-		elseif($data !== null)
+		} elseif($data !== null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

framework/TPropertyValue.php

Braces +3 added lines, -6 removed lines

@@ -124,11 +124,9 @@ 
 			{
 				eval('$array=array' . $value . ';');
 				return $array;
-			}
-			else
+			} else
 				return $len > 0?[$value]:[];
-		}
-		else
+		} else
 			return (array)$value;
 	}
 
@@ -171,8 +169,7 @@ 
 				throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid', $value,
 						implode(' | ', $types[$enums]->getConstants()));
-		}
-		elseif(!is_array($enums))
+		} elseif(!is_array($enums))
 		{
 			$enums = func_get_args();
 			array_shift($enums);

framework/Web/THttpResponse.php

Braces +5 added lines, -9 removed lines

@@ -283,7 +283,7 @@ 
 		$status = TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason === null || $reason === '') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -379,8 +379,7 @@ 
 		{
 			foreach($headers as $h)
 				header($h);
-		}
-		else
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -505,13 +504,11 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
-				}
-				else
+				} else
 					ob_flush();
 				flush();
 			}
-		}
-		else
+		} else
 			flush();
 	}
 
@@ -659,8 +656,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),