X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ftemplate%2Fxml%2Fclass_BaseXmlTemplateEngine.php;h=039b45df0fc344edf1a40e6b4d421cd55093a461;hb=2218902056efcf9a2c66fe7c24995e066bd7cd11;hp=84680b8d5dee4dc5688cf194491c06c4d03cbcf6;hpb=ef7a7e55c59c9e887e6bb09c8c02b8126309f716;p=core.git

diff --git a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
index 84680b8d..039b45df 100644
--- a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
+++ b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
@@ -4,13 +4,14 @@ namespace Org\Mxchange\CoreFramework\Template\Engine\Xml;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Factory\Template\XmlTemplateEngineFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 use Org\Mxchange\CoreFramework\Template\Xml\CompileableXmlTemplate;
-use Org\Mxchange\CoreFramework\Traits\Stacker\StackableTrait;
+use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait;
 use Org\Mxchange\CoreFramework\Traits\Template\CompileableTemplateTrait;
 use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 
@@ -115,7 +116,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 		$this->typePrefix      = $typePrefix;
 
 		// Get template instance
-		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+		$applicationInstance = ApplicationHelper::getSelfInstance();
 
 		// Determine base path
 		$templateBasePath = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('application_base_path') . FrameworkBootstrap::getRequestInstance()->getRequestElement('app') . '/';
@@ -124,9 +125,6 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 		if (empty($templateBasePath)) {
 			// Base path is empty
 			throw new BasePathIsEmptyException($this, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif (!is_string($templateBasePath)) {
-			// Is not a string
-			throw new InvalidBasePathStringException(array($this, $templateBasePath), self::EXCEPTION_INVALID_STRING);
 		} elseif (!is_dir($templateBasePath)) {
 			// Is not a path
 			throw new BasePathIsNoDirectoryException(array($this, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME);
@@ -373,7 +371,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 		}
 
 		// Get a XmlParser instance
-		$parserInstance = ObjectFactory::createObjectByConfiguredName('xml_parser_class', array($this));
+		$parserInstance = ObjectFactory::createObjectByConfiguredName('xml_parser_class', [$this]);
 
 		// Check if XML compacting is enabled
 		if ($this->isXmlCompactingEnabled()) {