X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ftemplate%2Fimage%2Fclass_ImageTemplateEngine.php;h=e24d8cac936f2011ed2a76aa0900f99fc4222431;hb=f861d6bc00f8a3ecf6b057f2aa93129572643896;hp=d01ec650e400b105b3eb6925f07949a575d3f103;hpb=498e6b065ce47804bff4e1073592a2cc8e28f8ef;p=core.git diff --git a/framework/main/classes/template/image/class_ImageTemplateEngine.php b/framework/main/classes/template/image/class_ImageTemplateEngine.php index d01ec650..e24d8cac 100644 --- a/framework/main/classes/template/image/class_ImageTemplateEngine.php +++ b/framework/main/classes/template/image/class_ImageTemplateEngine.php @@ -4,15 +4,17 @@ namespace Org\Mxchange\CoreFramework\Template\Engine; // 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\Filesystem\InvalidDirectoryException; +use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Image\BaseImage; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Parser\Parseable; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Response\Responseable; use Org\Mxchange\CoreFramework\Template\CompileableTemplate; use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine; -use Org\Mxchange\CoreFramework\Utils\String\StringUtils; +use Org\Mxchange\CoreFramework\Utils\Strings\StringUtils; // Import SPL stuff use \SplFileInfo; @@ -23,7 +25,7 @@ use \UnexpectedValueException; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -85,7 +87,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * * @return void */ - protected function __construct () { + private function __construct () { // Call parent constructor parent::__construct(__CLASS__); } @@ -105,7 +107,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl $templateInstance = new ImageTemplateEngine(); // Get the application instance from registry - $applicationInstance = GenericRegistry::getRegistry()->getInstance('application'); + $applicationInstance = ApplicationHelper::getSelfInstance(); // Determine base path $templateBasePath = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/'; @@ -114,9 +116,6 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl if (empty($templateBasePath)) { // Base path is empty throw new UnexpectedValueException(sprintf('[%s:%d] Variable templateBasePath is empty.', $templateInstance->__toString(), __LINE__), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); - } elseif (!is_string($templateBasePath)) { - // Is not a string - throw new UnexpectedValueException(sprintf('[%s:%d] %s is not a string with a base path.', $templateInstance->__toString(), __LINE__, $templateBasePath), self::EXCEPTION_INVALID_STRING); } elseif (!is_dir($templateBasePath)) { // Is not a path throw new InvalidDirectoryException(array($templateInstance, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME); @@ -197,7 +196,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @return void * @throws InvalidXmlNodeException If an unknown/invalid XML node name was found */ - public function startElement ($resource, $element, array $attributes) { + public function startElement ($resource, string $element, array $attributes) { // Initial method name which will never be called... $methodName = 'initImage'; @@ -214,7 +213,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl $methodName = 'setImageProperty' . StringUtils::convertToClassName($element); } elseif ($element != 'image') { // Invalid node name found - throw new InvalidXmlNodeException(array($this, $element, $attributes), Parseable::EXCEPTION_XML_NODE_UNKNOWN); + throw new InvalidXmlNodeException([$this, $element, $attributes], Parseable::EXCEPTION_XML_NODE_UNKNOWN); } // Call method @@ -230,10 +229,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @return void * @throws XmlNodeMismatchException If current main node mismatches the closing one */ - public function finishElement ($resource, $nodeName) { - // Make all lower-case - $nodeName = strtolower($nodeName); - + public function finishElement ($resource, string $nodeName) { // Does this match with current main node? //* DEBUG: */ echo "END: >".$nodeName."<
\n"; if (($nodeName != $this->getCurrMainNode()) && (in_array($nodeName, $this->getMainNodes()))) { @@ -259,7 +255,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @return void * @todo Find something usefull with this! */ - public function characterHandler ($resource, $characters) { + public function characterHandler ($resource, string $characters) { // Trim all spaces away $characters = trim($characters); @@ -267,10 +263,10 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl if (empty($characters)) { // Then skip it silently return; - } // END - if + } // Unfinished work! - $this->partialStub('Handling extra characters is not yet supported!'); + DebugMiddleware::getSelfInstance()->partialStub('Handling extra characters is not yet supported!'); } /** @@ -289,7 +285,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $imageType Code fragment or direct value holding the image type * @return void */ - private function setImageType ($imageType) { + private function setImageType (string $imageType) { // Set group to general $this->setVariableGroup('general'); @@ -300,7 +296,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl $className = StringUtils::convertToClassName($imageType.'_image'); // And try to initiate it - $this->setImageInstance(ObjectFactory::createObjectByName($className, array($this))); + $this->setImageInstance(ObjectFactory::createObjectByName($className, [$this])); // Set current main node to type $this->currMainNode = 'type'; @@ -369,7 +365,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @return void * @see ImageTemplateEngine::setImageResolution */ - private function setImageImageString ($groupable = 'single') { + private function setImageImageString (string $groupable = 'single') { // Call the image class $this->getImageInstance()->initImageString($groupable); @@ -383,7 +379,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $imageName Name of the image * @return void */ - private function setImagePropertyName ($imageName) { + private function setImagePropertyName (string $imageName) { // Call the image class $this->getImageInstance()->setImageName($imageName); } @@ -394,7 +390,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $width Width of the image or variable * @return void */ - private function setImagePropertyWidth ($width) { + private function setImagePropertyWidth (int $width) { // Call the image class $this->getImageInstance()->setWidth($width); } @@ -405,7 +401,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $height Height of the image or variable * @return void */ - private function setImagePropertyHeight ($height) { + private function setImagePropertyHeight (int $height) { // Call the image class $this->getImageInstance()->setHeight($height); } @@ -449,7 +445,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $stringName String name (identifier) * @return void */ - private function setImagePropertyStringName ($stringName) { + private function setImagePropertyStringName (string $stringName) { // Call the image class $this->getImageInstance()->setStringName($stringName); } @@ -460,7 +456,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $fontSize Size of the font * @return void */ - private function setImagePropertyFontSize ($fontSize) { + private function setImagePropertyFontSize (int $fontSize) { // Call the image class $this->getImageInstance()->setFontSize($fontSize); } @@ -471,7 +467,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $imageString Image string to set * @return void */ - private function setImagePropertyText ($imageString) { + private function setImagePropertyText (string $imageString) { // Call the image class $this->getImageInstance()->setString($imageString); } @@ -482,7 +478,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $x X coordinate * @return void */ - private function setImagePropertyX ($x) { + private function setImagePropertyX (int $x) { // Call the image class $this->getImageInstance()->setX($x); } @@ -493,7 +489,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @param $y Y coordinate * @return void */ - private function setImagePropertyY ($y) { + private function setImagePropertyY (int $y) { // Call the image class $this->getImageInstance()->setY($y); } @@ -538,7 +534,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * located in 'image' by default * @return void */ - public function loadImageTemplate ($template) { + public function loadImageTemplate (string $template) { // Set template type $this->setTemplateType(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('image_template_type'));