From 6187a6c39a906ce7ae3ae89cdbc4f6a59a69535d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 Dec 2020 20:24:48 +0100
Subject: [PATCH] Refacturing: - replaced $helperInstance with HelperTrait
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../helper/captcha/class_BaseCaptcha.php      | 30 ++--------
 .../main/traits/helper/class_HelperTrait.php  | 55 +++++++++++++++++++
 2 files changed, 60 insertions(+), 25 deletions(-)
 create mode 100644 framework/main/traits/helper/class_HelperTrait.php

diff --git a/framework/main/classes/helper/captcha/class_BaseCaptcha.php b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
index b31ddf31..0f6ceb7a 100644
--- a/framework/main/classes/helper/captcha/class_BaseCaptcha.php
+++ b/framework/main/classes/helper/captcha/class_BaseCaptcha.php
@@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Helper\BaseHelper;
 use Org\Mxchange\CoreFramework\Helper\Helper;
+use Org\Mxchange\CoreFramework\Traits\Helper\HelperTrait;
 
 /**
  * A general captcha
@@ -31,17 +32,15 @@ use Org\Mxchange\CoreFramework\Helper\Helper;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-abstract class BaseCaptcha extends BaseHelper {
+abstract class BaseCaptcha extends BaseHelper implements Helper {
+	// Load traits
+	use HelperTrait;
+
 	/**
 	 * Instance of a RNG
 	 */
 	private $rngInstance = NULL;
 
-	/**
-	 * A helper instance for the form
-	 */
-	private $helperInstance = NULL;
-
 	/**
 	 * Protected constructor
 	 *
@@ -72,25 +71,6 @@ 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/traits/helper/class_HelperTrait.php b/framework/main/traits/helper/class_HelperTrait.php
new file mode 100644
index 00000000..4f766e95
--- /dev/null
+++ b/framework/main/traits/helper/class_HelperTrait.php
@@ -0,0 +1,55 @@
+<?php
+// Own namespace
+namespace Org\Mxchange\CoreFramework\Traits\Helper;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Helper\Helper;
+
+/**
+ * A trait for helper
+ *
+ * @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/>.
+ */
+trait HelperTrait {
+	/**
+	 * A helper instance for the form
+	 */
+	private $helperInstance = NULL;
+
+	/**
+	 * 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;
+	}
+
+}
-- 
2.39.5