From: Roland Häder <roland@mxchange.org>
Date: Mon, 28 Feb 2011 00:09:47 +0000 (+0000)
Subject: 'public static final' is correct
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a3fa89c7cbc54491fc74f13db0927d14acf550c8;p=core.git

'public static final' is correct
---

diff --git a/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php b/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php
index 46e8245b..1f96fa80 100644
--- a/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php
+++ b/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php
@@ -37,7 +37,7 @@ class LoginAfterRegistrationAction extends BaseAction implements PerformableActi
 	 *
 	 * @return	$actionInstance		An instance of this action class
 	 */
-	public final static function createLoginAfterRegistrationAction () {
+	public static final function createLoginAfterRegistrationAction () {
 		// Get a new instance
 		$actionInstance = new LoginAfterRegistrationAction();
 
diff --git a/inc/classes/main/actions/web/class_WebLoginProfileAction.php b/inc/classes/main/actions/web/class_WebLoginProfileAction.php
index b528c301..2bda7fae 100644
--- a/inc/classes/main/actions/web/class_WebLoginProfileAction.php
+++ b/inc/classes/main/actions/web/class_WebLoginProfileAction.php
@@ -38,7 +38,7 @@ class WebLoginProfileAction extends BaseAction implements Commandable, Registera
 	 * @param	$resolverInstance	An instance of an action resolver
 	 * @return	$actionInstance		An instance of this action class
 	 */
-	public final static function createWebLoginProfileAction (ActionResolver $resolverInstance) {
+	public static final function createWebLoginProfileAction (ActionResolver $resolverInstance) {
 		// Get a new instance
 		$actionInstance = new WebLoginProfileAction();
 
diff --git a/inc/classes/main/auth/class_CookieAuth.php b/inc/classes/main/auth/class_CookieAuth.php
index 0d8ed6bf..edaed685 100644
--- a/inc/classes/main/auth/class_CookieAuth.php
+++ b/inc/classes/main/auth/class_CookieAuth.php
@@ -38,7 +38,7 @@ class CookieAuth extends BaseFrameworkSystem implements Authorizeable, Registera
 	 * @param	$responseInstance	An instance of a Responseable class
 	 * @return	$loginInstance		An instance of this login class
 	 */
-	public final static function createCookieAuth (Responseable $responseInstance) {
+	public static final function createCookieAuth (Responseable $responseInstance) {
 		// Get a new instance
 		$loginInstance = new CookieAuth();
 
diff --git a/inc/classes/main/cache/class_MemoryCache.php b/inc/classes/main/cache/class_MemoryCache.php
index e681eca9..6555c495 100644
--- a/inc/classes/main/cache/class_MemoryCache.php
+++ b/inc/classes/main/cache/class_MemoryCache.php
@@ -42,7 +42,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
 	 *
 	 * @return	$cacheInstance	An instance of this cache class
 	 */
-	public final static function createMemoryCache () {
+	public static final function createMemoryCache () {
 		// Get a new instance
 		$cacheInstance = new MemoryCache();
 
diff --git a/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php b/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php
index 61554f83..8e245d93 100644
--- a/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php
+++ b/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php
@@ -38,7 +38,7 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createImageCodeCaptchaCommand (CommandResolver $resolverInstance) {
+	public static final function createImageCodeCaptchaCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new ImageCodeCaptchaCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebConfirmCommand.php b/inc/classes/main/commands/web/class_WebConfirmCommand.php
index 5476212e..d8824576 100644
--- a/inc/classes/main/commands/web/class_WebConfirmCommand.php
+++ b/inc/classes/main/commands/web/class_WebConfirmCommand.php
@@ -38,7 +38,7 @@ class WebConfirmCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebConfirmCommand (CommandResolver $resolverInstance) {
+	public static final function createWebConfirmCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebConfirmCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebDoFormCommand.php b/inc/classes/main/commands/web/class_WebDoFormCommand.php
index d364081f..e5cf59db 100644
--- a/inc/classes/main/commands/web/class_WebDoFormCommand.php
+++ b/inc/classes/main/commands/web/class_WebDoFormCommand.php
@@ -38,7 +38,7 @@ class WebDoFormCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebDoFormCommand (CommandResolver $resolverInstance) {
+	public static final function createWebDoFormCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebDoFormCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebHomeCommand.php b/inc/classes/main/commands/web/class_WebHomeCommand.php
index 1853da05..6bc3ff90 100644
--- a/inc/classes/main/commands/web/class_WebHomeCommand.php
+++ b/inc/classes/main/commands/web/class_WebHomeCommand.php
@@ -38,7 +38,7 @@ class WebHomeCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebHomeCommand (CommandResolver $resolverInstance) {
+	public static final function createWebHomeCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebHomeCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
index 2c82a34c..dad825a8 100644
--- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@ -43,7 +43,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebLoginAreaCommand (CommandResolver $resolverInstance) {
+	public static final function createWebLoginAreaCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebLoginAreaCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebLoginCommand.php b/inc/classes/main/commands/web/class_WebLoginCommand.php
index ffecd5ab..f0928c58 100644
--- a/inc/classes/main/commands/web/class_WebLoginCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginCommand.php
@@ -38,7 +38,7 @@ class WebLoginCommand extends BaseCommand implements Commandable, Registerable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebLoginCommand (CommandResolver $resolverInstance) {
+	public static final function createWebLoginCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebLoginCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebLoginFailedCommand.php b/inc/classes/main/commands/web/class_WebLoginFailedCommand.php
index 7d1fe822..9c31891d 100644
--- a/inc/classes/main/commands/web/class_WebLoginFailedCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginFailedCommand.php
@@ -38,7 +38,7 @@ class WebLoginFailedCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebLoginFailedCommand (CommandResolver $resolverInstance) {
+	public static final function createWebLoginFailedCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebLoginFailedCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebLogoutCommand.php b/inc/classes/main/commands/web/class_WebLogoutCommand.php
index dbd4a188..cfb0acc0 100644
--- a/inc/classes/main/commands/web/class_WebLogoutCommand.php
+++ b/inc/classes/main/commands/web/class_WebLogoutCommand.php
@@ -38,7 +38,7 @@ class WebLogoutCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebLogoutCommand (CommandResolver $resolverInstance) {
+	public static final function createWebLogoutCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebLogoutCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php b/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php
index 8351e74a..a59eaaa2 100644
--- a/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php
+++ b/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php
@@ -38,7 +38,7 @@ class WebLogoutDoneCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebLogoutDoneCommand (CommandResolver $resolverInstance) {
+	public static final function createWebLogoutDoneCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebLogoutDoneCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebProblemCommand.php b/inc/classes/main/commands/web/class_WebProblemCommand.php
index 7fab1c46..a43d6297 100644
--- a/inc/classes/main/commands/web/class_WebProblemCommand.php
+++ b/inc/classes/main/commands/web/class_WebProblemCommand.php
@@ -38,7 +38,7 @@ class WebProblemCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebProblemCommand (CommandResolver $resolverInstance) {
+	public static final function createWebProblemCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebProblemCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebRegisterCommand.php b/inc/classes/main/commands/web/class_WebRegisterCommand.php
index cb55e9ff..986ca0e4 100644
--- a/inc/classes/main/commands/web/class_WebRegisterCommand.php
+++ b/inc/classes/main/commands/web/class_WebRegisterCommand.php
@@ -38,7 +38,7 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebRegisterCommand (CommandResolver $resolverInstance) {
+	public static final function createWebRegisterCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebRegisterCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebResendLinkCommand.php b/inc/classes/main/commands/web/class_WebResendLinkCommand.php
index 25b0bd87..453b2ef1 100644
--- a/inc/classes/main/commands/web/class_WebResendLinkCommand.php
+++ b/inc/classes/main/commands/web/class_WebResendLinkCommand.php
@@ -38,7 +38,7 @@ class WebResendLinkCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebResendLinkCommand (CommandResolver $resolverInstance) {
+	public static final function createWebResendLinkCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebResendLinkCommand();
 
diff --git a/inc/classes/main/commands/web/class_WebStatusCommand.php b/inc/classes/main/commands/web/class_WebStatusCommand.php
index 646b4613..e9c6d9ca 100644
--- a/inc/classes/main/commands/web/class_WebStatusCommand.php
+++ b/inc/classes/main/commands/web/class_WebStatusCommand.php
@@ -38,7 +38,7 @@ class WebStatusCommand extends BaseCommand implements Commandable {
 	 * @param	$resolverInstance	An instance of a command resolver class
 	 * @return	$commandInstance	An instance a prepared command class
 	 */
-	public final static function createWebStatusCommand (CommandResolver $resolverInstance) {
+	public static final function createWebStatusCommand (CommandResolver $resolverInstance) {
 		// Get new instance
 		$commandInstance = new WebStatusCommand();
 
diff --git a/inc/classes/main/compressor/class_Bzip2Compressor.php b/inc/classes/main/compressor/class_Bzip2Compressor.php
index 69b0196d..6ea71d32 100644
--- a/inc/classes/main/compressor/class_Bzip2Compressor.php
+++ b/inc/classes/main/compressor/class_Bzip2Compressor.php
@@ -37,7 +37,7 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor {
 	 *
 	 * @return	$cInstance	An instance of this class
 	 */
-	public final static function createBzip2Compressor () {
+	public static final function createBzip2Compressor () {
 		// Get new instance
 		if ((function_exists('bzcompress')) && (function_exists('bzdecompress'))) {
 			// Compressor can maybe be used
diff --git a/inc/classes/main/compressor/class_GzipCompressor.php b/inc/classes/main/compressor/class_GzipCompressor.php
index 85df0d98..34bc01f1 100644
--- a/inc/classes/main/compressor/class_GzipCompressor.php
+++ b/inc/classes/main/compressor/class_GzipCompressor.php
@@ -37,7 +37,7 @@ class GzipCompressor extends BaseFrameworkSystem implements Compressor {
 	 *
 	 * @return	$cInstance	An instance of this class
 	 */
-	public final static function createGzipCompressor () {
+	public static final function createGzipCompressor () {
 		// Get new instance
 		if ((function_exists('gzcompress')) && (function_exists('gzuncompress'))) {
 			// Compressor can maybe be used
diff --git a/inc/classes/main/compressor/class_NullCompressor.php b/inc/classes/main/compressor/class_NullCompressor.php
index 47b34236..9a078c80 100644
--- a/inc/classes/main/compressor/class_NullCompressor.php
+++ b/inc/classes/main/compressor/class_NullCompressor.php
@@ -37,7 +37,7 @@ class NullCompressor extends BaseFrameworkSystem implements Compressor {
 	 *
 	 * @return	$cInstance	An instance of this class
 	 */
-	public final static function createNullCompressor () {
+	public static final function createNullCompressor () {
 		// Get new instance
 		$cInstance = new NullCompressor();
 
diff --git a/inc/classes/main/container/socket/class_SocketContainer.php b/inc/classes/main/container/socket/class_SocketContainer.php
index cfa66f0d..72e83acb 100644
--- a/inc/classes/main/container/socket/class_SocketContainer.php
+++ b/inc/classes/main/container/socket/class_SocketContainer.php
@@ -40,7 +40,7 @@ class SocketContainer extends BaseContainer implements Registerable {
 	 * @param	$packageData		Raw package data
 	 * @return	$containerInstance	An instance of this Container class
 	 */
-	public final static function createSocketContainer ($socketResource, ProtocolHandler $protocolInstance, array $packageData) {
+	public static final function createSocketContainer ($socketResource, ProtocolHandler $protocolInstance, array $packageData) {
 		// Get a new instance
 		$containerInstance = new SocketContainer();
 
diff --git a/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php b/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php
index 0d25a278..7ef6bfa0 100644
--- a/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php
+++ b/inc/classes/main/controller/captcha/class_ImageCodeCaptchaController.php
@@ -38,7 +38,7 @@ class ImageCodeCaptchaController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createImageCodeCaptchaController (CommandResolver $resolverInstance) {
+	public static final function createImageCodeCaptchaController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new ImageCodeCaptchaController();
 
diff --git a/inc/classes/main/controller/console/class_ConsoleDefaultController.php b/inc/classes/main/controller/console/class_ConsoleDefaultController.php
index 7385f9b0..4818727e 100644
--- a/inc/classes/main/controller/console/class_ConsoleDefaultController.php
+++ b/inc/classes/main/controller/console/class_ConsoleDefaultController.php
@@ -39,7 +39,7 @@ class ConsoleDefaultController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createConsoleDefaultController (CommandResolver $resolverInstance) {
+	public static final function createConsoleDefaultController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new ConsoleDefaultController();
 
diff --git a/inc/classes/main/controller/console/class_ConsoleDefaultNewsController.php b/inc/classes/main/controller/console/class_ConsoleDefaultNewsController.php
index 5dd38c54..fea4fe7c 100644
--- a/inc/classes/main/controller/console/class_ConsoleDefaultNewsController.php
+++ b/inc/classes/main/controller/console/class_ConsoleDefaultNewsController.php
@@ -38,7 +38,7 @@ class ConsoleDefaultNewsController extends BaseController implements Controller
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createConsoleDefaultNewsController (CommandResolver $resolverInstance) {
+	public static final function createConsoleDefaultNewsController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new ConsoleDefaultNewsController();
 
diff --git a/inc/classes/main/controller/form/class_WebDoFormController.php b/inc/classes/main/controller/form/class_WebDoFormController.php
index 752f1cb3..2bb3873f 100644
--- a/inc/classes/main/controller/form/class_WebDoFormController.php
+++ b/inc/classes/main/controller/form/class_WebDoFormController.php
@@ -38,7 +38,7 @@ class WebDoFormController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createWebDoFormController (CommandResolver $resolverInstance) {
+	public static final function createWebDoFormController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebDoFormController();
 
diff --git a/inc/classes/main/controller/image/class_ImageDefaultController.php b/inc/classes/main/controller/image/class_ImageDefaultController.php
index fdb95239..444c903e 100644
--- a/inc/classes/main/controller/image/class_ImageDefaultController.php
+++ b/inc/classes/main/controller/image/class_ImageDefaultController.php
@@ -38,7 +38,7 @@ class ImageDefaultController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createImageDefaultController (CommandResolver $resolverInstance) {
+	public static final function createImageDefaultController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new ImageDefaultController();
 
diff --git a/inc/classes/main/controller/login/class_WebLoginAreaController.php b/inc/classes/main/controller/login/class_WebLoginAreaController.php
index 4d4d4669..f4dcf3ce 100644
--- a/inc/classes/main/controller/login/class_WebLoginAreaController.php
+++ b/inc/classes/main/controller/login/class_WebLoginAreaController.php
@@ -39,7 +39,7 @@ class WebLoginAreaController extends BaseController implements Controller {
 	 * @return	$controllerInstance		A prepared instance of this class
 	 * @todo	Add some morer filters to this controller
 	 */
-	public final static function createWebLoginAreaController (CommandResolver $resolverInstance) {
+	public static final function createWebLoginAreaController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebLoginAreaController();
 
diff --git a/inc/classes/main/controller/web/class_WebConfirmController.php b/inc/classes/main/controller/web/class_WebConfirmController.php
index b7a05750..7bac709a 100644
--- a/inc/classes/main/controller/web/class_WebConfirmController.php
+++ b/inc/classes/main/controller/web/class_WebConfirmController.php
@@ -39,7 +39,7 @@ class WebConfirmController extends BaseController implements Controller {
 	 * @return	$controllerInstance		A prepared instance of this class
 	 * @todo	Add some filters to this controller
 	 */
-	public final static function createWebConfirmController (CommandResolver $resolverInstance) {
+	public static final function createWebConfirmController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebConfirmController();
 
diff --git a/inc/classes/main/controller/web/class_WebDefaultController.php b/inc/classes/main/controller/web/class_WebDefaultController.php
index fb7a594a..91cd6af3 100644
--- a/inc/classes/main/controller/web/class_WebDefaultController.php
+++ b/inc/classes/main/controller/web/class_WebDefaultController.php
@@ -39,7 +39,7 @@ class WebDefaultController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createWebDefaultController (CommandResolver $resolverInstance) {
+	public static final function createWebDefaultController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebDefaultController();
 
diff --git a/inc/classes/main/controller/web/class_WebDefaultNewsController.php b/inc/classes/main/controller/web/class_WebDefaultNewsController.php
index 094fbe9e..613850ee 100644
--- a/inc/classes/main/controller/web/class_WebDefaultNewsController.php
+++ b/inc/classes/main/controller/web/class_WebDefaultNewsController.php
@@ -38,7 +38,7 @@ class WebDefaultNewsController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createWebDefaultNewsController (CommandResolver $resolverInstance) {
+	public static final function createWebDefaultNewsController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebDefaultNewsController();
 
diff --git a/inc/classes/main/controller/web/class_WebLoginController.php b/inc/classes/main/controller/web/class_WebLoginController.php
index a88c5d81..1e01b6b7 100644
--- a/inc/classes/main/controller/web/class_WebLoginController.php
+++ b/inc/classes/main/controller/web/class_WebLoginController.php
@@ -40,7 +40,7 @@ class WebLoginController extends BaseController implements Controller {
 	 * @return	$controllerInstance		A prepared instance of this class
 	 * @todo	Add some filters to this controller
 	 */
-	public final static function createWebLoginController (CommandResolver $resolverInstance) {
+	public static final function createWebLoginController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebLoginController();
 
diff --git a/inc/classes/main/controller/web/class_WebLoginFailedController.php b/inc/classes/main/controller/web/class_WebLoginFailedController.php
index 543e5e67..9c8f58ce 100644
--- a/inc/classes/main/controller/web/class_WebLoginFailedController.php
+++ b/inc/classes/main/controller/web/class_WebLoginFailedController.php
@@ -38,7 +38,7 @@ class WebLoginFailedController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createWebLoginFailedController (CommandResolver $resolverInstance) {
+	public static final function createWebLoginFailedController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebLoginFailedController();
 
diff --git a/inc/classes/main/controller/web/class_WebLogoutController.php b/inc/classes/main/controller/web/class_WebLogoutController.php
index 0342a25a..897e3652 100644
--- a/inc/classes/main/controller/web/class_WebLogoutController.php
+++ b/inc/classes/main/controller/web/class_WebLogoutController.php
@@ -39,7 +39,7 @@ class WebLogoutController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createWebLogoutController (CommandResolver $resolverInstance) {
+	public static final function createWebLogoutController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebLogoutController();
 
diff --git a/inc/classes/main/controller/web/class_WebLogoutDoneController.php b/inc/classes/main/controller/web/class_WebLogoutDoneController.php
index c6c0410c..b294168f 100644
--- a/inc/classes/main/controller/web/class_WebLogoutDoneController.php
+++ b/inc/classes/main/controller/web/class_WebLogoutDoneController.php
@@ -39,7 +39,7 @@ class WebLogoutDoneController extends BaseController implements Controller {
 	 * @return	$controllerInstance		A prepared instance of this class
 	 * @todo	Add some filters to this controller
 	 */
-	public final static function createWebLogoutDoneController (CommandResolver $resolverInstance) {
+	public static final function createWebLogoutDoneController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebLogoutDoneController();
 
diff --git a/inc/classes/main/controller/web/class_WebProblemController.php b/inc/classes/main/controller/web/class_WebProblemController.php
index 0a4ed5f8..fe573a3e 100644
--- a/inc/classes/main/controller/web/class_WebProblemController.php
+++ b/inc/classes/main/controller/web/class_WebProblemController.php
@@ -39,7 +39,7 @@ class WebProblemController extends BaseController implements Controller {
 	 * @return	$controllerInstance		A prepared instance of this class
 	 * @todo	Add some filters to this controller
 	 */
-	public final static function createWebProblemController (CommandResolver $resolverInstance) {
+	public static final function createWebProblemController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebProblemController();
 
diff --git a/inc/classes/main/controller/web/class_WebRegisterController.php b/inc/classes/main/controller/web/class_WebRegisterController.php
index 2367ff1e..23c9ecce 100644
--- a/inc/classes/main/controller/web/class_WebRegisterController.php
+++ b/inc/classes/main/controller/web/class_WebRegisterController.php
@@ -39,7 +39,7 @@ class WebRegisterController extends BaseController implements Controller {
 	 * @return	$controllerInstance		A prepared instance of this class
 	 * @todo	Add some filters to this controller
 	 */
-	public final static function createWebRegisterController (CommandResolver $resolverInstance) {
+	public static final function createWebRegisterController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebRegisterController();
 
diff --git a/inc/classes/main/controller/web/class_WebStatusController.php b/inc/classes/main/controller/web/class_WebStatusController.php
index 154c1052..0b463d0a 100644
--- a/inc/classes/main/controller/web/class_WebStatusController.php
+++ b/inc/classes/main/controller/web/class_WebStatusController.php
@@ -39,7 +39,7 @@ class WebStatusController extends BaseController implements Controller {
 	 * @param	$resolverInstance		An instance of a command resolver class
 	 * @return	$controllerInstance		A prepared instance of this class
 	 */
-	public final static function createWebStatusController (CommandResolver $resolverInstance) {
+	public static final function createWebStatusController (CommandResolver $resolverInstance) {
 		// Create the instance
 		$controllerInstance = new WebStatusController();
 
diff --git a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
index 8ae131df..abf6c9a3 100644
--- a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
+++ b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
@@ -59,7 +59,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
 	 * @param	$tableName			Name of the table
 	 * @return	$criteriaInstance	An instance of this criteria
 	 */
-	public final static function createDataSetCriteria ($tableName) {
+	public static final function createDataSetCriteria ($tableName) {
 		// Get a new instance
 		$criteriaInstance = new DataSetCriteria();
 
diff --git a/inc/classes/main/criteria/search/class_SearchCriteria.php b/inc/classes/main/criteria/search/class_SearchCriteria.php
index c6a955a8..e921ab06 100644
--- a/inc/classes/main/criteria/search/class_SearchCriteria.php
+++ b/inc/classes/main/criteria/search/class_SearchCriteria.php
@@ -54,7 +54,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
 	 *
 	 * @return	$criteriaInstance	An instance of this criteria
 	 */
-	public final static function createSearchCriteria () {
+	public static final function createSearchCriteria () {
 		// Get a new instance
 		$criteriaInstance = new SearchCriteria();
 
diff --git a/inc/classes/main/criteria/update/class_UpdateCriteria.php b/inc/classes/main/criteria/update/class_UpdateCriteria.php
index c76048b6..958d045c 100644
--- a/inc/classes/main/criteria/update/class_UpdateCriteria.php
+++ b/inc/classes/main/criteria/update/class_UpdateCriteria.php
@@ -54,7 +54,7 @@ class UpdateCriteria extends BaseCriteria implements LocalUpdateCriteria {
 	 *
 	 * @return	$criteriaInstance	An instance of this criteria
 	 */
-	public final static function createUpdateCriteria () {
+	public static final function createUpdateCriteria () {
 		// Get a new instance
 		$criteriaInstance = new UpdateCriteria();
 
diff --git a/inc/classes/main/crypto/class_CryptoHelper.php b/inc/classes/main/crypto/class_CryptoHelper.php
index 95e31175..770224cb 100644
--- a/inc/classes/main/crypto/class_CryptoHelper.php
+++ b/inc/classes/main/crypto/class_CryptoHelper.php
@@ -61,7 +61,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 	 *
 	 * @return	$cryptoInstance		An instance of this crypto helper class
 	 */
-	public final static function createCryptoHelper () {
+	public static final function createCryptoHelper () {
 		// Get a new instance
 		$cryptoInstance = new CryptoHelper();
 
@@ -80,7 +80,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 	 *
 	 * @return	$selfInstance	An instance of this crypto helper class
 	 */
-	public final static function getInstance () {
+	public static final function getInstance () {
 		// Is no instance there?
 		if (is_null(self::$selfInstance)) {
 			// Then get a new one
diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index 0eb8f91b..174f4103 100644
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -97,7 +97,7 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
 	 *								should be FileIoHandler
 	 * @return	$dbInstance			An instance of LocalFileDatabase
 	 */
-	public final static function createLocalFileDatabase ($savePath, FileIoHandler $ioInstance) {
+	public static final function createLocalFileDatabase ($savePath, FileIoHandler $ioInstance) {
 		// Get an instance
 		$databaseInstance = new LocalFileDatabase();
 
diff --git a/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php b/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php
index 58a7aeeb..03e69322 100644
--- a/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php
+++ b/inc/classes/main/database/wrapper/class_NewsDatabaseWrapper.php
@@ -40,7 +40,7 @@ class NewsDatabaseWrapper extends BaseDatabaseWrapper {
 	 *
 	 * @return	$wrapperInstance	An instance of the created wrapper class
 	 */
-	public final static function createNewsDatabaseWrapper () {
+	public static final function createNewsDatabaseWrapper () {
 		// Get a new instance
 		$wrapperInstance = new NewsDatabaseWrapper();
 
diff --git a/inc/classes/main/database/wrapper/class_PaymentsDatabaseWrapper.php b/inc/classes/main/database/wrapper/class_PaymentsDatabaseWrapper.php
index 9c1a37d7..b47b046b 100644
--- a/inc/classes/main/database/wrapper/class_PaymentsDatabaseWrapper.php
+++ b/inc/classes/main/database/wrapper/class_PaymentsDatabaseWrapper.php
@@ -43,7 +43,7 @@ class PaymentsDatabaseWrapper extends BaseDatabaseWrapper {
 	 *
 	 * @return	$wrapperInstance	An instance of the created wrapper class
 	 */
-	public final static function createPaymentsDatabaseWrapper () {
+	public static final function createPaymentsDatabaseWrapper () {
 		// Get a new instance
 		$wrapperInstance = new PaymentsDatabaseWrapper();
 
diff --git a/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php b/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php
index 7f9f5910..e1a3c2d9 100644
--- a/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php
+++ b/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php
@@ -50,7 +50,7 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou
 	 *
 	 * @return	$wrapperInstance	An instance of the created wrapper class
 	 */
-	public final static function createUserDatabaseWrapper () {
+	public static final function createUserDatabaseWrapper () {
 		// Get a new instance
 		$wrapperInstance = new UserDatabaseWrapper();
 
diff --git a/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php b/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php
index 33f24dde..baec28a6 100644
--- a/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php
+++ b/inc/classes/main/database/wrapper/class_UserPointsDatabaseWrapper.php
@@ -52,7 +52,7 @@ class UserPointsDatabaseWrapper extends BaseDatabaseWrapper implements BookableP
 	 *
 	 * @return	$wrapperInstance	An instance of the created wrapper class
 	 */
-	public final static function createUserPointsDatabaseWrapper () {
+	public static final function createUserPointsDatabaseWrapper () {
 		// Get a new instance
 		$wrapperInstance = new UserPointsDatabaseWrapper();
 
diff --git a/inc/classes/main/debug/class_DebugConsoleOutput.php b/inc/classes/main/debug/class_DebugConsoleOutput.php
index 072bc63e..c4073125 100644
--- a/inc/classes/main/debug/class_DebugConsoleOutput.php
+++ b/inc/classes/main/debug/class_DebugConsoleOutput.php
@@ -37,7 +37,7 @@ class DebugConsoleOutput extends BaseFrameworkSystem implements Debugger, Output
 	 *
 	 * @return	$debugInstance	The prepared debug instance
 	 */
-	public final static function createDebugConsoleOutput () {
+	public static final function createDebugConsoleOutput () {
 		// Get a new instance
 		$debugInstance = new DebugConsoleOutput();
 
diff --git a/inc/classes/main/debug/class_DebugErrorLogOutput.php b/inc/classes/main/debug/class_DebugErrorLogOutput.php
index e8dc935b..809dc3c5 100644
--- a/inc/classes/main/debug/class_DebugErrorLogOutput.php
+++ b/inc/classes/main/debug/class_DebugErrorLogOutput.php
@@ -37,7 +37,7 @@ class DebugErrorLogOutput extends BaseFrameworkSystem implements Debugger, Outpu
 	 *
 	 * @return	$debugInstance	The prepared debug instance
 	 */
-	public final static function createDebugErrorLogOutput () {
+	public static final function createDebugErrorLogOutput () {
 		// Get a new instance
 		$debugInstance = new DebugErrorLogOutput();
 
diff --git a/inc/classes/main/debug/class_DebugWebOutput.php b/inc/classes/main/debug/class_DebugWebOutput.php
index 946c0d40..493463a1 100644
--- a/inc/classes/main/debug/class_DebugWebOutput.php
+++ b/inc/classes/main/debug/class_DebugWebOutput.php
@@ -37,7 +37,7 @@ class DebugWebOutput extends BaseFrameworkSystem implements Debugger, OutputStre
 	 *
 	 * @return	$debugInstance	The prepared debug instance
 	 */
-	public final static function createDebugWebOutput () {
+	public static final function createDebugWebOutput () {
 		// Get a new instance
 		$debugInstance = new DebugWebOutput();
 
diff --git a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php
index 2cddb8cf..8a4cf785 100644
--- a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -39,7 +39,7 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT
 	 * @param	$innerTemplateInstance	A CompileableTemplate instance
 	 * @return	$templateInstance	An instance of TemplateEngine
 	 */
-	public final static function createXmlRewriterTemplateDecorator (CompileableTemplate $innerTemplateInstance) {
+	public static final function createXmlRewriterTemplateDecorator (CompileableTemplate $innerTemplateInstance) {
 		// Get a new instance
 		$templateInstance = new XmlRewriterTemplateDecorator();
 
diff --git a/inc/classes/main/decorator/xml/class_XmlCompactorDecorator.php b/inc/classes/main/decorator/xml/class_XmlCompactorDecorator.php
index c73e4841..9ce0172c 100644
--- a/inc/classes/main/decorator/xml/class_XmlCompactorDecorator.php
+++ b/inc/classes/main/decorator/xml/class_XmlCompactorDecorator.php
@@ -38,7 +38,7 @@ class XmlCompactorDecorator extends BaseDecorator implements Parseable {
 	 * @param	$innerParserInstance	A Parseable instance
 	 * @return	$parserInstance		An instance of this parser
 	 */
-	public final static function createXmlCompactorDecorator (Parseable $innerParserInstance) {
+	public static final function createXmlCompactorDecorator (Parseable $innerParserInstance) {
 		// Get a new instance
 		$parserInstance = new XmlCompactorDecorator();
 
diff --git a/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php b/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php
index c19863ce..a26b51af 100644
--- a/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php
+++ b/inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php
@@ -40,7 +40,7 @@ class LocalPaymentDiscovery extends BaseDiscovery implements Discoverable, Regis
 	 * @param	$filterInstance		An instance of a filter
 	 * @return	$discoveryInstance	An instance of this discovery class
 	 */
-	public final static function createLocalPaymentDiscovery (Filterable $filterInstance) {
+	public static final function createLocalPaymentDiscovery (Filterable $filterInstance) {
 		// Get an instance of this class
 		$discoveryInstance = new LocalPaymentDiscovery();
 
diff --git a/inc/classes/main/factories/cache/class_CacheFactory.php b/inc/classes/main/factories/cache/class_CacheFactory.php
index 2891a17c..5a316380 100644
--- a/inc/classes/main/factories/cache/class_CacheFactory.php
+++ b/inc/classes/main/factories/cache/class_CacheFactory.php
@@ -42,7 +42,7 @@ class CacheFactory extends BaseFactory {
 	 *
 	 * @return	$selfInstance	An instance of this class
 	 */
-	public final static function getFactory () {
+	public static final function getFactory () {
 		// Is the instance null?
 		if (is_null(self::$selfInstance)) {
 			// Set a new one
diff --git a/inc/classes/main/factories/objects/class_ObjectFactory.php b/inc/classes/main/factories/objects/class_ObjectFactory.php
index e3d81a82..f84579e5 100644
--- a/inc/classes/main/factories/objects/class_ObjectFactory.php
+++ b/inc/classes/main/factories/objects/class_ObjectFactory.php
@@ -49,7 +49,7 @@ class ObjectFactory extends BaseFactory {
 	 * @throws	NoClassException	If the requested class was not found
 	 * @throws	EmptyVariableException	If a variable is empty unexpectly
 	 */
-	public final static function createObjectByName ($className, array $args=array()) {
+	public static final function createObjectByName ($className, array $args=array()) {
 		// First get an instance of this factory
 		$factoryInstance = new ObjectFactory();
 
@@ -84,7 +84,7 @@ class ObjectFactory extends BaseFactory {
 	 * @param	$args				Arguments in an indexed array
 	 * @return	$objectInstance		An instance of the requested object
 	 */
-	public final static function createObjectByConfiguredName ($configEntry, array $args=array()) {
+	public static final function createObjectByConfiguredName ($configEntry, array $args=array()) {
 		// Read the configuration entry
 		$className = FrameworkConfiguration::getInstance()->getConfigEntry($configEntry);
 
@@ -100,7 +100,7 @@ class ObjectFactory extends BaseFactory {
 	 *
 	 * @return	$total	Total amount of generated objects
 	 */
-	public final static function getTotal () {
+	public static final function getTotal () {
 		return self::$total;
 	}
 }
diff --git a/inc/classes/main/factories/web/class_WebNewsFactory.php b/inc/classes/main/factories/web/class_WebNewsFactory.php
index 806f9474..13049ee1 100644
--- a/inc/classes/main/factories/web/class_WebNewsFactory.php
+++ b/inc/classes/main/factories/web/class_WebNewsFactory.php
@@ -44,7 +44,7 @@ class WebNewsFactory extends BaseFactory {
 	 * @param	$requestInstance	An instance of a request class
 	 * @return	$factoryInstance	An instance of a WebNewsFactory class
 	 */
-	public final static function createFactoryByRequest (Requestable $requestInstance) {
+	public static final function createFactoryByRequest (Requestable $requestInstance) {
 		// Set default news reader class
 		$configEntry = 'news_reader_class';
 
diff --git a/inc/classes/main/filter/auth/class_UserAuthFilter.php b/inc/classes/main/filter/auth/class_UserAuthFilter.php
index 8b1d77af..ce1c7d65 100644
--- a/inc/classes/main/filter/auth/class_UserAuthFilter.php
+++ b/inc/classes/main/filter/auth/class_UserAuthFilter.php
@@ -45,7 +45,7 @@ class UserAuthFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserAuthFilter () {
+	public static final function createUserAuthFilter () {
 		// Get a new instance
 		$filterInstance = new UserAuthFilter();
 
diff --git a/inc/classes/main/filter/change/class_EmailChangeFilter.php b/inc/classes/main/filter/change/class_EmailChangeFilter.php
index 578dca7d..d5e2a27c 100644
--- a/inc/classes/main/filter/change/class_EmailChangeFilter.php
+++ b/inc/classes/main/filter/change/class_EmailChangeFilter.php
@@ -37,7 +37,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createEmailChangeFilter () {
+	public static final function createEmailChangeFilter () {
 		// Get a new instance
 		$filterInstance = new EmailChangeFilter();
 
diff --git a/inc/classes/main/filter/change/class_PasswordChangeFilter.php b/inc/classes/main/filter/change/class_PasswordChangeFilter.php
index eecf784e..21f177bb 100644
--- a/inc/classes/main/filter/change/class_PasswordChangeFilter.php
+++ b/inc/classes/main/filter/change/class_PasswordChangeFilter.php
@@ -38,7 +38,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable {
 	 * @param	$controllerInstance		An instance of a controller class
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createPasswordChangeFilter () {
+	public static final function createPasswordChangeFilter () {
 		// Get a new instance
 		$filterInstance = new PasswordChangeFilter();
 
diff --git a/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php b/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php
index 6d5e2aab..7a08c60a 100644
--- a/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php
+++ b/inc/classes/main/filter/checkboxes/class_RulesAcceptedFilter.php
@@ -39,7 +39,7 @@ class RulesAcceptedFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createRulesAcceptedFilter () {
+	public static final function createRulesAcceptedFilter () {
 		// Get a new instance
 		$filterInstance = new RulesAcceptedFilter();
 
diff --git a/inc/classes/main/filter/class_FilterChain.php b/inc/classes/main/filter/class_FilterChain.php
index 54e184b5..3cc0aec3 100644
--- a/inc/classes/main/filter/class_FilterChain.php
+++ b/inc/classes/main/filter/class_FilterChain.php
@@ -42,7 +42,7 @@ class FilterChain extends BaseFrameworkSystem {
 	 *
 	 * @return	$chainInstance	An instance of this class
 	 */
-	public final static function createFilterChain () {
+	public static final function createFilterChain () {
 		// Get a new instance
 		$chainInstance = new FilterChain();
 
diff --git a/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php b/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php
index 0c47850d..f9125773 100644
--- a/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php
+++ b/inc/classes/main/filter/crypto/class_CaptchaEncryptFilter.php
@@ -37,7 +37,7 @@ class CaptchaEncryptFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createCaptchaEncryptFilter () {
+	public static final function createCaptchaEncryptFilter () {
 		// Get a new instance
 		$filterInstance = new CaptchaEncryptFilter();
 
diff --git a/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php b/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php
index 58666f2d..c43b775f 100644
--- a/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php
+++ b/inc/classes/main/filter/guest/class_UserNameIsGuestFilter.php
@@ -38,7 +38,7 @@ class UserNameIsGuestFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserNameIsGuestFilter () {
+	public static final function createUserNameIsGuestFilter () {
 		// Get a new instance
 		$filterInstance = new UserNameIsGuestFilter();
 
diff --git a/inc/classes/main/filter/news/class_NewsDownloadFilter.php b/inc/classes/main/filter/news/class_NewsDownloadFilter.php
index 1f3b1f18..97b70c76 100644
--- a/inc/classes/main/filter/news/class_NewsDownloadFilter.php
+++ b/inc/classes/main/filter/news/class_NewsDownloadFilter.php
@@ -39,7 +39,7 @@ class NewsDownloadFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createNewsDownloadFilter () {
+	public static final function createNewsDownloadFilter () {
 		// Get a new instance
 		$filterInstance = new NewsDownloadFilter();
 
diff --git a/inc/classes/main/filter/news/class_NewsProcessFilter.php b/inc/classes/main/filter/news/class_NewsProcessFilter.php
index 3911f703..14bcbfc7 100644
--- a/inc/classes/main/filter/news/class_NewsProcessFilter.php
+++ b/inc/classes/main/filter/news/class_NewsProcessFilter.php
@@ -38,7 +38,7 @@ class NewsProcessFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createNewsProcessFilter () {
+	public static final function createNewsProcessFilter () {
 		// Get a new instance
 		$filterInstance = new NewsProcessFilter();
 
diff --git a/inc/classes/main/filter/null/class_NullFilter.php b/inc/classes/main/filter/null/class_NullFilter.php
index 18233a93..5ecd8476 100644
--- a/inc/classes/main/filter/null/class_NullFilter.php
+++ b/inc/classes/main/filter/null/class_NullFilter.php
@@ -38,7 +38,7 @@ class NullFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createNullFilter () {
+	public static final function createNullFilter () {
 		// Get a new instance
 		$filterInstance = new NullFilter();
 
diff --git a/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php b/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
index 4f3ef1b9..f8a3add8 100644
--- a/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
@@ -46,7 +46,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 	 * @return	$filterInstance		An instance of this filter class
 	 * @throws	NullPointerException	If the resolver is not set
 	 */
-	public final static function createPaymentDiscoveryFilter (PerformableAction $actionInstance) {
+	public static final function createPaymentDiscoveryFilter (PerformableAction $actionInstance) {
 		// Get a new instance
 		$filterInstance = new PaymentDiscoveryFilter();
 
diff --git a/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php b/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
index 9ee130f9..a6417abf 100644
--- a/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/inc/classes/main/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -37,7 +37,7 @@ class UserStatusConfimedUpdateFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserStatusConfimedUpdateFilter () {
+	public static final function createUserStatusConfimedUpdateFilter () {
 		// Get a new instance
 		$filterInstance = new UserStatusConfimedUpdateFilter();
 
diff --git a/inc/classes/main/filter/update/class_UserUpdateFilter.php b/inc/classes/main/filter/update/class_UserUpdateFilter.php
index 76efb8fe..7635c309 100644
--- a/inc/classes/main/filter/update/class_UserUpdateFilter.php
+++ b/inc/classes/main/filter/update/class_UserUpdateFilter.php
@@ -38,7 +38,7 @@ class UserUpdateFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserUpdateFilter () {
+	public static final function createUserUpdateFilter () {
 		// Get a new instance
 		$filterInstance = new UserUpdateFilter();
 
diff --git a/inc/classes/main/filter/validator/class_EmailValidatorFilter.php b/inc/classes/main/filter/validator/class_EmailValidatorFilter.php
index b5d67483..4b5c8595 100644
--- a/inc/classes/main/filter/validator/class_EmailValidatorFilter.php
+++ b/inc/classes/main/filter/validator/class_EmailValidatorFilter.php
@@ -40,7 +40,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createEmailValidatorFilter () {
+	public static final function createEmailValidatorFilter () {
 		// Get a new instance
 		$filterInstance = new EmailValidatorFilter();
 
diff --git a/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php b/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php
index 5e735f02..a3b9edd2 100644
--- a/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php
+++ b/inc/classes/main/filter/validator/class_PasswordValidatorFilter.php
@@ -38,7 +38,7 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createPasswordValidatorFilter () {
+	public static final function createPasswordValidatorFilter () {
 		// Get a new instance
 		$filterInstance = new PasswordValidatorFilter();
 
diff --git a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
index 68779ad0..703ec3b4 100644
--- a/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
+++ b/inc/classes/main/filter/validator/class_UserNameValidatorFilter.php
@@ -39,7 +39,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserNameValidatorFilter () {
+	public static final function createUserNameValidatorFilter () {
 		// Get a new instance
 		$filterInstance = new UserNameValidatorFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
index 584cfbdd..c5a74694 100644
--- a/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -38,7 +38,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createAccountPasswordVerifierFilter () {
+	public static final function createAccountPasswordVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new AccountPasswordVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
index ff66567d..6e6cdd03 100644
--- a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -37,7 +37,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createConfirmCodeVerifierFilter () {
+	public static final function createConfirmCodeVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new ConfirmCodeVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index 344c551d..76d51ff1 100644
--- a/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -37,7 +37,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createGraphicalCodeCaptchaVerifierFilter () {
+	public static final function createGraphicalCodeCaptchaVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new GraphicalCodeCaptchaVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php b/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php
index 726f9805..a8a76f44 100644
--- a/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_PasswordGuestVerifierFilter.php
@@ -38,7 +38,7 @@ class PasswordGuestVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createPasswordGuestVerifierFilter () {
+	public static final function createPasswordGuestVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new PasswordGuestVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php b/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php
index d0c71e51..ee64a766 100644
--- a/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_PasswordVerifierFilter.php
@@ -38,7 +38,7 @@ class PasswordVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createPasswordVerifierFilter () {
+	public static final function createPasswordVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new PasswordVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
index c1c70ba4..4a3a2f08 100644
--- a/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserGuestVerifierFilter.php
@@ -39,7 +39,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserGuestVerifierFilter () {
+	public static final function createUserGuestVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new UserGuestVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php
index 0ab0dfda..2e0f9743 100644
--- a/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserNameVerifierFilter.php
@@ -39,7 +39,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserNameVerifierFilter () {
+	public static final function createUserNameVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new UserNameVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
index cba77ed1..2cd8704e 100644
--- a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
@@ -37,7 +37,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance		An instance of this filter class
 	 */
-	public final static function createUserStatusVerifierFilter () {
+	public static final function createUserStatusVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new UserStatusVerifierFilter();
 
diff --git a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index a252ad0e..ed8735a5 100644
--- a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -37,7 +37,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createUserUnconfirmedVerifierFilter () {
+	public static final function createUserUnconfirmedVerifierFilter () {
 		// Get a new instance
 		$filterInstance = new UserUnconfirmedVerifierFilter();
 
diff --git a/inc/classes/main/helper/captcha/images/class_ImageHelper.php b/inc/classes/main/helper/captcha/images/class_ImageHelper.php
index 5611b11f..aabe6ff3 100644
--- a/inc/classes/main/helper/captcha/images/class_ImageHelper.php
+++ b/inc/classes/main/helper/captcha/images/class_ImageHelper.php
@@ -87,7 +87,7 @@ class ImageHelper extends BaseCaptcha implements HelpableTemplate {
 	 * @param	$imageType			Type of the image
 	 * @return	$helperInstance		A preparedf instance of this helper
 	 */
-	public final static function createImageHelper (CompileableTemplate $templateInstance, $imageType) {
+	public static final function createImageHelper (CompileableTemplate $templateInstance, $imageType) {
 		// Get new instance
 		$helperInstance = new ImageHelper();
 
diff --git a/inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php b/inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
index 85c10c4c..bb3931a3 100644
--- a/inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
+++ b/inc/classes/main/helper/captcha/web/class_GraphicalCodeCaptcha.php
@@ -49,7 +49,7 @@ class GraphicalCodeCaptcha extends BaseCaptcha implements SolveableCaptcha {
 	 * @param	$extraInstance		An extra instance, just for better hash data
 	 * @return	$captchaInstance	An instance of this captcha class
 	 */
-	public final static function createGraphicalCodeCaptcha (HelpableTemplate $helperInstance, FrameworkInterface $extraInstance = null) {
+	public static final function createGraphicalCodeCaptcha (HelpableTemplate $helperInstance, FrameworkInterface $extraInstance = null) {
 		// Get a new instance
 		$captchaInstance = new GraphicalCodeCaptcha();
 
diff --git a/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php b/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
index fd4d965d..ff1132aa 100644
--- a/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
+++ b/inc/classes/main/helper/web/blocks/class_WebBlockHelper.php
@@ -44,7 +44,7 @@ class WebBlockHelper extends BaseWebHelper implements HelpableTemplate {
 	 * @param	$blockName			Name of the block we shall generate
 	 * @return	$helperInstance		A prepared instance of this helper
 	 */
-	public final static function createWebBlockHelper (CompileableTemplate $templateInstance, $blockName) {
+	public static final function createWebBlockHelper (CompileableTemplate $templateInstance, $blockName) {
 		// Get new instance
 		$helperInstance = new WebBlockHelper();
 
diff --git a/inc/classes/main/helper/web/forms/class_WebFormHelper.php b/inc/classes/main/helper/web/forms/class_WebFormHelper.php
index 0f42948b..e968edb5 100644
--- a/inc/classes/main/helper/web/forms/class_WebFormHelper.php
+++ b/inc/classes/main/helper/web/forms/class_WebFormHelper.php
@@ -63,7 +63,7 @@ class WebFormHelper extends BaseWebHelper implements HelpableTemplate {
 	 * @param	$withForm			Wether include the form tag
 	 * @return	$helperInstance		A preparedf instance of this helper
 	 */
-	public final static function createWebFormHelper (CompileableTemplate $templateInstance, $formName, $formId = false, $withForm = true) {
+	public static final function createWebFormHelper (CompileableTemplate $templateInstance, $formName, $formId = false, $withForm = true) {
 		// Get new instance
 		$helperInstance = new WebFormHelper();
 
diff --git a/inc/classes/main/helper/web/links/class_WebLinkHelper.php b/inc/classes/main/helper/web/links/class_WebLinkHelper.php
index a1e62817..1c32fc05 100644
--- a/inc/classes/main/helper/web/links/class_WebLinkHelper.php
+++ b/inc/classes/main/helper/web/links/class_WebLinkHelper.php
@@ -61,7 +61,7 @@ class WebLinkHelper extends BaseWebHelper implements HelpableTemplate {
 	 * @return	$helperInstance		A prepared instance of this helper
 	 * @throws	NoConfigEntryException	A deprecated exception at this point
 	 */
-	public final static function createWebLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = null) {
+	public static final function createWebLinkHelper (CompileableTemplate $templateInstance, $linkName, $linkBase = null) {
 		// Get new instance
 		$helperInstance = new WebLinkHelper();
 
diff --git a/inc/classes/main/images/extended/class_PngImage.php b/inc/classes/main/images/extended/class_PngImage.php
index fd09e360..47c7e6a0 100644
--- a/inc/classes/main/images/extended/class_PngImage.php
+++ b/inc/classes/main/images/extended/class_PngImage.php
@@ -38,7 +38,7 @@ class PngImage extends BaseImage {
 	 * @param	$templateInstance	A template instance
 	 * @return	$imageInstance		An instance of this image class
 	 */
-	public final static function createPngImage(CompileableTemplate $templateInstance) {
+	public static final function createPngImage(CompileableTemplate $templateInstance) {
 		// Get a new instance
 		$imageInstance = new PngImage();
 
diff --git a/inc/classes/main/io/class_FileIoStream.php b/inc/classes/main/io/class_FileIoStream.php
index 278d6d7d..41fe20d2 100644
--- a/inc/classes/main/io/class_FileIoStream.php
+++ b/inc/classes/main/io/class_FileIoStream.php
@@ -56,7 +56,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 	 *
 	 * @return	$ioInstance	An instance of FileIoStream
 	 */
-	public final static function createFileIoStream () {
+	public static final function createFileIoStream () {
 		// Create new instance
 		$ioInstance = new FileIoStream();
 
diff --git a/inc/classes/main/io/class_FrameworkDirectoryPointer.php b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
index 9b07e127..3102211a 100644
--- a/inc/classes/main/io/class_FrameworkDirectoryPointer.php
+++ b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
@@ -74,7 +74,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 * @throws	DirPointerNotOpened			If opendir() returns not a
 	 *										directory resource
 	 */
-	public final static function createFrameworkDirectoryPointer ($pathName, $inConstructor = false) {
+	public static final function createFrameworkDirectoryPointer ($pathName, $inConstructor = false) {
 		// Some pre-sanity checks...
 		if (is_null($pathName)) {
 			// No pathname given
diff --git a/inc/classes/main/io/class_FrameworkFileInputPointer.php b/inc/classes/main/io/class_FrameworkFileInputPointer.php
index 68ddcf4b..380f2c79 100644
--- a/inc/classes/main/io/class_FrameworkFileInputPointer.php
+++ b/inc/classes/main/io/class_FrameworkFileInputPointer.php
@@ -67,7 +67,7 @@ class FrameworkFileInputPointer extends BaseFrameworkSystem {
 	 * @throws	FileIoException		If fopen() returns not a file resource
 	 * @return	void
 	 */
-	public final static function createFrameworkFileInputPointer ($fileName) {
+	public static final function createFrameworkFileInputPointer ($fileName) {
 		// Some pre-sanity checks...
 		if ((is_null($fileName)) || (empty($fileName))) {
 			// No filename given
diff --git a/inc/classes/main/io/class_FrameworkFileOutputPointer.php b/inc/classes/main/io/class_FrameworkFileOutputPointer.php
index 2925a76c..a425d482 100644
--- a/inc/classes/main/io/class_FrameworkFileOutputPointer.php
+++ b/inc/classes/main/io/class_FrameworkFileOutputPointer.php
@@ -64,7 +64,7 @@ class FrameworkFileOutputPointer extends BaseFrameworkSystem {
 	 * @throws	FileIoException		If fopen() returns not a file resource
 	 * @return	void
 	 */
-	public final static function createFrameworkFileOutputPointer ($fileName, $mode) {
+	public static final function createFrameworkFileOutputPointer ($fileName, $mode) {
 		// Some pre-sanity checks...
 		if (is_null($fileName)) {
 			// No filename given
diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index ca189a4c..ec8b8191 100644
--- a/inc/classes/main/language/class_LanguageSystem.php
+++ b/inc/classes/main/language/class_LanguageSystem.php
@@ -65,7 +65,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 * @throws	LanguagePathReadProtectedException	If $languageBasePath is
 	 *										read-protected
 	 */
-	public final static function createLanguageSystem ($languageBasePath) {
+	public static final function createLanguageSystem ($languageBasePath) {
 		// Get a new instance
 		$langInstance = new LanguageSystem();
 
@@ -105,7 +105,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 *
 	 * @return	$thisInstance	An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getInstance () {
 		return self::$thisInstance;
 	}
 
diff --git a/inc/classes/main/mailer/debug/class_DebugMailer.php b/inc/classes/main/mailer/debug/class_DebugMailer.php
index 4a6651c2..8f38350c 100644
--- a/inc/classes/main/mailer/debug/class_DebugMailer.php
+++ b/inc/classes/main/mailer/debug/class_DebugMailer.php
@@ -41,7 +41,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
 	 * @param	$templateName		Name of email template to set
 	 * @return	$mailerInstance		An instance of this mailer class
 	 */
-	public final static function createDebugMailer (CompileableTemplate $templateInstance, ManageableApplication $appInstance, $templateName) {
+	public static final function createDebugMailer (CompileableTemplate $templateInstance, ManageableApplication $appInstance, $templateName) {
 		// Get a new instance
 		$mailerInstance = new DebugMailer();
 
diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php
index a03b9512..544cd23b 100644
--- a/inc/classes/main/output/class_ConsoleOutput.php
+++ b/inc/classes/main/output/class_ConsoleOutput.php
@@ -44,7 +44,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
 	 * @param	$contentType	A valid content-type
 	 * @return	$debugInstance	An instance of this middleware class
 	 */
-	public final static function createConsoleOutput ($contentType) {
+	public static final function createConsoleOutput ($contentType) {
 		// Cast the content-type to string
 		$contentType = (string) $contentType;
 		$contentType = trim($contentType);
@@ -69,7 +69,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
 	 *
 	 * @return	$consoleInstance	An instance of this class
 	 */
-	public final static function getInstance() {
+	public static final function getInstance() {
 		if (is_null(self::$consoleInstance)) {
 			$contentType = FrameworkConfiguration::getInstance()->getConfigEntry('web_content_type');
 			self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
diff --git a/inc/classes/main/output/class_WebOutput.php b/inc/classes/main/output/class_WebOutput.php
index 218fbc2c..b0f2f4e3 100644
--- a/inc/classes/main/output/class_WebOutput.php
+++ b/inc/classes/main/output/class_WebOutput.php
@@ -44,7 +44,7 @@ class WebOutput extends BaseFrameworkSystem implements OutputStreamer, Registera
 	 * @param	$applicationInstance	An instance of a ManageableApplication class
 	 * @return	$debugInstance			An instance of this middleware class
 	 */
-	public final static function createWebOutput (ManageableApplication $applicationInstance) {
+	public static final function createWebOutput (ManageableApplication $applicationInstance) {
 		// Is there no instance?
 		if (is_null(self::$webInstance)) {
 			// Get a new instance and set it
diff --git a/inc/classes/main/parser/xml/class_XmlParser.php b/inc/classes/main/parser/xml/class_XmlParser.php
index 63d508a5..c9c2fce8 100644
--- a/inc/classes/main/parser/xml/class_XmlParser.php
+++ b/inc/classes/main/parser/xml/class_XmlParser.php
@@ -43,7 +43,7 @@ class XmlParser extends BaseParser implements Parseable {
 	 * @param	$templateInstance	A CompileableTemplate instance
 	 * @return	$parserInstance		An instance of this parser
 	 */
-	public final static function createXmlParser (CompileableTemplate $templateInstance) {
+	public static final function createXmlParser (CompileableTemplate $templateInstance) {
 		// Get a new instance
 		$parserInstance = new XmlParser();
 
diff --git a/inc/classes/main/points/class_UserPoints.php b/inc/classes/main/points/class_UserPoints.php
index efbd9c82..a65aa526 100644
--- a/inc/classes/main/points/class_UserPoints.php
+++ b/inc/classes/main/points/class_UserPoints.php
@@ -43,7 +43,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 	 * @param	$userInstance		An instance of a user class
 	 * @return	$pointsInstance		An instance of this class
 	 */
-	public final static function createUserPoints (ManageableAccount $userInstance) {
+	public static final function createUserPoints (ManageableAccount $userInstance) {
 		// Get a new instance
 		$pointsInstance = new UserPoints();
 
diff --git a/inc/classes/main/reader/class_ConsoleNewsReader.php b/inc/classes/main/reader/class_ConsoleNewsReader.php
index 196a7bd5..986dd3fb 100644
--- a/inc/classes/main/reader/class_ConsoleNewsReader.php
+++ b/inc/classes/main/reader/class_ConsoleNewsReader.php
@@ -38,7 +38,7 @@ class ConsoleNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 	 * @param	$requestInstance	An instance of a Requestable class
 	 * @return	$readerInstance		An instance of this reader class
 	 */
-	public final static function createConsoleNewsReader (Requestable $requestInstance) {
+	public static final function createConsoleNewsReader (Requestable $requestInstance) {
 		// Get a new instance
 		$readerInstance = new ConsoleNewsReader();
 
diff --git a/inc/classes/main/reader/class_DefaultNewsReader.php b/inc/classes/main/reader/class_DefaultNewsReader.php
index 021fc167..cddd9cd7 100644
--- a/inc/classes/main/reader/class_DefaultNewsReader.php
+++ b/inc/classes/main/reader/class_DefaultNewsReader.php
@@ -38,7 +38,7 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
 	 * @param	$requestInstance	An instance of a Requestable class
 	 * @return	$readerInstance		An instance of this reader class
 	 */
-	public final static function createDefaultNewsReader (Requestable $requestInstance) {
+	public static final function createDefaultNewsReader (Requestable $requestInstance) {
 		// Get a new instance
 		$readerInstance = new DefaultNewsReader();
 
diff --git a/inc/classes/main/registry/generic/class_Registry.php b/inc/classes/main/registry/generic/class_Registry.php
index 165b00fd..0134941a 100644
--- a/inc/classes/main/registry/generic/class_Registry.php
+++ b/inc/classes/main/registry/generic/class_Registry.php
@@ -44,7 +44,7 @@ class Registry extends BaseRegistry implements Register {
 	 *
 	 * @return	$registryInstance	Instance of this class
 	 */
-	public final static function getRegistry () {
+	public static final function getRegistry () {
 		// Is an instance there?
 		if (is_null(self::$registryInstance)) {
 			// Not yet, so create one
diff --git a/inc/classes/main/registry/sub/class_SubRegistry.php b/inc/classes/main/registry/sub/class_SubRegistry.php
index 65c1983e..63ee83ef 100644
--- a/inc/classes/main/registry/sub/class_SubRegistry.php
+++ b/inc/classes/main/registry/sub/class_SubRegistry.php
@@ -37,7 +37,7 @@ class SubRegistry extends BaseRegistry implements Register {
 	 *
 	 * @return	$registryInstance	An instance of this registry class
 	 */
-	public final static function createSubRegistry () {
+	public static final function createSubRegistry () {
 		// Just get a new instance ...
 		$registryInstance = new SubRegistry();
 
diff --git a/inc/classes/main/request/console/class_ConsoleRequest.php b/inc/classes/main/request/console/class_ConsoleRequest.php
index ffe52144..830b034f 100644
--- a/inc/classes/main/request/console/class_ConsoleRequest.php
+++ b/inc/classes/main/request/console/class_ConsoleRequest.php
@@ -37,7 +37,7 @@ class ConsoleRequest extends BaseRequest implements Requestable {
 	 *
 	 * @return	$httpInstance	An instance of this class
 	 */
-	public final static function createConsoleRequest () {
+	public static final function createConsoleRequest () {
 		// Create an instance
 		$httpInstance = new ConsoleRequest();
 
diff --git a/inc/classes/main/request/web/class_HttpRequest.php b/inc/classes/main/request/web/class_HttpRequest.php
index ffaa0d7d..c1c1f514 100644
--- a/inc/classes/main/request/web/class_HttpRequest.php
+++ b/inc/classes/main/request/web/class_HttpRequest.php
@@ -38,7 +38,7 @@ class HttpRequest extends BaseRequest implements Requestable {
 	 *
 	 * @return	$httpInstance	An instance of this class
 	 */
-	public final static function createHttpRequest () {
+	public static final function createHttpRequest () {
 		// Create an instance
 		$httpInstance = new HttpRequest();
 
diff --git a/inc/classes/main/resolver/action/web/class_WebActionResolver.php b/inc/classes/main/resolver/action/web/class_WebActionResolver.php
index a7bcc685..de659a3e 100644
--- a/inc/classes/main/resolver/action/web/class_WebActionResolver.php
+++ b/inc/classes/main/resolver/action/web/class_WebActionResolver.php
@@ -49,7 +49,7 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver {
 	 * @throws	EmptyVariableException	Thrown if default action is not set
 	 * @throws	InvalidActionException	Thrown if default action is invalid
 	 */
-	public final static function createWebActionResolver ($actionName, ManageableApplication $appInstance) {
+	public static final function createWebActionResolver ($actionName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new WebActionResolver();
 
diff --git a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
index 3cbeccb3..6611129a 100644
--- a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php
@@ -49,7 +49,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidCommandException		Thrown if default command is invalid
 	 */
-	public final static function createConsoleCommandResolver ($commandName, ManageableApplication $appInstance) {
+	public static final function createConsoleCommandResolver ($commandName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new ConsoleCommandResolver();
 
diff --git a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
index e5e10654..fee6f4fe 100644
--- a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
+++ b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php
@@ -49,7 +49,7 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidCommandException		Thrown if default command is invalid
 	 */
-	public final static function createImageCommandResolver ($commandName, ManageableApplication $appInstance) {
+	public static final function createImageCommandResolver ($commandName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new ImageCommandResolver();
 
diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
index 6efd2283..fd51fc38 100644
--- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
+++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php
@@ -49,7 +49,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidCommandException		Thrown if default command is invalid
 	 */
-	public final static function createWebCommandResolver ($commandName, ManageableApplication $appInstance) {
+	public static final function createWebCommandResolver ($commandName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new WebCommandResolver();
 
diff --git a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
index 1b4c3473..9df8266a 100644
--- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -54,7 +54,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidControllerException	Thrown if default controller is invalid
 	 */
-	public final static function createConsoleControllerResolver ($controllerName, ManageableApplication $appInstance) {
+	public static final function createConsoleControllerResolver ($controllerName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new ConsoleControllerResolver();
 
diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
index ad6354fd..0c3737e2 100644
--- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
@@ -54,7 +54,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidControllerException	Thrown if default controller is invalid
 	 */
-	public final static function createImageControllerResolver ($controllerName, ManageableApplication $appInstance) {
+	public static final function createImageControllerResolver ($controllerName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new ImageControllerResolver();
 
diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index bcdd5c0c..157b1b56 100644
--- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@ -54,7 +54,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 	 * @throws	EmptyVariableException		Thrown if default command is not set
 	 * @throws	InvalidControllerException	Thrown if default controller is invalid
 	 */
-	public final static function createWebControllerResolver ($controllerName, ManageableApplication $appInstance) {
+	public static final function createWebControllerResolver ($controllerName, ManageableApplication $appInstance) {
 		// Create the new instance
 		$resolverInstance = new WebControllerResolver();
 
diff --git a/inc/classes/main/response/console/class_ConsoleResponse.php b/inc/classes/main/response/console/class_ConsoleResponse.php
index 4c7ea2a2..625f1944 100644
--- a/inc/classes/main/response/console/class_ConsoleResponse.php
+++ b/inc/classes/main/response/console/class_ConsoleResponse.php
@@ -41,7 +41,7 @@ class ConsoleResponse extends BaseResponse implements Responseable {
 	 * @param	$appInstance		An instance of a manageable application
 	 * @return	$responseInstance	A prepared instance of this class
 	 */
-	public final static function createConsoleResponse (ManageableApplication $appInstance) {
+	public static final function createConsoleResponse (ManageableApplication $appInstance) {
 		// Get a new instance
 		$responseInstance = new ConsoleResponse();
 
diff --git a/inc/classes/main/response/http/class_HttpResponse.php b/inc/classes/main/response/http/class_HttpResponse.php
index 1fb9f5b4..a3e5e362 100644
--- a/inc/classes/main/response/http/class_HttpResponse.php
+++ b/inc/classes/main/response/http/class_HttpResponse.php
@@ -41,7 +41,7 @@ class HttpResponse extends BaseResponse implements Responseable {
 	 * @param	$appInstance		An instance of a manageable application
 	 * @return	$responseInstance	A prepared instance of this class
 	 */
-	public final static function createHttpResponse (ManageableApplication $appInstance) {
+	public static final function createHttpResponse (ManageableApplication $appInstance) {
 		// Get a new instance
 		$responseInstance = new HttpResponse();
 
diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php
index 649bddd8..63c3dfcf 100644
--- a/inc/classes/main/response/image/class_ImageResponse.php
+++ b/inc/classes/main/response/image/class_ImageResponse.php
@@ -41,7 +41,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 	 * @param	$appInstance		An instance of a manageable application
 	 * @return	$responseInstance	A prepared instance of this class
 	 */
-	public final static function createImageResponse (ManageableApplication $appInstance) {
+	public static final function createImageResponse (ManageableApplication $appInstance) {
 		// Get a new instance
 		$responseInstance = new ImageResponse();
 
diff --git a/inc/classes/main/result/class_DatabaseResult.php b/inc/classes/main/result/class_DatabaseResult.php
index ef5e4548..7d1435de 100644
--- a/inc/classes/main/result/class_DatabaseResult.php
+++ b/inc/classes/main/result/class_DatabaseResult.php
@@ -72,7 +72,7 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up
 	 * @param	$resultArray		The array holding the result from query
 	 * @return	$resultInstance		An instance of this class
 	 */
-	public final static function createDatabaseResult (array $resultArray) {
+	public static final function createDatabaseResult (array $resultArray) {
 		// Get a new instance
 		$resultInstance = new DatabaseResult();
 
diff --git a/inc/classes/main/rng/class_RandomNumberGenerator.php b/inc/classes/main/rng/class_RandomNumberGenerator.php
index 9fe5a7ff..0820b457 100644
--- a/inc/classes/main/rng/class_RandomNumberGenerator.php
+++ b/inc/classes/main/rng/class_RandomNumberGenerator.php
@@ -64,7 +64,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
 	 * @param	$extraInstance	An extra instance for more salt (default: null)
 	 * @return	$rngInstance	An instance of this random number generator
 	 */
-	public final static function createRandomNumberGenerator (FrameworkInterface $extraInstance = null) {
+	public static final function createRandomNumberGenerator (FrameworkInterface $extraInstance = null) {
 		// Get a new instance
 		$rngInstance = new RandomNumberGenerator();
 
diff --git a/inc/classes/main/stacker/fifo/class_FiFoStacker.php b/inc/classes/main/stacker/fifo/class_FiFoStacker.php
index f8fe041b..8df19e36 100644
--- a/inc/classes/main/stacker/fifo/class_FiFoStacker.php
+++ b/inc/classes/main/stacker/fifo/class_FiFoStacker.php
@@ -37,7 +37,7 @@ class FiFoStacker extends BaseStacker implements Stackable {
 	 *
 	 * @return	$stackerInstance	An instance of FiFoStacker
 	 */
-	public final static function createFiFoStacker () {
+	public static final function createFiFoStacker () {
 		// Get a new instance
 		$stackerInstance = new FiFoStacker();
 
diff --git a/inc/classes/main/stacker/filo/class_FiLoStacker.php b/inc/classes/main/stacker/filo/class_FiLoStacker.php
index 6e36d798..84efb06b 100644
--- a/inc/classes/main/stacker/filo/class_FiLoStacker.php
+++ b/inc/classes/main/stacker/filo/class_FiLoStacker.php
@@ -37,7 +37,7 @@ class FiLoStacker extends BaseStacker implements Stackable {
 	 *
 	 * @return	$stackerInstance	An instance of FiLoStacker
 	 */
-	public final static function createFiLoStacker () {
+	public static final function createFiLoStacker () {
 		// Get a new instance
 		$stackerInstance = new FiLoStacker();
 
diff --git a/inc/classes/main/streams/crypto/class_McryptStream.php b/inc/classes/main/streams/crypto/class_McryptStream.php
index f547c040..bb85c217 100644
--- a/inc/classes/main/streams/crypto/class_McryptStream.php
+++ b/inc/classes/main/streams/crypto/class_McryptStream.php
@@ -43,7 +43,7 @@ class McryptStream extends BaseStream implements EncryptableStream {
 	 * @param	$rngInstance		An RNG instance
 	 * @return	$streamInstance		An instance of this node class
 	 */
-	public final static function createMcryptStream (RandomNumberGenerator $rngInstance) {
+	public static final function createMcryptStream (RandomNumberGenerator $rngInstance) {
 		// Get a new instance
 		$streamInstance = new McryptStream();
 
diff --git a/inc/classes/main/streams/crypto/class_NullCryptoStream.php b/inc/classes/main/streams/crypto/class_NullCryptoStream.php
index 33ffdb82..b7c1cf2e 100644
--- a/inc/classes/main/streams/crypto/class_NullCryptoStream.php
+++ b/inc/classes/main/streams/crypto/class_NullCryptoStream.php
@@ -38,7 +38,7 @@ class NullCryptoStream extends BaseStream implements EncryptableStream {
 	 *
 	 * @return	$streamInstance		An instance of this node class
 	 */
-	public final static function createNullCryptoStream () {
+	public static final function createNullCryptoStream () {
 		// Get a new instance
 		$streamInstance = new NullCryptoStream();
 
diff --git a/inc/classes/main/template/console/class_ConsoleTemplateEngine.php b/inc/classes/main/template/console/class_ConsoleTemplateEngine.php
index 83fc014a..efdcd06e 100644
--- a/inc/classes/main/template/console/class_ConsoleTemplateEngine.php
+++ b/inc/classes/main/template/console/class_ConsoleTemplateEngine.php
@@ -45,7 +45,7 @@ class ConsoleTemplateEngine extends BaseTemplateEngine implements CompileableTem
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createConsoleTemplateEngine (ManageableApplication $appInstance) {
+	public static final function createConsoleTemplateEngine (ManageableApplication $appInstance) {
 		// Get a new instance
 		$templateInstance = new ConsoleTemplateEngine();
 
diff --git a/inc/classes/main/template/image/class_ImageTemplateEngine.php b/inc/classes/main/template/image/class_ImageTemplateEngine.php
index 2c6cb376..ecc99d81 100644
--- a/inc/classes/main/template/image/class_ImageTemplateEngine.php
+++ b/inc/classes/main/template/image/class_ImageTemplateEngine.php
@@ -78,7 +78,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createImageTemplateEngine (ManageableApplication $appInstance) {
+	public static final function createImageTemplateEngine (ManageableApplication $appInstance) {
 		// Get a new instance
 		$templateInstance = new ImageTemplateEngine();
 
diff --git a/inc/classes/main/template/mail/class_MailTemplateEngine.php b/inc/classes/main/template/mail/class_MailTemplateEngine.php
index 4230ac6b..e219b01f 100644
--- a/inc/classes/main/template/mail/class_MailTemplateEngine.php
+++ b/inc/classes/main/template/mail/class_MailTemplateEngine.php
@@ -72,7 +72,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createMailTemplateEngine (ManageableApplication $appInstance) {
+	public static final function createMailTemplateEngine (ManageableApplication $appInstance) {
 		// Get a new instance
 		$templateInstance = new MailTemplateEngine();
 
diff --git a/inc/classes/main/template/menu/class_MenuTemplateEngine.php b/inc/classes/main/template/menu/class_MenuTemplateEngine.php
index af9a3756..0b29878a 100644
--- a/inc/classes/main/template/menu/class_MenuTemplateEngine.php
+++ b/inc/classes/main/template/menu/class_MenuTemplateEngine.php
@@ -95,7 +95,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createMenuTemplateEngine (ManageableApplication $appInstance, RenderableMenu $menuInstance) {
+	public static final function createMenuTemplateEngine (ManageableApplication $appInstance, RenderableMenu $menuInstance) {
 		// Get a new instance
 		$templateInstance = new MenuTemplateEngine();
 
diff --git a/inc/classes/main/template/web/class_WebTemplateEngine.php b/inc/classes/main/template/web/class_WebTemplateEngine.php
index 043277a6..3b13ea2d 100644
--- a/inc/classes/main/template/web/class_WebTemplateEngine.php
+++ b/inc/classes/main/template/web/class_WebTemplateEngine.php
@@ -45,7 +45,7 @@ class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplat
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createWebTemplateEngine (ManageableApplication $appInstance) {
+	public static final function createWebTemplateEngine (ManageableApplication $appInstance) {
 		// Get a new instance
 		$templateInstance = new WebTemplateEngine();
 
diff --git a/inc/classes/main/user/guest/class_Guest.php b/inc/classes/main/user/guest/class_Guest.php
index 54f22a84..68708027 100644
--- a/inc/classes/main/user/guest/class_Guest.php
+++ b/inc/classes/main/user/guest/class_Guest.php
@@ -46,7 +46,7 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
 	 * @return	$userInstance	An instance of this user class
 	 * @throws	UsernameMissingException	If the username does not exist
 	 */
-	public final static function createGuestByUsername ($userName) {
+	public static final function createGuestByUsername ($userName) {
 		// Get a new instance
 		$userInstance = new Guest();
 
@@ -70,7 +70,7 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
 	 * @param	$email			Email address of the user
 	 * @return	$userInstance	An instance of this user class
 	 */
-	public final static function createGuestByEmail ($email) {
+	public static final function createGuestByEmail ($email) {
 		// Get a new instance
 		$userInstance = new Guest();
 
diff --git a/inc/classes/main/user/member/class_Member.php b/inc/classes/main/user/member/class_Member.php
index 60379746..9a6fff94 100644
--- a/inc/classes/main/user/member/class_Member.php
+++ b/inc/classes/main/user/member/class_Member.php
@@ -41,7 +41,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 	 * @return	$userInstance	An instance of this user class
 	 * @throws	UsernameMissingException	If the username does not exist
 	 */
-	public final static function createMemberByUsername ($userName) {
+	public static final function createMemberByUsername ($userName) {
 		// Get a new instance
 		$userInstance = new Member();
 
@@ -65,7 +65,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 	 * @param	$email			Email address of the user
 	 * @return	$userInstance	An instance of this user class
 	 */
-	public final static function createMemberByEmail ($email) {
+	public static final function createMemberByEmail ($email) {
 		// Get a new instance
 		$userInstance = new Member();
 
@@ -83,7 +83,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 	 * @return	$userInstance		An instance of this user class
 	 * @todo	Add more ways over creating user classes
 	 */
-	public final static function createMemberByRequest (Requestable $requestInstance) {
+	public static final function createMemberByRequest (Requestable $requestInstance) {
 		// Determine if by email or username
 		if (!is_null($requestInstance->getRequestElement('username'))) {
 			// Username supplied
diff --git a/inc/classes/middleware/compressor/class_CompressorChannel.php b/inc/classes/middleware/compressor/class_CompressorChannel.php
index 976118bd..3bcd0cb2 100644
--- a/inc/classes/middleware/compressor/class_CompressorChannel.php
+++ b/inc/classes/middleware/compressor/class_CompressorChannel.php
@@ -44,7 +44,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
 	 * @param	$baseDir	Directory which holds our compressor classes
 	 * @return	$cInstance	A prepared instance of this class
 	 */
-	public final static function createCompressorChannel ($baseDir) {
+	public static final function createCompressorChannel ($baseDir) {
 		// Get new instance
 		$cInstance = new CompressorChannel();
 
diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index de4f5a02..48a73e8a 100644
--- a/inc/classes/middleware/database/class_DatabaseConnection.php
+++ b/inc/classes/middleware/database/class_DatabaseConnection.php
@@ -49,7 +49,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	}
 
 	// Create new database connection layer
-	public final static function createDatabaseConnection (DebugMiddleware $debugInstance, DatabaseFrontendInterface $dbLayer) {
+	public static final function createDatabaseConnection (DebugMiddleware $debugInstance, DatabaseFrontendInterface $dbLayer) {
 		// Get instance
 		$dbInstance = new DatabaseConnection();
 
@@ -67,7 +67,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	}
 
 	// Get an instance of this class
-	public final static function getInstance () {
+	public static final function getInstance () {
 		return self::$thisInstance;
 	}
 
diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php
index f9f2523c..245e18f9 100644
--- a/inc/classes/middleware/debug/class_DebugMiddleware.php
+++ b/inc/classes/middleware/debug/class_DebugMiddleware.php
@@ -59,7 +59,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
 	 *							registering the *real* debug output
 	 * @return	$debugInstance	An instance of this middleware class
 	 */
-	public final static function createDebugMiddleware ($debuggerClass) {
+	public static final function createDebugMiddleware ($debuggerClass) {
 		// Create an instance if this middleware
 		$debugInstance = new DebugMiddleware();
 
@@ -84,7 +84,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
 	 *
 	 * @return	$thisInstance		An instance of this class
 	 */
-	public final static function getInstance() {
+	public static final function getInstance() {
 		return self::$thisInstance;
 	}
 
diff --git a/inc/classes/middleware/io/class_FileIoHandler.php b/inc/classes/middleware/io/class_FileIoHandler.php
index 1911a5d9..b611d76f 100644
--- a/inc/classes/middleware/io/class_FileIoHandler.php
+++ b/inc/classes/middleware/io/class_FileIoHandler.php
@@ -57,7 +57,7 @@ class FileIoHandler extends BaseMiddleware {
 	 *
 	 * @return	$ioInstance		A prepared instance of FilIOHandler
 	 */
-	public final static function createFileIoHandler () {
+	public static final function createFileIoHandler () {
 		// Get instance
 		$ioHandler = new FileIoHandler();
 
@@ -74,7 +74,7 @@ class FileIoHandler extends BaseMiddleware {
 	 *
 	 * @return	$thisInstance	An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getInstance () {
 		return self::$thisInstance;
 	}
 
diff --git a/inc/classes/third_party/api/wernisportal/class_WernisApi.php b/inc/classes/third_party/api/wernisportal/class_WernisApi.php
index 0aeb146e..3c8d7005 100644
--- a/inc/classes/third_party/api/wernisportal/class_WernisApi.php
+++ b/inc/classes/third_party/api/wernisportal/class_WernisApi.php
@@ -78,7 +78,7 @@ class WernisApi extends BaseFrameworkSystem {
 	 * @param	$cfg			Configuration array
 	 * @return	$apiInstance	An instance of this API class
 	 */
-	public final static function createWernisApi (array $cfg) {
+	public static final function createWernisApi (array $cfg) {
 		// Create a new instance
 		$apiInstance = new WernisApi();
 
diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 65d742b5..6182aa30 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -65,7 +65,7 @@ class FrameworkConfiguration implements Registerable {
 	 *
 	 * @return	$configInstance	An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getInstance () {
 		// is the instance there?
 		if (is_null(self::$configInstance))  {
 			// Create a config instance
diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 79768fff..c8b3e6ca 100644
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -112,7 +112,7 @@ class ClassLoader {
 	 * @param	$configInstance	Configuration class instance
 	 * @return	void
 	 */
-	public final static function createClassLoader (FrameworkConfiguration $configInstance) {
+	public static final function createClassLoader (FrameworkConfiguration $configInstance) {
 		// Get a new instance
 		$loaderInstance = new ClassLoader();
 
@@ -187,7 +187,7 @@ class ClassLoader {
 	 *
 	 * @return	$selfInstance		An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getInstance () {
 		// Is the instance there?
 		if (is_null(self::$selfInstance)) {
 			// Get a new one