From 28ff0710d8eb3a2d0c1547d6ebeaae05eb50c7f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 1 Dec 2020 23:21:21 +0100
Subject: [PATCH] Continued: - moved $helperInstance and setter/getter to
 proper class - renamed extended to png
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../classes/class_BaseFrameworkSystem.php     | 25 -------------------
 .../helper/captcha/class_BaseCaptcha.php      | 25 +++++++++++++++++++
 .../{extended => png}/class_PngImage.php      |  0
 3 files changed, 25 insertions(+), 25 deletions(-)
 rename framework/main/classes/images/{extended => png}/class_PngImage.php (100%)

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index d1f88883..4b481128 100644
--- 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\Helper\Helper;
 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;
 
-	/**
-	 * A helper instance for the form
-	 */
-	private $helperInstance = NULL;
-
 	/**
 	 * An instance of a InputStream class
 	 */
@@ -566,25 +560,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
 		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
 	 *
diff --git a/framework/main/classes/helper/captcha/class_BaseCaptcha.php b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
index 8005d064..b31ddf31 100644
--- 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\Helper\Helper;
 
 /**
  * A general captcha
@@ -36,6 +37,11 @@ abstract class BaseCaptcha extends BaseHelper {
 	 */
 	private $rngInstance = NULL;
 
+	/**
+	 * A helper instance for the form
+	 */
+	private $helperInstance = NULL;
+
 	/**
 	 * Protected constructor
 	 *
@@ -66,6 +72,25 @@ abstract class BaseCaptcha extends BaseHelper {
 		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)
 	 *
diff --git a/framework/main/classes/images/extended/class_PngImage.php b/framework/main/classes/images/png/class_PngImage.php
similarity index 100%
rename from framework/main/classes/images/extended/class_PngImage.php
rename to framework/main/classes/images/png/class_PngImage.php
-- 
2.39.2