pradosoft / prado

framework/Caching/TDbCache.php

Braces +10 added lines, -20 removed lines

@@ -205,8 +205,7 @@ 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -229,8 +228,7 @@ 
 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
-			}
-			else
+			} else
 				throw new TConfigurationException('db_cachetable_inexistent', $this->_cacheTable);
 		}
 		$this->_cacheInitialized = true;
@@ -299,8 +297,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dbcache_connectionid_invalid', $this->_connID);
-		}
-		else
+		} else
 		{
 			$db = new TDbConnection;
 			if($this->_connectionString !== '')
@@ -310,8 +307,7 @@ 
 					$db->setUsername($this->_username);
 				if($this->_password !== '')
 					$db->setPassword($this->_password);
-			}
-			else
+			} else
 			{
 				// default to SQLite3 database
 				$dbFile = $this->getApplication()->getRuntimePath() . '/sqlite3.cache';
@@ -468,8 +464,7 @@ 
 			$sql = 'SELECT value FROM ' . $this->_cacheTable . ' WHERE itemkey=\'' . $key . '\' AND (expire=0 OR expire>' . time() . ') ORDER BY expire DESC';
 			$command = $this->getDbConnection()->createCommand($sql);
 			return unserialize($command->queryScalar());
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->initializeCache(true);
 			return unserialize($command->queryScalar());
@@ -512,16 +507,14 @@ 
 			$command->bindValue(':value', serialize($value), \PDO::PARAM_LOB);
 			$command->execute();
 			return true;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 				return false;
 			}
@@ -543,8 +536,7 @@ 
 			$command->bindValue(':key', $key, \PDO::PARAM_STR);
 			$command->execute();
 			return true;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -563,16 +555,14 @@ 
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 				return false;
 			}

framework/Caching/TMemCache.php

Braces +1 added lines, -2 removed lines

@@ -168,8 +168,7 @@
 					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false)
 					throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
 			}
-		}
-		else
+		} else
 		{
 			Prado::trace('Adding server ' . $this->_host, '\Prado\Caching\TMemCache');
 			if($this->_cache->addServer($this->_host, $this->_port) === false)

framework/Caching/TDirectoryCacheDependency.php

Braces +1 added lines, -2 removed lines

@@ -166,8 +166,7 @@
 			{
 				if(($this->_recursiveLevel < 0 || $level < $this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps = array_merge($this->generateTimestamps($path, $level + 1));
-			}
-			elseif($this->validateFile($path))
+			} elseif($this->validateFile($path))
 				$timestamps[$path] = filemtime($path);
 		}
 		closedir($dir);

framework/PradoBase.php

Braces +8 added lines, -16 removed lines

@@ -160,8 +160,7 @@ 
 		{
 			$am = self::$_application->getAssetManager();
 			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
-		}
-		else
+		} 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>';
 	}
@@ -213,8 +212,7 @@ 
 		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
 			$errorHandler->handleError(null, $exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -328,8 +326,7 @@ 
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 
@@ -383,8 +380,7 @@ 
 			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)))
@@ -394,8 +390,7 @@ 
 						include_once($path);
 						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))
 							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
@@ -471,8 +466,7 @@ 
 				self::$_aliases[$alias] = $rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
@@ -517,8 +511,7 @@ 
 							echo "'" . substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					elseif (is_int($item) || is_float($item))
+					} elseif (is_int($item) || is_float($item))
 						echo $item;
 					elseif (is_object($item))
 						echo get_class($item);
@@ -613,8 +606,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level = TLogger::DEBUG;
-		}
-		else
+		} else
 			$level = TLogger::INFO;
 		self::log($msg, $level, $category, $ctl);
 	}

framework/Exceptions/TErrorHandler.php

Braces +5 added lines, -10 removed lines

@@ -235,8 +235,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');
@@ -267,15 +266,13 @@ 
 			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();
@@ -435,8 +432,7 @@ 
 			{
 				$line = htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 				$source .= "<div class=\"error\">" . $line . "</div>";
-			}
-			else
+			} else
 				$source .= htmlspecialchars(sprintf("%04d: %s", $i + 1, str_replace("\t", '    ', $lines[$i])));
 		}
 		return $source;
@@ -456,8 +452,7 @@ 
 			$class = $matches[0];
 			try {
 				$function = new \ReflectionClass($class);
-			}
-			catch (\Exception $e) {
+			} catch (\Exception $e) {
 				return null;
 			}
 			$classname = $function->getNamespaceName();

framework/TApplicationConfiguration.php

Braces +7 added lines, -14 removed lines

@@ -70,8 +70,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -218,8 +217,7 @@ 
 						if(isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined', $id);
 						$this->_aliases[$id] = $p;
-					}
-					else
+					} else
 						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty = false;
 					break;
@@ -286,8 +284,7 @@ 
 				else
 					$this->_modules[$id] = [$type,$properties->toArray(),$element];
 				$this->_empty = false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
@@ -331,8 +328,7 @@ 
 				$element->setParent(null);
 				$this->_services[$id] = [$type,$properties->toArray(),$element];
 				$this->_empty = false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
@@ -356,8 +352,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = [$type,$properties];
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -384,12 +379,10 @@ 
 						$this->_parameters[$id] = $element;
 					else
 						$this->_parameters[$id] = $value;
-				}
-				else
+				} else
 					$this->_parameters[$id] = [$type,$properties->toArray()];
 				$this->_empty = false;
-			}
-			else
+			} else
 				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}

framework/Security/TAuthorizationRuleCollection.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 					return ($decision > 0);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Security/TUserManager.php

Braces +3 added lines, -6 removed lines

@@ -117,8 +117,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -314,8 +313,7 @@ 
 			$user = new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username = strtolower($username);
 			if(isset($this->_users[$username]))
@@ -326,8 +324,7 @@ 
 				if(isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
-			}
-			else
+			} else
 				return null;
 		}
 	}

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');
 	}