Continued:

- moved $helperInstance and setter/getter to proper class
- renamed extended to png

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

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index d1f8888346560e129d3e433feb01f43dd6c292f7..4b481128041aae298adee3ecf301c608ce063e49 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -15,7 +15,6 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
 use Org\Mxchange\CoreFramework\Handler\Handleable;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
 use Org\Mxchange\CoreFramework\Handler\Handleable;

-use Org\Mxchange\CoreFramework\Helper\Helper;

 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;


@@ -95,11 +94,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        private $iteratorInstance = NULL;
 
         */
        private $iteratorInstance = NULL;
 

-       /**
-        * A helper instance for the form
-        */
-       private $helperInstance = NULL;
-

        /**
         * An instance of a InputStream class
         */
        /**
         * An instance of a InputStream class
         */


@@ -566,25 +560,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $this->wrapperInstance;
        }
 
                return $this->wrapperInstance;
        }
 

-       /**
-        * Setter for helper instance
-        *
-        * @param       $helperInstance         An instance of a helper class
-        * @return      void
-        */
-       protected final function setHelperInstance (Helper $helperInstance) {
-               $this->helperInstance = $helperInstance;
-       }
-
-       /**
-        * Getter for helper instance
-        *
-        * @return      $helperInstance         An instance of a helper class
-        */
-       public final function getHelperInstance () {
-               return $this->helperInstance;
-       }
-

        /**
         * Getter for a InputStream instance
         *
        /**
         * Getter for a InputStream instance
         *

diff --git a/framework/main/classes/helper/captcha/class_BaseCaptcha.php b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
index 8005d064591ae9c49570d8880581d6f235ba801b..b31ddf31be0142cd07a8426327eaab990c31a468 100644 (file)
--- a/framework/main/classes/helper/captcha/class_BaseCaptcha.php
+++ b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
@@ -7,6 +7,7 @@ use Org\Mxchange\CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Helper\BaseHelper;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Helper\BaseHelper;

+use Org\Mxchange\CoreFramework\Helper\Helper;

 
 /**
  * A general captcha
 
 /**
  * A general captcha


@@ -36,6 +37,11 @@ abstract class BaseCaptcha extends BaseHelper {
         */
        private $rngInstance = NULL;
 
         */
        private $rngInstance = NULL;
 

+       /**
+        * A helper instance for the form
+        */
+       private $helperInstance = NULL;
+

        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *


@@ -66,6 +72,25 @@ abstract class BaseCaptcha extends BaseHelper {
                return $this->rngInstance;
        }
 
                return $this->rngInstance;
        }
 

+       /**
+        * Setter for helper instance
+        *
+        * @param       $helperInstance         An instance of a helper class
+        * @return      void
+        */
+       protected final function setHelperInstance (Helper $helperInstance) {
+               $this->helperInstance = $helperInstance;
+       }
+
+       /**
+        * Getter for helper instance
+        *
+        * @return      $helperInstance         An instance of a helper class
+        */
+       public final function getHelperInstance () {
+               return $this->helperInstance;
+       }
+

        /**
         * Initializes the random number generator (RNG)
         *
        /**
         * Initializes the random number generator (RNG)
         *

diff --git a/framework/main/classes/images/extended/class_PngImage.php b/framework/main/classes/images/extended/class_PngImage.php
deleted file mode 100644 (file)
index c8b46aa..0000000
--- a/framework/main/classes/images/extended/class_PngImage.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-// Own namespace
-namespace Org\Mxchange\CoreFramework\Image;
-
-// Import framework stuff
-use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
-use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
-
-// Import SPL stuff
-use \SplFileInfo;
-
-/**
- * A PNG image generator
- *
- * @author             Roland Haeder <webmaster@shipsimu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.shipsimu.org
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class PngImage extends BaseImage {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this image class
-        *
-        * @param       $templateInstance       A template instance
-        * @return      $imageInstance          An instance of this image class
-        */
-       public static final function createPngImage(CompileableTemplate $templateInstance) {
-               // Get a new instance
-               $imageInstance = new PngImage();
-
-               // Set template instance
-               $imageInstance->setTemplateInstance($templateInstance);
-
-               // Set image type
-               $imageInstance->setImageType('png');
-
-               // Return the instance
-               return $imageInstance;
-       }
-
-       /**
-        * Finish this image by producing it
-        *
-        * @return      void
-        * @todo Rewrite this to SplFileInfo/Object
-        */
-       public function finishImage () {
-               $this->partialStub('Unfinished method.');
-               return;
-
-               // Call parent method
-               parent::finishImage();
-
-               // Get a file name for our image
-               $cacheFile = $this->getTemplateInstance()->getImageCacheFile();
-
-               // Does it exist?
-               if (FrameworkBootstrap::isReadableFile($cacheFile)) {
-                       // Remove it
-                       unlink($cacheFile->getPathname());
-               } // END - if
-
-               // Finish the image and send it to a cache file
-               imagepng($this->getImageResource(), $cacheFile->getPathname(), 9, PNG_ALL_FILTERS);
-       }
-
-}

diff --git a/framework/main/classes/images/png/class_PngImage.php b/framework/main/classes/images/png/class_PngImage.php
new file mode 100644 (file)
index 0000000..c8b46aa
--- /dev/null
+++ b/framework/main/classes/images/png/class_PngImage.php
@@ -0,0 +1,91 @@
+<?php
+// Own namespace
+namespace Org\Mxchange\CoreFramework\Image;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
+
+// Import SPL stuff
+use \SplFileInfo;
+
+/**
+ * A PNG image generator
+ *
+ * @author             Roland Haeder <webmaster@shipsimu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.shipsimu.org
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class PngImage extends BaseImage {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Creates an instance of this image class
+        *
+        * @param       $templateInstance       A template instance
+        * @return      $imageInstance          An instance of this image class
+        */
+       public static final function createPngImage(CompileableTemplate $templateInstance) {
+               // Get a new instance
+               $imageInstance = new PngImage();
+
+               // Set template instance
+               $imageInstance->setTemplateInstance($templateInstance);
+
+               // Set image type
+               $imageInstance->setImageType('png');
+
+               // Return the instance
+               return $imageInstance;
+       }
+
+       /**
+        * Finish this image by producing it
+        *
+        * @return      void
+        * @todo Rewrite this to SplFileInfo/Object
+        */
+       public function finishImage () {
+               $this->partialStub('Unfinished method.');
+               return;
+
+               // Call parent method
+               parent::finishImage();
+
+               // Get a file name for our image
+               $cacheFile = $this->getTemplateInstance()->getImageCacheFile();
+
+               // Does it exist?
+               if (FrameworkBootstrap::isReadableFile($cacheFile)) {
+                       // Remove it
+                       unlink($cacheFile->getPathname());
+               } // END - if
+
+               // Finish the image and send it to a cache file
+               imagepng($this->getImageResource(), $cacheFile->getPathname(), 9, PNG_ALL_FILTERS);
+       }
+
+}