pradosoft / prado

framework/Security/TDbUserManager.php

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 

framework/Security/TAuthorizationRule.php

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
 				{
 					$this->_everyone = true;
 					break;
-				}
-				elseif($user === '?')
+				} elseif($user === '?')
 					$this->_guest = true;
 				elseif($user === '@')
 					$this->_authenticated = true;

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/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/Services/TPageConfiguration.php

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
 			if($dom->loadFromFile($fname))

framework/Web/TAssetManager.php

Braces +2 added lines, -4 removed lines

@@ -173,8 +173,7 @@ 
 			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
-		}
-		else
+		} else
 		{
 			$dir = $this->hash($fullpath);
 			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
@@ -297,8 +296,7 @@ 
 						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
 					}
-				}
-				else
+				} else
 					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 			}
 			closedir($folder);

framework/Web/UI/TTheme.php

Braces +5 added lines, -10 removed lines

@@ -117,8 +117,7 @@ 
 					closedir($dir);
 					if($cacheValid)
 						$this->_skins = $skins;
-				}
-				else
+				} else
 				{
 					$cacheValid = true;
 					$this->_cssFiles = $cssFiles;
@@ -295,20 +294,16 @@ 
 							{
 								$setter = 'set' . $name;
 								$control->$setter($value);
-							}
-							else
+							} else
 								throw new TConfigurationException('theme_property_readonly', $type, $name);
-						}
-						else
+						} else
 							throw new TConfigurationException('theme_property_undefined', $type, $name);
-					}
-					else	// complex property
+					} else	// complex property
 						$control->setSubProperty($name, $value);
 				}
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Web/UI/ActiveControls/TActiveHyperLinkColumn.php

Braces +5 added lines, -10 removed lines

@@ -51,8 +51,7 @@ 
 				$control->setData($text);
 			}
 			$cell->getControls()->add($control);
-		}
-		elseif($this->getAllowSorting())
+		} elseif($this->getAllowSorting())
 		{
 			$sortExpression = $this->getSortExpression();
 			if(($url = $this->getHeaderImageUrl()) !== '')
@@ -65,8 +64,7 @@ 
 					$button->setAlternateText($text);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 			{
 				$button = new TActiveLinkButton;
 				$button->setText($text);
@@ -74,11 +72,9 @@ 
 				$button->setCommandParameter($sortExpression);
 				$button->setCausesValidation(false);
 				$cell->getControls()->add($button);
-			}
-			else
+			} else
 				$cell->setText(' ');
-		}
-		else
+		} else
 		{
 			if(($url = $this->getHeaderImageUrl()) !== '')
 			{
@@ -87,8 +83,7 @@ 
 				if($text !== '')
 					$image->setAlternateText($text);
 				$cell->getControls()->add($image);
-			}
-			elseif($text !== '')
+			} elseif($text !== '')
 				$cell->setText($text);
 			else
 				$cell->setText(' ');