Remove deprecated exceptions

diff --git a/.gitattributes b/.gitattributes
index b40f3156433af0dda9d757daf4f6be0464fc4c55..8a0a0b17b3817d0fc4c5d2cf48abeaa5373d22a1 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -42,7 +42,6 @@ inc/classes/exceptions/database/local_file/class_SavePathIsNoDirectoryException.
 inc/classes/exceptions/database/local_file/class_SavePathReadProtectedException.php -text
 inc/classes/exceptions/database/local_file/class_SavePathWriteProtectedException.php -text
 inc/classes/exceptions/database/wrapper/.htaccess -text
-inc/classes/exceptions/database/wrapper/class_WrapperUserNameNotFoundException.php -text
 inc/classes/exceptions/filter/.htaccess -text
 inc/classes/exceptions/filter/class_FilterChainException.php -text
 inc/classes/exceptions/helper/.htaccess -text
@@ -94,7 +93,6 @@ inc/classes/exceptions/main/class_MissingDecimalsThousandsSeperatorException.php
 inc/classes/exceptions/main/class_MissingMethodException.php -text
 inc/classes/exceptions/main/class_NoArrayCreatedException.php -text
 inc/classes/exceptions/main/class_NoArrayException.php -text
-inc/classes/exceptions/main/class_NoObjectException.php -text
 inc/classes/exceptions/main/class_NullPointerException.php -text
 inc/classes/exceptions/main/class_ResponseHeadersAlreadySentException.php -text
 inc/classes/exceptions/main/class_VariableIsNotSetException.php -text

diff --git a/inc/classes/exceptions/database/wrapper/class_WrapperUserNameNotFoundException.php b/inc/classes/exceptions/database/wrapper/class_WrapperUserNameNotFoundException.php
deleted file mode 100644 (file)
index afeac47..0000000
--- a/inc/classes/exceptions/database/wrapper/class_WrapperUserNameNotFoundException.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * An exception thrown when the database wrapper has not found the username
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- * @todo               This class is no longer used
- * @deprecated
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WrapperUserNameNotFoundException extends DatabaseException {
-       /**
-        * The constructor
-        *
-        * @param       $msgArray       Message from the exception
-        * @param       $code           Code number for the exception
-        * @return      void
-        */
-       public function __construct (array $msgArray, $code) {
-               // Add a message around the missing class
-               $message = sprintf("[%s:%d] Username <span class=\"exception_reason\">%s</span> was not found. Requesting class: <span class=\"exception_reason\">%s</span>",
-                       $msgArray[0]->__toString(),
-                       $this->getLine(),
-                       $msgArray[1]->getUserName(),
-                       $msgArray[1]->__toString()
-               );
-
-               // Call parent constructor
-               parent::__construct($message, $code);
-       }
-}
-
-// [EOF]
-?>

diff --git a/inc/classes/exceptions/main/class_NoObjectException.php b/inc/classes/exceptions/main/class_NoObjectException.php
deleted file mode 100644 (file)
index d50bc9e..0000000
--- a/inc/classes/exceptions/main/class_NoObjectException.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * A deprecated exception which should be replaced with InvalidObjectException
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- * @deprecated
- * @see                InvalidObjectException
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class NoObjectException extends FrameworkException {
-       /**
-        * The constructor
-        *
-        * @param       $string         Name of variable
-        * @param       $code           Code number for the exception
-        * @return      void
-        */
-       public function __construct ($string, $code) {
-               // Add a message around the missing class
-               $message = sprintf("<span class=\"exception_reason\">%s</span> ist kein Objekt!",
-                       $string
-               );
-
-               // Call parent constructor
-               parent::__construct($message, $code);
-       }
-}
-
-// [EOF]
-?>