From b533086a1f68ee6223aedad543cd8943352f8e31 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 29 Jun 2016 21:47:58 +0200
Subject: [PATCH] Continued a bit: - config-hubmaster.php is long time
deprecated (from very early days) and the 'hub' project is the only one
using it, so why keep it around? - Some (needed by FrameworkInterface)
methods now throw an UnsupportedOperationException indicating that they are
not implemented. - Constructors are not even returning void, they are
constructors (no real method)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
inc/config/class_FrameworkConfiguration.php | 7 ++++-
inc/config/config-hubmaster.php | 30 +------------------
.../classes/class_FrameworkArrayObject.php | 1 -
3 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index a3bcb84a..c61dcf4a 100644
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -182,7 +182,10 @@ class FrameworkConfiguration implements Registerable {
$configKey = self::convertDashesToUnderscores($configKey);
// Is a valid configuration key key provided?
- if ((empty($configKey)) || (!is_string($configKey))) {
+ if (is_null($configKey)) {
+ // Configuration key is null
+ throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
+ } elseif ((empty($configKey)) || (!is_string($configKey))) {
// Entry is empty
throw new ConfigEntryIsEmptyException($this, self::EXCEPTION_CONFIG_KEY_IS_EMPTY);
} elseif ((is_null($configValue)) || (is_array($configValue)) || (is_object($configValue)) || (is_resource($configValue))) {
@@ -363,6 +366,7 @@ class FrameworkConfiguration implements Registerable {
*/
public final function getField ($fieldName) {
// Our super interface "FrameworkInterface" requires this
+ throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
}
/**
@@ -374,6 +378,7 @@ class FrameworkConfiguration implements Registerable {
*/
public function isFieldSet ($fieldName) {
// Our super interface "FrameworkInterface" requires this
+ throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
}
/**
diff --git a/inc/config/config-hubmaster.php b/inc/config/config-hubmaster.php
index bb988da5..f551ef47 100644
--- a/inc/config/config-hubmaster.php
+++ b/inc/config/config-hubmaster.php
@@ -1,31 +1,3 @@
<?php
-/**
- * Configuration entries for connecting to the hub
- *
- * @author Roland Haeder <webmaster@shipsimu.org>
- * @version 0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
- * @license GNU GPL 3.0 or any newer version
- *
- * 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/>.
- */
-
-// Get the configuration instance
-$cfg = FrameworkConfiguration::getSelfInstance();
-
-// CFG: HUB-BOOTSTRAP-NODES
-$cfg->setConfigEntry('hub_bootstrap_nodes', 'tcp://188.138.90.169:9060');
-
-// [EOF]
+// @DEPRECATED
?>
diff --git a/inc/main/classes/class_FrameworkArrayObject.php b/inc/main/classes/class_FrameworkArrayObject.php
index 1bf9446f..a763d5ae 100644
--- a/inc/main/classes/class_FrameworkArrayObject.php
+++ b/inc/main/classes/class_FrameworkArrayObject.php
@@ -33,7 +33,6 @@ class FrameworkArrayObject extends ArrayObject {
* Public constructor for setting real class name
*
* @param $className Real class name
- * @return void
*/
public function __construct ($className) {
$this->realClass = (string) $className;
--
2.39.5