Continued:

[core.git] / framework / main / classes / images / class_BaseImage.php

diff --git a/framework/main/classes/images/class_BaseImage.php b/framework/main/classes/images/class_BaseImage.php
index df66bc4d3de8f64a7a57ade9d04c9b73ccb62758..0efd8f962b77431eb5e5c777f9789faab8ad5aea 100644 (file)
--- a/framework/main/classes/images/class_BaseImage.php
+++ b/framework/main/classes/images/class_BaseImage.php
@@ -5,14 +5,14 @@ namespace Org\Mxchange\CoreFramework\Image;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
+use Org\Mxchange\CoreFramework\Traits\Template\CompileableTemplateTrait;
 
 /**
  * A general image class
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -30,6 +30,9 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
+       // Load traits
+       use CompileableTemplateTrait;
+
        /**
         * Image type
         */
@@ -38,23 +41,23 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
        /**
         * Width of the image
         */
-       private $width = '';
+       private $width = 0;
 
        /**
         * Height of the image
         */
-       private $height = '';
+       private $height = 0;
 
        /**
         * X/Y
         */
-       private $x = '';
-       private $y = '';
+       private $x = 0;
+       private $y = 0;
 
        /**
         * Font size
         */
-       private $fontSize = '';
+       private $fontSize = 0;
 
        /**
         * Image string
@@ -104,11 +107,6 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
         */
        private $groupable = 'single';
 
-       /**
-        * Template engine instance
-        */
-       private $templateInstance = NULL;
-
        /**
         * Protected constructor
         *
@@ -326,8 +324,8 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
         * @param       $string         String to set in image
         * @return      void
         */
-       public final function setString ($string) {
-               $this->imageString = (string) $string;
+       public final function setString (string $string) {
+               $this->imageString = $string;
        }
 
        /**
@@ -364,8 +362,8 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
         * @param       $name   Name of the image
         * @return      void
         */
-       public final function setImageName ($name) {
-               $this->imageName = (string) $name;
+       public final function setImageName (string $name) {
+               $this->imageName = $name;
        }
 
        /**
@@ -453,25 +451,6 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
                $this->stringName = $stringName;
        }
 
-       /**
-        * Setter for template engine instances
-        *
-        * @param       $templateInstance       An instance of a CompileableTemplate class
-        * @return      void
-        */
-       protected final function setTemplateInstance (CompileableTemplate $templateInstance) {
-               $this->templateInstance = $templateInstance;
-       }
-
-       /**
-        * Getter for template engine instances
-        *
-        * @return      $templateInstance       An instance of a CompileableTemplate class
-        */
-       public final function getTemplateInstance () {
-               return $this->templateInstance;
-       }
-
        /**
         * Finish this image by producing it
         *
@@ -554,7 +533,7 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
                                        // Set the image string
                                        //* DEBUG: */ print __METHOD__.": size={$size}, x={$x}, y={$y}, string={$imageString}<br />\n";
                                        imagestring($this->getImageResource(), $size, $x, $y, $imageString, $foreColor);
-                               } // END - foreach
+                               }
                                break;
                }