Continued:

- added more namespaces
- added "import" for CompileableTemplate

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

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 99162e01a22ba3ca552373bea55cacde76ced3be..59a7182a2a943a04b92f9d38d3beac8bfa1095ad 100644 (file)
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Helper\Application;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * A class holding general data about the application and some methods for

diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index fce4dc76d5880b93b7d00ca775ecda758b5f0066..af15cba0a92ea1e9c2e1c869909abb3ce0cacbf9 100644 (file)
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -6,6 +6,7 @@ namespace CoreFramework\Object;
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Template\CompileableTemplate;
 
 // Import SPL stuff
 use \stdClass;

diff --git a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
index 708b5a7017b594ec115bef5f62e0ceb06a0abb45..884341aaaf5dd00a45db7f10dcc6b2e90f5dd95b 100644 (file)
--- a/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/inc/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Template\Xml;
 
 // Import framework stuff
 use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * A decorator for XML template engines which rewrites the XML for compacting

diff --git a/inc/main/classes/helper/captcha/images/class_ImageHelper.php b/inc/main/classes/helper/captcha/images/class_ImageHelper.php
index 17d933fbd2ef7bdfdb88a9db0f0453899f5d6aea..1b4da34461e604189d3ea1b405a457946f9b5cf7 100644 (file)
--- a/inc/main/classes/helper/captcha/images/class_ImageHelper.php
+++ b/inc/main/classes/helper/captcha/images/class_ImageHelper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * A helper for creating images
  *

diff --git a/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php b/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
index 6771c6fb49219f396b9923447c9d847505df3cab..67a4bd8fbe5bcb28a9872f93fb2aa2093b1dc064 100644 (file)
--- a/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
+++ b/inc/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * A helper for generating blocks (div or span) on web pages
  *

diff --git a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
index 430134c92232bd5a4b12e237f90a3f6e7e1b1b2d..0488acf2edb003ab7ff7de04add6c5566c40f58c 100644 (file)
--- a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Helper;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * A helper for constructing web forms
  *

diff --git a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
index ef5c22ab7160d0116fd69ab9dccc37cb067aa993..12a9fab57d9dd526da7cbb7767d27b15ec150049 100644 (file)
--- a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Helper;
 
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * A helper for web links

diff --git a/inc/main/classes/images/extended/class_PngImage.php b/inc/main/classes/images/extended/class_PngImage.php
index 6a6f1d2995692f451b6ab6f9b09386f8d938d850..39c87273ff5435c06664a4f576173ab7fb755c6d 100644 (file)
--- a/inc/main/classes/images/extended/class_PngImage.php
+++ b/inc/main/classes/images/extended/class_PngImage.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Image;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * A PNG image generator

diff --git a/inc/main/classes/mailer/debug/class_DebugMailer.php b/inc/main/classes/mailer/debug/class_DebugMailer.php
index 50243154b4cf63fc3077b6df02f769a32973d2d5..89a631beba7f637216134307f4f30cde731942e4 100644 (file)
--- a/inc/main/classes/mailer/debug/class_DebugMailer.php
+++ b/inc/main/classes/mailer/debug/class_DebugMailer.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Mailer\Debug;
 
 // Import framework stuff
 use CoreFramework\Manager\ManageableApplication;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * A mailer class for debugging purposes only. This class will print the

diff --git a/inc/main/classes/menu/class_BaseMenu.php b/inc/main/classes/menu/class_BaseMenu.php
index 7fa4cef4ca3423245e6b61772a766a183d1879d7..90da4c37f2efd6ab5285b8c308a026261f8c24bb 100644 (file)
--- a/inc/main/classes/menu/class_BaseMenu.php
+++ b/inc/main/classes/menu/class_BaseMenu.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Menu;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * A general menu system class

diff --git a/inc/main/classes/parser/xml/class_XmlParser.php b/inc/main/classes/parser/xml/class_XmlParser.php
index 3057732b49b3819778d29b965bfccc38aa787ed0..13c32eb198dcc86efea3b995b21dafa30db1c5ee 100644 (file)
--- a/inc/main/classes/parser/xml/class_XmlParser.php
+++ b/inc/main/classes/parser/xml/class_XmlParser.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Parser\Xml;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * A Xml Parser class
  *

diff --git a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
index c0c10e3eecb6c1fb4d03cf3ecf1f6e6b5f54f478..6fb2d813f4f7939763e4fa0afbe059188a3a5e90 100644 (file)
--- a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
+++ b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Template\Engine;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * A Console template engine class
  *

diff --git a/inc/main/classes/template/html/class_HtmlTemplateEngine.php b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
index 4208814fdc3a17929409ffe032bca26d6d3572b4..3f919856f3025c47847af75b01a8fbefaf04774d 100644 (file)
--- a/inc/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Template\Engine;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * The own template engine for loading caching and sending out the web pages
  * and emails.

diff --git a/inc/main/classes/template/image/class_ImageTemplateEngine.php b/inc/main/classes/template/image/class_ImageTemplateEngine.php
index 022298b4ea59a176130774e968a96503b3fdfce3..92c8a5c656c0083dc198ebb3502f7f20eb306086 100644 (file)
--- a/inc/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/inc/main/classes/template/image/class_ImageTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Template\Engine;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * The own template engine for loading caching and sending out images
  *

diff --git a/inc/main/classes/template/mail/class_MailTemplateEngine.php b/inc/main/classes/template/mail/class_MailTemplateEngine.php
index b0b0e8719aaa52322bcfefeb769ac5ddb7cfabb9..776c001698767bd712d364723380276b01fa7deb 100644 (file)
--- a/inc/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/inc/main/classes/template/mail/class_MailTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Template\Engine;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * The own template engine for loading caching and sending out images
  *

diff --git a/inc/main/classes/template/menu/class_MenuTemplateEngine.php b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
index 1ebc3aa5f78f945667123a6f9f660f5022e4716a..6e281e94dea14d825d41279fe2c431ea7e6f9cbd 100644 (file)
--- a/inc/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Template\Engine;
+
+// Import framework stuff
+use CoreFramework\Template\CompileableTemplate;
+
 /**
  * A Menu template engine class
  *

diff --git a/inc/main/interfaces/application/class_ManageableApplication.php b/inc/main/interfaces/application/class_ManageableApplication.php
index 382c954750783baaf0da86f5fc7b85e821f25993..5a7a530511c1ebb3da1f4c653bd340c2eab033d6 100644 (file)
--- a/inc/main/interfaces/application/class_ManageableApplication.php
+++ b/inc/main/interfaces/application/class_ManageableApplication.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Manager;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * An interface for managing applications. This can be a lot. E.g.:

diff --git a/inc/main/interfaces/menu/class_RenderableMenu.php b/inc/main/interfaces/menu/class_RenderableMenu.php
index a1549dbfe249e22428cb132361fbace9b1fea9e2..2a9ff94574c7f28fb0ade477a6db0e0c455d6360 100644 (file)
--- a/inc/main/interfaces/menu/class_RenderableMenu.php
+++ b/inc/main/interfaces/menu/class_RenderableMenu.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Menu;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;
+use CoreFramework\Template\CompileableTemplate;
 
 /**
  * An interface for renderable menus