From 11f39762c7e20fe4655db3f92ef3c89e648fdb68 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 21 Feb 2017 21:39:36 +0100
Subject: [PATCH] Finished first cleanup (still a lot is broken): - added more
 namespaces - made more exceptions deprecated as there are better exceptions
 or names for it - removed own [EOF] (old coding style) - removed discouraged
 ?> from all files
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 inc/main/exceptions/database/class_DatabaseException.php | 7 ++++---
 .../exceptions/file_directory/class_FileIoException.php  | 7 ++++---
 .../file_directory/class_FileNotFoundException.php       | 7 ++++---
 .../file_directory/class_FileReadProtectedException.php  | 8 +++++---
 .../file_directory/class_InvalidMD5ChecksumException.php | 8 +++++---
 .../file_directory/class_PathIsNoDirectoryException.php  | 8 +++++---
 .../file_directory/class_PathReadProtectedException.php  | 8 +++++---
 .../file_directory/class_PathWriteProtectedException.php | 8 +++++---
 inc/main/exceptions/main/class_AssertionException.php    | 7 ++++---
 .../exceptions/main/class_ClassMismatchException.php     | 7 ++++---
 .../exceptions/main/class_EmptyVariableException.php     | 8 +++++---
 inc/main/exceptions/main/class_FatalErrorException.php   | 7 ++++---
 .../exceptions/main/class_IndexOutOfBoundsException.php  | 7 ++++---
 .../exceptions/main/class_InvalidArrayCountException.php | 8 +++++---
 .../exceptions/main/class_InvalidCommandException.php    | 8 +++++---
 .../main/class_InvalidCommandInstanceException.php       | 8 +++++---
 .../exceptions/main/class_InvalidInterfaceException.php  | 7 ++++---
 .../main/class_MissingArrayElementsException.php         | 7 ++++---
 .../class_MissingDecimalsThousandsSeparatorException.php | 8 +++++---
 .../exceptions/main/class_MissingMethodException.php     | 9 +++++----
 inc/main/exceptions/main/class_NoClassException.php      | 7 ++++---
 .../exceptions/main/class_VariableIsNotSetException.php  | 8 +++++---
 .../user/class_AccountPasswordMismatchException.php      | 7 ++++---
 .../user/class_UnexpectedGuestAccountException.php       | 7 ++++---
 .../exceptions/user/class_UserEmailMissingException.php  | 7 ++++---
 inc/main/exceptions/user/class_UserNoGuestException.php  | 8 +++++---
 .../user/class_UserPasswordMismatchException.php         | 7 ++++---
 .../exceptions/user/class_UsernameMissingException.php   | 7 ++++---
 28 files changed, 125 insertions(+), 85 deletions(-)

diff --git a/inc/main/exceptions/database/class_DatabaseException.php b/inc/main/exceptions/database/class_DatabaseException.php
index b46532b5..b5d37acc 100644
--- a/inc/main/exceptions/database/class_DatabaseException.php
+++ b/inc/main/exceptions/database/class_DatabaseException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Database;
+
 /**
  * A general database exception
  *
@@ -33,7 +36,5 @@ class DatabaseException extends FrameworkException {
 		// Just call the parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_FileIoException.php b/inc/main/exceptions/file_directory/class_FileIoException.php
index 5843c40f..e769092c 100644
--- a/inc/main/exceptions/file_directory/class_FileIoException.php
+++ b/inc/main/exceptions/file_directory/class_FileIoException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem;
+
 /**
  * An exception thrown when a file pointer is not opened or when the file
  * cannot be reached.
@@ -37,7 +40,5 @@ class FileIoException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_FileNotFoundException.php b/inc/main/exceptions/file_directory/class_FileNotFoundException.php
index 4641ce1e..2e13bdcf 100644
--- a/inc/main/exceptions/file_directory/class_FileNotFoundException.php
+++ b/inc/main/exceptions/file_directory/class_FileNotFoundException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Filesystem;
+
 /**
  * An exception thrown when a file was not found (but could be found).
  *
@@ -36,7 +39,5 @@ class FileNotFoundException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_FileReadProtectedException.php b/inc/main/exceptions/file_directory/class_FileReadProtectedException.php
index 641e420c..fdd13ecf 100644
--- a/inc/main/exceptions/file_directory/class_FileReadProtectedException.php
+++ b/inc/main/exceptions/file_directory/class_FileReadProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a file is read-protected
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't read this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class FileReadProtectedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php b/inc/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
index 174d9746..ce688d17 100644
--- a/inc/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
+++ b/inc/main/exceptions/file_directory/class_InvalidMD5ChecksumException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a MD5 checksum does not exception
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class InvalidMD5ChecksumException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_PathIsNoDirectoryException.php b/inc/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
index 13322dd3..4a33ea8a 100644
--- a/inc/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
+++ b/inc/main/exceptions/file_directory/class_PathIsNoDirectoryException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a given path is not a directory
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class PathIsNoDirectoryException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_PathReadProtectedException.php b/inc/main/exceptions/file_directory/class_PathReadProtectedException.php
index 399a25ef..c64568bf 100644
--- a/inc/main/exceptions/file_directory/class_PathReadProtectedException.php
+++ b/inc/main/exceptions/file_directory/class_PathReadProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a path is read-protected
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class PathReadProtectedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/file_directory/class_PathWriteProtectedException.php b/inc/main/exceptions/file_directory/class_PathWriteProtectedException.php
index 3fa5b9d7..9dec65d2 100644
--- a/inc/main/exceptions/file_directory/class_PathWriteProtectedException.php
+++ b/inc/main/exceptions/file_directory/class_PathWriteProtectedException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a path cannot be written to.
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +40,5 @@ class FileWriteProtectedException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_AssertionException.php b/inc/main/exceptions/main/class_AssertionException.php
index f2e19fe3..3217e530 100644
--- a/inc/main/exceptions/main/class_AssertionException.php
+++ b/inc/main/exceptions/main/class_AssertionException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Assertion;
+
 /**
  * An exception thrown when a assertion fails
  *
@@ -33,7 +36,5 @@ class AssertionException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_ClassMismatchException.php b/inc/main/exceptions/main/class_ClassMismatchException.php
index a81a3807..5c3052aa 100644
--- a/inc/main/exceptions/main/class_ClassMismatchException.php
+++ b/inc/main/exceptions/main/class_ClassMismatchException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Object;
+
 /**
  * An exception thrown when two classes are not matching
  *
@@ -39,7 +42,5 @@ class ClassMismatchException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_EmptyVariableException.php b/inc/main/exceptions/main/class_EmptyVariableException.php
index 9928af9b..b6ecad00 100644
--- a/inc/main/exceptions/main/class_EmptyVariableException.php
+++ b/inc/main/exceptions/main/class_EmptyVariableException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * This exception is thrown when a variable is unexpected empty
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class EmptyVariableException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_FatalErrorException.php b/inc/main/exceptions/main/class_FatalErrorException.php
index 088b8703..43b72b38 100644
--- a/inc/main/exceptions/main/class_FatalErrorException.php
+++ b/inc/main/exceptions/main/class_FatalErrorException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Error;
+
 /**
  * An exception thrown when a "fatal" error has been captured by an error handler
  *
@@ -33,7 +36,5 @@ class FatalErrorException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_IndexOutOfBoundsException.php b/inc/main/exceptions/main/class_IndexOutOfBoundsException.php
index 53d77ad3..45d7a3e8 100644
--- a/inc/main/exceptions/main/class_IndexOutOfBoundsException.php
+++ b/inc/main/exceptions/main/class_IndexOutOfBoundsException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Array;
+
 /**
  * An exception thrown when an array index is out of bounds
  *
@@ -38,7 +41,5 @@ class IndexOutOfBoundsException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_InvalidArrayCountException.php b/inc/main/exceptions/main/class_InvalidArrayCountException.php
index 0bf606a8..3aab2aee 100644
--- a/inc/main/exceptions/main/class_InvalidArrayCountException.php
+++ b/inc/main/exceptions/main/class_InvalidArrayCountException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the number of array elements mismatch
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +46,5 @@ class InvalidArrayCountException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_InvalidCommandException.php b/inc/main/exceptions/main/class_InvalidCommandException.php
index 8ba24107..9c1476f2 100644
--- a/inc/main/exceptions/main/class_InvalidCommandException.php
+++ b/inc/main/exceptions/main/class_InvalidCommandException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * This exception is thrown when a command is invalid
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,7 +48,5 @@ class InvalidCommandException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_InvalidCommandInstanceException.php b/inc/main/exceptions/main/class_InvalidCommandInstanceException.php
index 5786206d..f4d171b1 100644
--- a/inc/main/exceptions/main/class_InvalidCommandInstanceException.php
+++ b/inc/main/exceptions/main/class_InvalidCommandInstanceException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * This exception is thrown when a command instance is invalid
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +44,5 @@ class InvalidCommandInstanceException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_InvalidInterfaceException.php b/inc/main/exceptions/main/class_InvalidInterfaceException.php
index 822afad6..1458a3cb 100644
--- a/inc/main/exceptions/main/class_InvalidInterfaceException.php
+++ b/inc/main/exceptions/main/class_InvalidInterfaceException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Object;
+
 /**
  * An exception thrown when an class instance does not implement a given interface
  *
@@ -40,7 +43,5 @@ class InvalidInterfaceException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_MissingArrayElementsException.php b/inc/main/exceptions/main/class_MissingArrayElementsException.php
index 3e67a674..6d843534 100644
--- a/inc/main/exceptions/main/class_MissingArrayElementsException.php
+++ b/inc/main/exceptions/main/class_MissingArrayElementsException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Array;
+
 /**
  * An exception thrown when required array elements are missing
  *
@@ -51,7 +54,5 @@ class MissingArrayElementsException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php b/inc/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
index 5e1c9ff0..5ee19edf 100644
--- a/inc/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
+++ b/inc/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when the decimal and thousands separators are missing
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +43,5 @@ class MissingDecimalsThousandsSeparatorException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_MissingMethodException.php b/inc/main/exceptions/main/class_MissingMethodException.php
index cebe42a9..b033837c 100644
--- a/inc/main/exceptions/main/class_MissingMethodException.php
+++ b/inc/main/exceptions/main/class_MissingMethodException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Object;
+
 /**
  * An exception thrown when a method is missing, this exception is used in
  * guest/user login classes and thrown when a factory method is absend. I think
@@ -36,7 +39,7 @@ class MissingMethodException extends FrameworkException {
 	 */
 	public function __construct (array $classArray, $code) {
 		// Add a message around the missing class
-		$message = sprintf('[%s:%d] This class has no method <u>%s()</u>.',
+		$message = sprintf('[%s:%d] This class has no method %s().',
 			$classArray[0]->__toString(),
 			$this->getLine(),
 			$classArray[1]
@@ -45,7 +48,5 @@ class MissingMethodException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_NoClassException.php b/inc/main/exceptions/main/class_NoClassException.php
index 1d666c4d..eb5341c4 100644
--- a/inc/main/exceptions/main/class_NoClassException.php
+++ b/inc/main/exceptions/main/class_NoClassException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Loader;
+
 /**
  * An exception thrown when a class was not found
  *
@@ -43,7 +46,5 @@ class NoClassException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/main/class_VariableIsNotSetException.php b/inc/main/exceptions/main/class_VariableIsNotSetException.php
index 680be29d..7e6efb04 100644
--- a/inc/main/exceptions/main/class_VariableIsNotSetException.php
+++ b/inc/main/exceptions/main/class_VariableIsNotSetException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception thrown when a variable is not set
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @deprecated	Don't use this anymore
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class VariableIsNotSetException extends FrameworkException {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/user/class_AccountPasswordMismatchException.php b/inc/main/exceptions/user/class_AccountPasswordMismatchException.php
index 3bfa5b2c..1b186242 100644
--- a/inc/main/exceptions/user/class_AccountPasswordMismatchException.php
+++ b/inc/main/exceptions/user/class_AccountPasswordMismatchException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User;
+
 /**
  * An exception for mismatching passwords
  *
@@ -39,7 +42,5 @@ class AccountPasswordMismatchException extends FrameworkException {
 		// Make sure everything is assigned properly
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/user/class_UnexpectedGuestAccountException.php b/inc/main/exceptions/user/class_UnexpectedGuestAccountException.php
index c7eb157c..9ad167b0 100644
--- a/inc/main/exceptions/user/class_UnexpectedGuestAccountException.php
+++ b/inc/main/exceptions/user/class_UnexpectedGuestAccountException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User;
+
 /**
  * An exception for unexpected guest accounts
  *
@@ -40,7 +43,5 @@ class UnexpectedGuestAccountException extends FrameworkException {
 		// Make sure everything is assigned properly
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/user/class_UserEmailMissingException.php b/inc/main/exceptions/user/class_UserEmailMissingException.php
index 7eee4b13..df122190 100644
--- a/inc/main/exceptions/user/class_UserEmailMissingException.php
+++ b/inc/main/exceptions/user/class_UserEmailMissingException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User;
+
 /**
  * An exception for non-existing user emails
  *
@@ -40,7 +43,5 @@ class UserEmailMissingException extends FrameworkException {
 		// Make sure everything is assigned properly
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/user/class_UserNoGuestException.php b/inc/main/exceptions/user/class_UserNoGuestException.php
index f1703232..22d623a7 100644
--- a/inc/main/exceptions/user/class_UserNoGuestException.php
+++ b/inc/main/exceptions/user/class_UserNoGuestException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Deprecated;
+
 /**
  * An exception for non-guest accounts (but guest was expected)
  *
@@ -7,6 +10,7 @@
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
+ * @todo		Better rename this
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +45,5 @@ class UserNoGuestException extends FrameworkException {
 		// Make sure everything is assigned properly
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/user/class_UserPasswordMismatchException.php b/inc/main/exceptions/user/class_UserPasswordMismatchException.php
index 366dd10d..a209ce40 100644
--- a/inc/main/exceptions/user/class_UserPasswordMismatchException.php
+++ b/inc/main/exceptions/user/class_UserPasswordMismatchException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User;
+
 /**
  * An exception for mismatching passwords
  *
@@ -40,7 +43,5 @@ class UserPasswordMismatchException extends FrameworkException {
 		// Make sure everything is assigned properly
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/inc/main/exceptions/user/class_UsernameMissingException.php b/inc/main/exceptions/user/class_UsernameMissingException.php
index 2e321ec2..0f45d3c3 100644
--- a/inc/main/exceptions/user/class_UsernameMissingException.php
+++ b/inc/main/exceptions/user/class_UsernameMissingException.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\User;
+
 /**
  * An exception for non-existing usernames
  *
@@ -40,7 +43,5 @@ class UsernameMissingException extends FrameworkException {
 		// Make sure everything is assigned properly
 		parent::__construct($message, $code);
 	}
-}
 
-// [EOF]
-?>
+}
-- 
2.30.2