Continued:

- to ease things, EmptyVariableException is no longer deprecated as it nicely
  wraps the message, else if InvalidArgumentException or other SPL exception is
  being used, the message must be copied all around.
- added "import" of EmptyVariableException

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

diff --git a/application/tests/classes/resolver/command/console/class_TestsConsoleCommandResolver.php b/application/tests/classes/resolver/command/console/class_TestsConsoleCommandResolver.php
index c6c5c3cf29875e6d1df339c06f33c97dbe5fa3d9..6b2ca23ec76c6ec9e9097aa6b701fa516d334b26 100644 (file)
--- a/application/tests/classes/resolver/command/console/class_TestsConsoleCommandResolver.php
+++ b/application/tests/classes/resolver/command/console/class_TestsConsoleCommandResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Tests\Resolver\Command;
 
 // Import framework stuff
 use CoreFramework\Command\InvalidCommandException;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Command\BaseCommandResolver;
 use CoreFramework\Resolver\Command\CommandResolver;

diff --git a/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php b/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php
index 1b35dcec1a3b6586adaf5ccd77329f669cd66694..18124fa43fa790c7d1aba983102da636ce52aff3 100644 (file)
--- a/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php
+++ b/application/tests/classes/resolver/controller/class_TestsConsoleControllerResolver.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Tests\Resolver\Controller;
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
 use CoreFramework\Controller\Controller;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Controller\BaseControllerResolver;
 use CoreFramework\Resolver\Controller\ControllerResolver;

diff --git a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
index 1065cc88caa6cc441c25b19d64a8c5d8dd932285..8dc142eacb2e9ba6ac6a216b91b81db281727df6 100644 (file)
--- a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -149,7 +149,6 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT
         * @param       $var    The variable we are looking for
         * @param       $value  The value we want to store in the variable
         * @return      void
-        * @throws      EmptyVariableException  If the variable name is left empty
         */
        public function assignVariable ($var, $value) {
                // Call the inner class' method

diff --git a/inc/main/classes/factories/objects/class_ObjectFactory.php b/inc/main/classes/factories/objects/class_ObjectFactory.php
index a53991f97f894f79803bfc85de9a424ca02b5c13..46d2b6e02ba8b133887cee21acfdf776fbcb1324 100644 (file)
--- a/inc/main/classes/factories/objects/class_ObjectFactory.php
+++ b/inc/main/classes/factories/objects/class_ObjectFactory.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Factory;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Loader\NoClassException;
 
 /**

diff --git a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
index 8ec16e08be99d7e04f4d614fa6c12426016906a0..bb96a952f27254e69ad8e379a55f478c03ebfccb 100644 (file)
--- a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Helper;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;

diff --git a/inc/main/classes/resolver/action/class_BaseActionResolver.php b/inc/main/classes/resolver/action/class_BaseActionResolver.php
index 45ec44c81071295c9592ee9d35c52fd0fbbb05cc..238267b2e98d9c3e4921d0e0f4f59dc2ce9625e6 100644 (file)
--- a/inc/main/classes/resolver/action/class_BaseActionResolver.php
+++ b/inc/main/classes/resolver/action/class_BaseActionResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Action;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Resolver\BaseResolver;
 
 /**

diff --git a/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php b/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php
index d938767c03c83ffd9c21570e4107bf2e7bd635ca..e27ff3f5994d1317b28f9cd01fcb2aa5a763848d 100644 (file)
--- a/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php
+++ b/inc/main/classes/resolver/action/html/class_HtmlActionResolver.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Resolver\Action;
 
 // Import framework stuff
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Request\Requestable;
 

diff --git a/inc/main/classes/resolver/command/class_BaseCommandResolver.php b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
index 6e469a30c64553f93d50068dd0280a0fe7fbda7d..97de03c0b0700d8b7e330b4df79acbf8ef2f34ea 100644 (file)
--- a/inc/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Resolver\Command;
 use CoreFramework\Command\Commandable;
 use CoreFramework\Command\InvalidCommandException;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Resolver\BaseResolver;
 

diff --git a/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php b/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
index ccdec4caff32e2f179a4052d29fdd5ca5a1cac86..daadc60a7ad4d2ef4f45748e8bb161a7d533bb5c 100644 (file)
--- a/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
+++ b/inc/main/classes/resolver/command/console/class_ConsoleCommandResolver.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Resolver\Command;
 // Import framework stuff
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Command\InvalidCommandException;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Command\CommandResolver;
 

diff --git a/inc/main/classes/resolver/command/html/class_HtmlCommandResolver.php b/inc/main/classes/resolver/command/html/class_HtmlCommandResolver.php
index 5a93e74a2aec6f261fbe32a8adff96d2dd41c9e0..8635e913bfcc4791cd14ed395daf5ce841f81173 100644 (file)
--- a/inc/main/classes/resolver/command/html/class_HtmlCommandResolver.php
+++ b/inc/main/classes/resolver/command/html/class_HtmlCommandResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Command;
 
 // Import framework stuff
 use CoreFramework\Command\InvalidCommandException;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Command\CommandResolver;
 

diff --git a/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php b/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php
index 2bd6b383af1dc3643a2f7f43b1026114b760dc04..b62109c758d1190e9fca34cb8b25b5bf3aea6fe6 100644 (file)
--- a/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php
+++ b/inc/main/classes/resolver/command/image/class_ImageCommandResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Command;
 
 // Import framework stuff
 use CoreFramework\Command\InvalidCommandException;
-use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Resolver\Command\CommandResolver;
 
 /**

diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index 97d3607aea3840f32304507c9906e1fed1c0c984..3f906f9fd56e0765962c2f7ee479cc404033dce2 100644 (file)
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Resolver\Controller;
 use CoreFramework\Controller\DefaultControllerException;
 use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Resolver\BaseResolver;
 use CoreFramework\Resolver\Controller\ControllerResolver;
 /**

diff --git a/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
index 500734ea844985683733638b2e03fc3dfde1a65c..191e212ce0e0924a7fd656ba364010244f4a2276 100644 (file)
--- a/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
+++ b/inc/main/classes/resolver/controller/console/class_ConsoleControllerResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Controller\ControllerResolver;
 use CoreFramework\Resolver\Controller\BaseControllerResolver;

diff --git a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
index c48e2749b7e7e22258190396a8f7ff87b2372564..6eeef5999cc21ed760eae5e3b48f3d1c10edd462 100644 (file)
--- a/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
+++ b/inc/main/classes/resolver/controller/html/class_HtmlControllerResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Controller\ControllerResolver;
 use CoreFramework\Resolver\Controller\BaseControllerResolver;

diff --git a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
index 1e4283a1a121f5b36d966ff3e3083aa36693dfc4..18016bb4793ffce3118473cab6f316b7c5512a7c 100644 (file)
--- a/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/main/classes/resolver/controller/image/class_ImageControllerResolver.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Resolver\Controller\ControllerResolver;
 use CoreFramework\Resolver\Controller\BaseControllerResolver;

diff --git a/inc/main/classes/template/class_BaseTemplateEngine.php b/inc/main/classes/template/class_BaseTemplateEngine.php
index 28029d8b77623073c29877d07b2c224ec2ed6218..9cb1411b748c3fe74363b036a998828b052c9f87 100644 (file)
--- a/inc/main/classes/template/class_BaseTemplateEngine.php
+++ b/inc/main/classes/template/class_BaseTemplateEngine.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Generic\EmptyVariableException;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Response\Responseable;

diff --git a/inc/main/exceptions/main/class_EmptyVariableException.php b/inc/main/exceptions/main/class_EmptyVariableException.php
index b50f52241136cf67479294cbcf7a59386bb7af2e..7366afb3ee6b02b2d26855d7fcbed0a48ba5b992 100644 (file)
--- a/inc/main/exceptions/main/class_EmptyVariableException.php
+++ b/inc/main/exceptions/main/class_EmptyVariableException.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Deprecated;
+namespace CoreFramework\Generic;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkException;
@@ -13,7 +13,6 @@ use CoreFramework\Generic\FrameworkException;
  * @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