pradosoft / prado

framework/Data/ActiveRecord/TActiveRecordGateway.php

Braces +2 added lines, -4 removed lines

@@ -79,16 +79,14 @@
 				throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record), self::TABLE_CONST);
 			return $value;
-		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		} elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record), self::TABLE_METHOD);
 			return $value;
-		}
-		else
+		} else
 			return strtolower(get_class($record));
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
 					get_class($record), self::TABLE_CONST);
 			return $value;
 		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		elseif($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
 			if(empty($value))
@@ -361,7 +361,7 @@ 
 			else
 				$values[$name] = $value;
 		}
-		return [$values,$primary];
+		return [$values, $primary];
 	}
 
 	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo = false)

framework/Data/SqlMap/DataMapper/TPropertyAccess.php

Braces +6 added lines, -12 removed lines

@@ -65,8 +65,7 @@ 
 					$object = $object[$prop];
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
-			}
-			elseif(is_object($object))
+			} elseif(is_object($object))
 			{
 				$getter = 'get' . $prop;
 				if(method_exists($object, $getter) && is_callable([$object, $getter]))
@@ -77,8 +76,7 @@ 
 					$object = $object->{$prop};
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
-			}
-			else
+			} else
 				throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 		}
 		return $object;
@@ -102,8 +100,7 @@ 
 					$object = $object[$prop];
 				else
 					return false;
-			}
-			elseif(is_object($object))
+			} elseif(is_object($object))
 			{
 				$getter = 'get' . $prop;
 				if(method_exists($object, $getter) && is_callable([$object, $getter]))
@@ -114,8 +111,7 @@ 
 					$object = $object->{$prop};
 				else
 					return false;
-			}
-			else
+			} else
 				return false;
 		}
 		return true;
@@ -140,16 +136,14 @@ 
 		if(is_array($object) || $object instanceof \ArrayAccess)
 		{
 			$object[$prop] = $value;
-		}
-		elseif(is_object($object))
+		} elseif(is_object($object))
 		{
 			$setter = 'set' . $prop;
 			if (method_exists($object, $setter) && is_callable([$object, $setter]))
 				$object->{$setter}($value);
 			else
 				$object->{$prop} = $value;
-		}
-		else
+		} else
 			throw new TInvalidPropertyException('sqlmap_invalid_property_type', $path);
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 		elseif(is_object($object))
 		{
 			$setter = 'set' . $prop;
-			if (method_exists($object, $setter) && is_callable([$object, $setter]))
+			if(method_exists($object, $setter) && is_callable([$object, $setter]))
 				$object->{$setter}($value);
 			else
 				$object->{$prop} = $value;

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

Spacing +9 added lines, -9 removed lines

@@ -206,7 +206,7 @@ 
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -249,7 +249,7 @@ 
 
 		$key = 'TDbCache:' . $this->_cacheTable . ':flushed';
 		$now = time();
-		$next = $interval + (integer)$this -> getApplication() -> getGlobalState($key, 0);
+		$next = $interval + (integer) $this -> getApplication() -> getGlobalState($key, 0);
 
 		if($force || $next <= $now)
 		{
@@ -469,7 +469,7 @@ 
 			$command = $this->getDbConnection()->createCommand($sql);
 			return unserialize($command->queryScalar());
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			$this->initializeCache(true);
 			return unserialize($command->queryScalar());
@@ -503,7 +503,7 @@ 
 	protected function addValue($key, $value, $expire)
 	{
 		if(!$this->_cacheInitialized) $this->initializeCache();
-		$expire = ($expire <= 0)?0:time() + $expire;
+		$expire = ($expire <= 0) ? 0 : time() + $expire;
 		$sql = "INSERT INTO {$this->_cacheTable} (itemkey,value,expire) VALUES(:key,:value,$expire)";
 		try
 		{
@@ -513,7 +513,7 @@ 
 			$command->execute();
 			return true;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			try
 			{
@@ -521,7 +521,7 @@ 
 				$command->execute();
 				return true;
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				return false;
 			}
@@ -544,7 +544,7 @@ 
 			$command->execute();
 			return true;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -564,7 +564,7 @@ 
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			try
 			{
@@ -572,7 +572,7 @@ 
 				$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)

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
 			foreach($this->_servers as $server)
 			{
 				Prado::trace('Adding server ' . $server['Host'] . ' from serverlist', '\Prado\Caching\TMemCache');
-				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
+				if($this->_cache->addServer($server['Host'], $server['Port'], $server['Persistent'],
 					$server['Weight'], $server['Timeout'], $server['RetryInterval']) === false)
 					throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
 			}
@@ -199,7 +199,7 @@ 
 					throw new TConfigurationException('memcache_serverport_required');
 				if(!is_numeric($port))
 					throw new TConfigurationException('memcache_serverport_invalid');
-				$server = ['Host' => $host,'Port' => $port,'Weight' => 1,'Timeout' => 1800,'RetryInterval' => 15,'Persistent' => true];
+				$server = ['Host' => $host, 'Port' => $port, 'Weight' => 1, 'Timeout' => 1800, 'RetryInterval' => 15, 'Persistent' => true];
 				$checks = [
 					'Weight' => 'memcache_serverweight_invalid',
 					'Timeout' => 'memcache_servertimeout_invalid',

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/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();

Spacing +7 added lines, -7 removed lines

@@ -195,7 +195,7 @@ 
 
 		$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;
 
@@ -262,7 +262,7 @@ 
 		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 === '')
 				$fileName = '---embedded template---';
@@ -425,11 +425,11 @@ 
 
 	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)
 			{
@@ -443,7 +443,7 @@ 
 	}
 
 	private function addLink($message) {
-		if (null !== ($class = $this->getErrorClassNameSpace($message))) {
+		if(null !== ($class = $this->getErrorClassNameSpace($message))) {
 			return str_replace($class['name'], '<a href="' . $class['url'] . '" target="_blank">' . $class['name'] . '</a>', $message);
 		}
 		return $message;
@@ -452,7 +452,7 @@ 
 	private function getErrorClassNameSpace($message) {
 		$matches = [];
 		preg_match('/\b(T[A-Z]\w+)\b/', $message, $matches);
-		if (is_array($matches) && count($matches) > 0) {
+		if(is_array($matches) && count($matches) > 0) {
 			$class = $matches[0];
 			try {
 				$function = new \ReflectionClass($class);

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

Spacing +8 added lines, -8 removed lines

@@ -259,7 +259,7 @@ 
 				unset($module['properties']);
 			}
 			$properties['id'] = $id;
-			$this->_modules[$id] = [$type,$properties,$module];
+			$this->_modules[$id] = [$type, $properties, $module];
 			$this->_empty = false;
 		}
 	}
@@ -282,9 +282,9 @@ 
 					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
 				if($id === null)
-					$this->_modules[] = [$type,$properties->toArray(),$element];
+					$this->_modules[] = [$type, $properties->toArray(), $element];
 				else
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
+					$this->_modules[$id] = [$type, $properties->toArray(), $element];
 				$this->_empty = false;
 			}
 			else
@@ -307,7 +307,7 @@ 
 			$properties = isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
 			$properties['id'] = $id;
-			$this->_services[$id] = [$type,$properties,$service];
+			$this->_services[$id] = [$type, $properties, $service];
 			$this->_empty = false;
 		}
 	}
@@ -329,7 +329,7 @@ 
 				if(($type = $properties->remove('class')) === null)
 					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id] = [$type,$properties->toArray(),$element];
+				$this->_services[$id] = [$type, $properties->toArray(), $element];
 				$this->_empty = false;
 			}
 			else
@@ -354,7 +354,7 @@ 
 					unset($parameter['class']);
 					$properties = isset($service['properties']) ? $service['properties'] : [];
 					$properties['id'] = $id;
-					$this->_parameters[$id] = [$type,$properties];
+					$this->_parameters[$id] = [$type, $properties];
 				}
 			}
 			else
@@ -386,7 +386,7 @@ 
 						$this->_parameters[$id] = $value;
 				}
 				else
-					$this->_parameters[$id] = [$type,$properties->toArray()];
+					$this->_parameters[$id] = [$type, $properties->toArray()];
 				$this->_empty = false;
 			}
 			else
@@ -403,7 +403,7 @@ 
 	{
 		foreach($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
+			$when = isset($include['when']) ?true:false;
 			if(!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
 			$filePath = $include['file'];

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

Spacing +6 added lines, -6 removed lines

@@ -150,10 +150,10 @@ 
 		{
 			foreach($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
+				$name = trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password = isset($user['password']) ? $user['password'] : '';
 				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
+				$roles = isset($user['roles']) ? $user['roles'] : '';
 				if($roles !== '')
 				{
 					foreach(explode(',', $roles) as $role)
@@ -168,8 +168,8 @@ 
 		{
 			foreach($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
+				$name = isset($role['name']) ? $role['name'] : '';
+				$users = isset($role['users']) ? $role['users'] : '';
 				foreach(explode(',', $users) as $user)
 				{
 					if(($user = trim($user)) !== '')
@@ -364,7 +364,7 @@ 
 		$username = strtolower($user->getName());
 		if(isset($this->_users[$username]))
 		{
-			$data = [$username,md5($username . $this->_users[$username])];
+			$data = [$username, md5($username . $this->_users[$username])];
 			$cookie->setValue(serialize($data));
 		}
 	}