From: Roland Häder <roland@mxchange.org>
Date: Sun, 6 Dec 2020 11:29:43 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1ea693c1e7ba44465dc7a563c2e523b55d72c37f;p=core.git

Continued:
- replaced InvalidInterfaceException with UnexpectedValueException
- removed that deprecated interface

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php
index 4f1c8ec6..384988b6 100644
--- a/framework/main/classes/mailer/debug/class_DebugMailer.php
+++ b/framework/main/classes/mailer/debug/class_DebugMailer.php
@@ -12,6 +12,9 @@ use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
+// Import SPL stuff
+use \UnexpectedValueException;
+
 /**
  * A mailer class for debugging purposes only. This class will print the
  * prepared mail out and will not send it to the recipient.
@@ -72,7 +75,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
 	 * Deliver email to the recipient(s)
 	 *
 	 * @return	void
-	 * @throws	InvalidInterfaceException	If the recipient instance does not implement ManageableMember
+	 * @throws	UnexpectedValueException	If the recipient instance does not implement ManageableMember
 	 */
 	public function deliverEmail () {
 		// Get template instance
@@ -85,7 +88,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
 				// The recipient should be a user instance, right?
 				if (!$recipientInstance instanceof ManageableMember) {
 					// Invalid entry found!
-					throw new InvalidInterfaceException(array($this, 'ManageableMember'), self::EXCEPTION_REQUIRED_INTERFACE_MISSING);
+					throw new UnexpectedValueException(sprintf('recipientInstance[]=%s does not implement ManageableMember', gettype($recipientInstance)));
 				}
 
 				// User class found, so entry is valid, first load the template
diff --git a/framework/main/exceptions/main/class_InvalidClassNameException.php b/framework/main/exceptions/main/class_InvalidClassNameException.php
deleted file mode 100644
index 7d6dceec..00000000
--- a/framework/main/exceptions/main/class_InvalidClassNameException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED
diff --git a/framework/main/exceptions/main/class_InvalidInterfaceException.php b/framework/main/exceptions/main/class_InvalidInterfaceException.php
deleted file mode 100644
index 1009583a..00000000
--- a/framework/main/exceptions/main/class_InvalidInterfaceException.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-// Own namespace
-namespace Org\Mxchange\CoreFramework\Object;
-
-// Import framework stuff
-use Org\Mxchange\CoreFramework\Generic\FrameworkException;
-
-/**
- * An exception thrown when an class instance does not implement a given interface
- *
- * @author		Roland Haeder <webmaster@shipsimu.org>
- * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
- * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.shipsimu.org
- * 
- * 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 InvalidInterfaceException extends FrameworkException {
-	/**
-	 * The constructor
-	 *
-	 * @param	$classArray		Array with exception data
-	 * @param	$code			Code number for the exception
-	 * @return	void
-	 */
-	public function __construct (array $classArray, int $code) {
-		// Add a message around the missing class
-		$message = sprintf('[%s:%d] Object does not implement expected interface %s.',
-			$classArray[0]->__toString(),
-			$this->getLine(),
-			$classArray[1]
-		);
-
-		// Call parent constructor
-		parent::__construct($message, $code);
-	}
-
-}
diff --git a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php b/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
deleted file mode 100644
index 7d6dceec..00000000
--- a/framework/main/exceptions/main/class_MissingDecimalsThousandsSeparatorException.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-// @DEPRECATED