From 76672b33a081a0b64a2d989ab4ead199e322f19a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 7 Nov 2020 14:00:43 +0100 Subject: [PATCH] Continued: - ApplicationHelper now doesn't have all these fields set, BaseApplication holds it - all __construct()'s $className parameter have now a type-hint "string" set - updated core framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/hub/class_ApplicationHelper.php | 85 +---------- .../apt-proxy/class_BaseNodeAptProxy.php | 2 +- .../hub/classes/blocks/class_BaseBlock.php | 2 +- .../hub/classes/chat/class_BaseNodeChat.php | 2 +- application/hub/classes/class_Base | 2 +- .../hub/classes/class_BaseHubSystem.php | 2 +- .../communicator/class_BaseCommunicator.php | 2 +- .../container/class_BaseHubContainer.php | 2 +- .../classes/crawler/class_BaseNodeCrawler.php | 2 +- .../cruncher/class_BaseHubCruncher.php | 2 +- .../frontend/class_BaseHubDatabaseWrapper.php | 2 +- .../hub/classes/decoder/class_BaseDecoder.php | 2 +- application/hub/classes/dht/class_BaseDht.php | 2 +- .../discovery/class_BaseNodeDiscovery.php | 2 +- .../class_BaseRecipientDiscovery.php | 2 +- .../filter/class_BaseAptProxyFilter.php | 2 +- .../classes/filter/class_BaseChatFilter.php | 2 +- .../filter/class_BaseCrawlerFilter.php | 2 +- .../filter/class_BaseCruncherFilter.php | 2 +- .../classes/filter/class_BaseHubFilter.php | 2 +- .../classes/filter/class_BaseMinerFilter.php | 2 +- .../classes/filter/class_BaseNodeFilter.php | 2 +- .../classes/handler/class_BaseHubHandler.php | 2 +- .../class_BaseAnswerStatusHandler.php | 2 +- .../handler/data/class_BaseDataHandler.php | 2 +- .../class_BaseMessageHandler.php | 2 +- .../protocol/class_BaseProtocolHandler.php | 2 +- .../ipv4/class_BaseIpV4ProtocolHandler.php | 2 +- .../raw_data/class_BaseRawDataHandler.php | 2 +- .../helper/class_BaseHubSystemHelper.php | 2 +- .../connection/class_BaseConnectionHelper.php | 2 +- .../ipv4/class_BaseIpV4ConnectionHelper.php | 2 +- .../messages/class_BaseMessageHelper.php | 2 +- .../node/answer/class_BaseHubAnswerHelper.php | 2 +- .../helper/node/class_BaseNodeHelper.php | 2 +- .../work_units/class_BaseWorkUnitHelper.php | 2 +- .../hub/classes/info/class_BaseInfo.php | 2 +- .../info/connection/class_ConnectionInfo.php | 134 +++++++++--------- .../classes/listener/class_BaseListener.php | 2 +- .../listener/class_BaseListenerDecorator.php | 2 +- .../hub/classes/miner/class_BaseHubMiner.php | 2 +- .../hub/classes/nodes/class_BaseHubNode.php | 2 +- .../hub/classes/pools/class_BasePool.php | 2 +- .../classes/producer/class_BaseProducer.php | 2 +- .../cruncher/class_BaseCruncherProducer.php | 2 +- .../cruncher/keys/class_BaseKeyProducer.php | 2 +- .../work_units/class_BaseUnitProducer.php | 2 +- .../miner/blocks/class_BaseBlockProducer.php | 2 +- .../miner/class_BaseMinerProducer.php | 2 +- .../classes/recipient/class_BaseRecipient.php | 2 +- .../protocol/class_BaseProtocolResolver.php | 2 +- .../state/class_BaseStateResolver.php | 2 +- .../hub/classes/source/class_BaseSource.php | 2 +- .../classes/source/class_BaseUrlSource.php | 2 +- .../class_BaseCommunicatorState.php | 2 +- .../states/crawler/class_BaseCrawlerState.php | 2 +- .../cruncher/class_BaseCruncherState.php | 2 +- .../classes/states/dht/class_BaseDhtState.php | 2 +- .../states/miner/class_BaseMinerState.php | 2 +- .../states/node/class_BaseNodeState.php | 2 +- .../states/peer/class_BasePeerState.php | 2 +- .../hub/classes/tags/class_BaseTag.php | 2 +- .../hub/classes/tasks/class_BaseHubTask.php | 2 +- .../tasks/crawler/class_BaseUrlSourceTask.php | 2 +- .../class_BaseXmlAnswerTemplateEngine.php | 2 +- .../template/class_BaseXmlTemplateEngine.php | 2 +- core | 2 +- 67 files changed, 135 insertions(+), 214 deletions(-) diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index df604326b..3da31cd29 100644 --- a/application/hub/class_ApplicationHelper.php +++ b/application/hub/class_ApplicationHelper.php @@ -54,26 +54,6 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate; * along with this program. If not, see . */ class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable { - /** - * The version number of this application - */ - private $appVersion = ''; - - /** - * The human-readable name for this application - */ - private $appName = ''; - - /** - * The short uni*-like name for this application - */ - private $shortName = ''; - - /** - * An instance of this class - */ - private static $selfInstance = NULL; - /** * Private constructor * @@ -91,71 +71,12 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication */ public static final function getSelfInstance () { // Is the instance there? - if (is_null(self::$selfInstance)) { - self::$selfInstance = new ApplicationHelper(); + if (is_null(self::getApplicationInstance())) { + self::setApplicationInstance(new ApplicationHelper()); } // END - if // Return the instance - return self::$selfInstance; - } - - /** - * Getter for the version number - * - * @return $appVersion The application's version number - */ - public final function getAppVersion () { - return $this->appVersion; - } - /** - * Setter for the version number - * - * @param $appVersion The application's version number - * @return void - */ - public final function setAppVersion ($appVersion) { - // Cast and set it - $this->appVersion = (string) $appVersion; - } - - /** - * Getter for human-readable name - * - * @return $appName The application's human-readable name - */ - public final function getAppName () { - return $this->appName; - } - - /** - * Setter for human-readable name - * - * @param $appName The application's human-readable name - * @return void - */ - public final function setAppName ($appName) { - // Cast and set it - $this->appName = (string) $appName;; - } - - /** - * Getter for short uni*-like name - * - * @return $shortName The application's short uni*-like name - */ - public final function getAppShortName () { - return $this->shortName; - } - - /** - * Setter for short uni*-like name - * - * @param $shortName The application's short uni*-like name - * @return void - */ - public final function setAppShortName ($shortName) { - // Cast and set it - $this->shortName = (string) $shortName; + return self::getApplicationInstance(); } /** diff --git a/application/hub/classes/apt-proxy/class_BaseNodeAptProxy.php b/application/hub/classes/apt-proxy/class_BaseNodeAptProxy.php index b549e0cce..474b0410d 100644 --- a/application/hub/classes/apt-proxy/class_BaseNodeAptProxy.php +++ b/application/hub/classes/apt-proxy/class_BaseNodeAptProxy.php @@ -39,7 +39,7 @@ abstract class BaseNodeAptProxy extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/blocks/class_BaseBlock.php b/application/hub/classes/blocks/class_BaseBlock.php index 6d5aec6df..ed0bf261e 100644 --- a/application/hub/classes/blocks/class_BaseBlock.php +++ b/application/hub/classes/blocks/class_BaseBlock.php @@ -34,7 +34,7 @@ abstract class BaseBlock extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/chat/class_BaseNodeChat.php b/application/hub/classes/chat/class_BaseNodeChat.php index bbe184dc6..9c7294219 100644 --- a/application/hub/classes/chat/class_BaseNodeChat.php +++ b/application/hub/classes/chat/class_BaseNodeChat.php @@ -39,7 +39,7 @@ abstract class BaseNodeChat extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/class_Base b/application/hub/classes/class_Base index 8cff4df04..656d46930 100644 --- a/application/hub/classes/class_Base +++ b/application/hub/classes/class_Base @@ -34,7 +34,7 @@ abstract class Base??? extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/class_BaseHubSystem.php b/application/hub/classes/class_BaseHubSystem.php index 28a502610..db95f3288 100644 --- a/application/hub/classes/class_BaseHubSystem.php +++ b/application/hub/classes/class_BaseHubSystem.php @@ -66,7 +66,7 @@ abstract class BaseHubSystem extends BaseFrameworkSystem implements HubInterface * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/communicator/class_BaseCommunicator.php b/application/hub/classes/communicator/class_BaseCommunicator.php index 149f5c232..1c0956e5b 100644 --- a/application/hub/classes/communicator/class_BaseCommunicator.php +++ b/application/hub/classes/communicator/class_BaseCommunicator.php @@ -38,7 +38,7 @@ abstract class BaseCommunicator extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/container/class_BaseHubContainer.php b/application/hub/classes/container/class_BaseHubContainer.php index 4914ac264..3e842fc44 100644 --- a/application/hub/classes/container/class_BaseHubContainer.php +++ b/application/hub/classes/container/class_BaseHubContainer.php @@ -56,7 +56,7 @@ abstract class BaseHubContainer extends BaseContainer implements HubInterface { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-HUB-CONTAINER: className=%s - CONSTRUCTED!', $className)); parent::__construct($className); diff --git a/application/hub/classes/crawler/class_BaseNodeCrawler.php b/application/hub/classes/crawler/class_BaseNodeCrawler.php index ac2d34719..1a37d1049 100644 --- a/application/hub/classes/crawler/class_BaseNodeCrawler.php +++ b/application/hub/classes/crawler/class_BaseNodeCrawler.php @@ -44,7 +44,7 @@ abstract class BaseNodeCrawler extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/cruncher/class_BaseHubCruncher.php b/application/hub/classes/cruncher/class_BaseHubCruncher.php index 59c348f05..7aba23ca4 100644 --- a/application/hub/classes/cruncher/class_BaseHubCruncher.php +++ b/application/hub/classes/cruncher/class_BaseHubCruncher.php @@ -65,7 +65,7 @@ abstract class BaseHubCruncher extends BaseHubSystem implements Updateable { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/database/frontend/class_BaseHubDatabaseWrapper.php b/application/hub/classes/database/frontend/class_BaseHubDatabaseWrapper.php index 85554a15d..67373b655 100644 --- a/application/hub/classes/database/frontend/class_BaseHubDatabaseWrapper.php +++ b/application/hub/classes/database/frontend/class_BaseHubDatabaseWrapper.php @@ -62,7 +62,7 @@ abstract class BaseHubDatabaseWrapper extends BaseDatabaseWrapper implements Hub * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/decoder/class_BaseDecoder.php b/application/hub/classes/decoder/class_BaseDecoder.php index 6ecb17fe4..676c091c4 100644 --- a/application/hub/classes/decoder/class_BaseDecoder.php +++ b/application/hub/classes/decoder/class_BaseDecoder.php @@ -40,7 +40,7 @@ abstract class BaseDecoder extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/dht/class_BaseDht.php b/application/hub/classes/dht/class_BaseDht.php index dc6ba5a00..20432b4a1 100644 --- a/application/hub/classes/dht/class_BaseDht.php +++ b/application/hub/classes/dht/class_BaseDht.php @@ -52,7 +52,7 @@ abstract class BaseDht extends BaseHubSystem implements Distributable { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/discovery/class_BaseNodeDiscovery.php b/application/hub/classes/discovery/class_BaseNodeDiscovery.php index 21b8ec00b..f3b9626c6 100644 --- a/application/hub/classes/discovery/class_BaseNodeDiscovery.php +++ b/application/hub/classes/discovery/class_BaseNodeDiscovery.php @@ -38,7 +38,7 @@ abstract class BaseNodeDiscovery extends BaseDiscovery implements Discoverable { * @param $className Real class name * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php b/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php index 3c71dc22e..aada8e838 100644 --- a/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php +++ b/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php @@ -36,7 +36,7 @@ abstract class BaseRecipientDiscovery extends BaseNodeDiscovery implements Disco * @param $className Real class name * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/filter/class_BaseAptProxyFilter.php b/application/hub/classes/filter/class_BaseAptProxyFilter.php index a8f5801f9..91152286f 100644 --- a/application/hub/classes/filter/class_BaseAptProxyFilter.php +++ b/application/hub/classes/filter/class_BaseAptProxyFilter.php @@ -34,7 +34,7 @@ abstract class BaseAptProxyFilter extends BaseHubFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/filter/class_BaseChatFilter.php b/application/hub/classes/filter/class_BaseChatFilter.php index 0082bbd41..1e291e2d5 100644 --- a/application/hub/classes/filter/class_BaseChatFilter.php +++ b/application/hub/classes/filter/class_BaseChatFilter.php @@ -34,7 +34,7 @@ abstract class BaseChatFilter extends BaseHubFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/filter/class_BaseCrawlerFilter.php b/application/hub/classes/filter/class_BaseCrawlerFilter.php index 0779b1205..0f4fa33d9 100644 --- a/application/hub/classes/filter/class_BaseCrawlerFilter.php +++ b/application/hub/classes/filter/class_BaseCrawlerFilter.php @@ -34,7 +34,7 @@ abstract class BaseCrawlerFilter extends BaseHubFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/filter/class_BaseCruncherFilter.php b/application/hub/classes/filter/class_BaseCruncherFilter.php index 4ea246f94..3d32fbbe1 100644 --- a/application/hub/classes/filter/class_BaseCruncherFilter.php +++ b/application/hub/classes/filter/class_BaseCruncherFilter.php @@ -34,7 +34,7 @@ abstract class BaseCruncherFilter extends BaseHubFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/filter/class_BaseHubFilter.php b/application/hub/classes/filter/class_BaseHubFilter.php index 3eaf20163..614b069a3 100644 --- a/application/hub/classes/filter/class_BaseHubFilter.php +++ b/application/hub/classes/filter/class_BaseHubFilter.php @@ -45,7 +45,7 @@ abstract class BaseHubFilter extends BaseFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/filter/class_BaseMinerFilter.php b/application/hub/classes/filter/class_BaseMinerFilter.php index 47cc97a44..8895a863b 100644 --- a/application/hub/classes/filter/class_BaseMinerFilter.php +++ b/application/hub/classes/filter/class_BaseMinerFilter.php @@ -34,7 +34,7 @@ abstract class BaseMinerFilter extends BaseHubFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/filter/class_BaseNodeFilter.php b/application/hub/classes/filter/class_BaseNodeFilter.php index f8d76f1fb..e72cda9b1 100644 --- a/application/hub/classes/filter/class_BaseNodeFilter.php +++ b/application/hub/classes/filter/class_BaseNodeFilter.php @@ -34,7 +34,7 @@ abstract class BaseNodeFilter extends BaseHubFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/handler/class_BaseHubHandler.php b/application/hub/classes/handler/class_BaseHubHandler.php index 8c5690b2e..76f3903d4 100644 --- a/application/hub/classes/handler/class_BaseHubHandler.php +++ b/application/hub/classes/handler/class_BaseHubHandler.php @@ -76,7 +76,7 @@ abstract class BaseHubHandler extends BaseHandler implements Handleable, HubInte * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/handler/data/answer-status/class_BaseAnswerStatusHandler.php b/application/hub/classes/handler/data/answer-status/class_BaseAnswerStatusHandler.php index e0c13216a..fb660a4a1 100644 --- a/application/hub/classes/handler/data/answer-status/class_BaseAnswerStatusHandler.php +++ b/application/hub/classes/handler/data/answer-status/class_BaseAnswerStatusHandler.php @@ -45,7 +45,7 @@ abstract class BaseAnswerStatusHandler extends BaseDataHandler { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/handler/data/class_BaseDataHandler.php b/application/hub/classes/handler/data/class_BaseDataHandler.php index 4d4918424..a1fa1c001 100644 --- a/application/hub/classes/handler/data/class_BaseDataHandler.php +++ b/application/hub/classes/handler/data/class_BaseDataHandler.php @@ -68,7 +68,7 @@ abstract class BaseDataHandler extends BaseHubHandler implements HubInterface { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/handler/data/message-types/class_BaseMessageHandler.php b/application/hub/classes/handler/data/message-types/class_BaseMessageHandler.php index 742f3791b..463a7c963 100644 --- a/application/hub/classes/handler/data/message-types/class_BaseMessageHandler.php +++ b/application/hub/classes/handler/data/message-types/class_BaseMessageHandler.php @@ -42,7 +42,7 @@ abstract class BaseMessageHandler extends BaseDataHandler { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/handler/protocol/class_BaseProtocolHandler.php b/application/hub/classes/handler/protocol/class_BaseProtocolHandler.php index 5349b6fcd..d89bc6b48 100644 --- a/application/hub/classes/handler/protocol/class_BaseProtocolHandler.php +++ b/application/hub/classes/handler/protocol/class_BaseProtocolHandler.php @@ -41,7 +41,7 @@ abstract class BaseProtocolHandler extends BaseHubHandler implements HandleableP * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/handler/protocol/ipv4/class_BaseIpV4ProtocolHandler.php b/application/hub/classes/handler/protocol/ipv4/class_BaseIpV4ProtocolHandler.php index 62c65a34e..2fa8598c7 100644 --- a/application/hub/classes/handler/protocol/ipv4/class_BaseIpV4ProtocolHandler.php +++ b/application/hub/classes/handler/protocol/ipv4/class_BaseIpV4ProtocolHandler.php @@ -46,7 +46,7 @@ abstract class BaseIpV4ProtocolHandler extends BaseProtocolHandler { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/handler/raw_data/class_BaseRawDataHandler.php b/application/hub/classes/handler/raw_data/class_BaseRawDataHandler.php index 47d55c2ba..96ce1ed5a 100644 --- a/application/hub/classes/handler/raw_data/class_BaseRawDataHandler.php +++ b/application/hub/classes/handler/raw_data/class_BaseRawDataHandler.php @@ -46,7 +46,7 @@ abstract class BaseRawDataHandler extends BaseHubHandler implements HandleableRa * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-RAW-DATA-HANDLER: className=%s - CONSTRUCTED!', $className)); parent::__construct($className); diff --git a/application/hub/classes/helper/class_BaseHubSystemHelper.php b/application/hub/classes/helper/class_BaseHubSystemHelper.php index d29e8c89f..a4d96251f 100644 --- a/application/hub/classes/helper/class_BaseHubSystemHelper.php +++ b/application/hub/classes/helper/class_BaseHubSystemHelper.php @@ -49,7 +49,7 @@ class BaseHubSystemHelper extends BaseHubSystem implements HubHelper { * @param $className Name of the concrete class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php index ba6c6c08d..f31006a58 100644 --- a/application/hub/classes/helper/connection/class_BaseConnectionHelper.php +++ b/application/hub/classes/helper/connection/class_BaseConnectionHelper.php @@ -89,7 +89,7 @@ abstract class BaseConnectionHelper extends BaseHubSystemHelper implements Visit * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/helper/connection/ipv4/class_BaseIpV4ConnectionHelper.php b/application/hub/classes/helper/connection/ipv4/class_BaseIpV4ConnectionHelper.php index 28da8ca1c..09b253748 100644 --- a/application/hub/classes/helper/connection/ipv4/class_BaseIpV4ConnectionHelper.php +++ b/application/hub/classes/helper/connection/ipv4/class_BaseIpV4ConnectionHelper.php @@ -42,7 +42,7 @@ abstract class BaseIpV4ConnectionHelper extends BaseConnectionHelper { * @param $className Name of implementing class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/helper/messages/class_BaseMessageHelper.php b/application/hub/classes/helper/messages/class_BaseMessageHelper.php index 64596133d..51e651848 100644 --- a/application/hub/classes/helper/messages/class_BaseMessageHelper.php +++ b/application/hub/classes/helper/messages/class_BaseMessageHelper.php @@ -40,7 +40,7 @@ abstract class BaseMessageHelper extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/helper/node/answer/class_BaseHubAnswerHelper.php b/application/hub/classes/helper/node/answer/class_BaseHubAnswerHelper.php index 46fe7d598..cb7102062 100644 --- a/application/hub/classes/helper/node/answer/class_BaseHubAnswerHelper.php +++ b/application/hub/classes/helper/node/answer/class_BaseHubAnswerHelper.php @@ -40,7 +40,7 @@ abstract class BaseHubAnswerHelper extends BaseNodeHelper { * @param $className Name of the concrete class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/helper/node/class_BaseNodeHelper.php b/application/hub/classes/helper/node/class_BaseNodeHelper.php index 4e8af42cd..c70cfe306 100644 --- a/application/hub/classes/helper/node/class_BaseNodeHelper.php +++ b/application/hub/classes/helper/node/class_BaseNodeHelper.php @@ -35,7 +35,7 @@ abstract class BaseNodeHelper extends BaseHubSystemHelper { * @param $className Name of the concrete class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php b/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php index ea896ffb8..94b3f225e 100644 --- a/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php +++ b/application/hub/classes/helper/work_units/class_BaseWorkUnitHelper.php @@ -34,7 +34,7 @@ abstract class BaseWorkUnitHelper extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/info/class_BaseInfo.php b/application/hub/classes/info/class_BaseInfo.php index 98360dbee..4cfee87e1 100644 --- a/application/hub/classes/info/class_BaseInfo.php +++ b/application/hub/classes/info/class_BaseInfo.php @@ -34,7 +34,7 @@ abstract class BaseInfo extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/info/connection/class_ConnectionInfo.php b/application/hub/classes/info/connection/class_ConnectionInfo.php index cee8f34fe..851d2098b 100644 --- a/application/hub/classes/info/connection/class_ConnectionInfo.php +++ b/application/hub/classes/info/connection/class_ConnectionInfo.php @@ -110,6 +110,64 @@ class ConnectionInfo extends BaseInfo implements ShareableInfo, Registerable { return $this->connectionType; } + /** + * Getter for protocol name + * + * @return $protocolName Name of used protocol + */ + public final function getProtocolName () { + return $this->protocolName; + } + + /** + * Setter for protocol name + * + * @param $protocolName Name of used protocol + * @return void + */ + protected final function setProtocolName (string $protocolName) { + $this->protocolName = $protocolName; + } + + /** + * Setter for listener instance + * + * @param $listenerInstance A Listenable instance + * @return void + */ + public final function setListenerInstance (Listenable $listenerInstance) { + $this->listenerInstance = $listenerInstance; + } + + /** + * Getter for listener instance + * + * @return $listenerInstance A Listenable instance + */ + public final function getListenerInstance () { + return $this->listenerInstance; + } + + /** + * Getter for address + * + * @return $address Address from shared information + */ + public final function getAddress () { + // Return it from generic array + return $this->getGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_ADDRESS); + } + + /** + * Getter for port + * + * @return $port Port from shared information + */ + public final function getPort () { + // Return it from generic array + return $this->getGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_PORT); + } + /** * Fills the information class with data from a Listenable instance * @@ -118,16 +176,16 @@ class ConnectionInfo extends BaseInfo implements ShareableInfo, Registerable { */ public function fillWithListenerInformation (Listenable $listenerInstance) { // Fill the generic array with several data from the listener: - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: protocolName=' . $listenerInstance->getProtocolName() . ',listenerInstance=' . $listenerInstance->__toString() . ' - CALLED!'); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CONNECTION-INFO: protocolName=%s,listenerInstance=%s - CALLED!', $listenerInstance->getProtocolName(), $listenerInstance->__toString())); $this->setProtocolName($listenerInstance->getProtocolName()); - $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_ADDRESS , $listenerInstance->getListenAddress()); - $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_PORT , $listenerInstance->getListenPort()); + $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_ADDRESS, $listenerInstance->getListenAddress()); + $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_PORT , $listenerInstance->getListenPort()); // Set listener here $this->setListenerInstance($listenerInstance); // Trace message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: EXIT!'); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: EXIT!'); } /** @@ -138,16 +196,16 @@ class ConnectionInfo extends BaseInfo implements ShareableInfo, Registerable { */ public function fillWithConnectionHelperInformation (ConnectionHelper $helperInstance) { // Fill the generic array with several data from the listener: - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: protocolName=' . $helperInstance->getProtocolName() . ',helperInstance=' . $helperInstance->__toString() . ',socketResource=' . $helperInstance->getSocketResource() . ' - CALLED!'); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CONNECTION-INFO: protocolName=%s,helperInstance=%s,socketResource=%s - CALLED!', $helperInstance->getProtocolName(), $helperInstance->__toString(), $helperInstance->getSocketResource())); $this->setProtocolName($helperInstance->getSocketInstance()->getSocketProtocol()); - $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_ADDRESS , $helperInstance->getSocketInstance()->getSocketRecipientAddress()); - $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_PORT , $helperInstance->getSocketInstance()->getSocketRecipientPort()); + $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_ADDRESS, $helperInstance->getSocketInstance()->getSocketRecipientAddress()); + $this->setGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_PORT , $helperInstance->getSocketInstance()->getSocketRecipientPort()); // Set helper here $this->setHelperInstance($helperInstance); // Trace message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: EXIT!'); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: EXIT!'); } /** @@ -180,65 +238,7 @@ class ConnectionInfo extends BaseInfo implements ShareableInfo, Registerable { $this->setSocketInstance($socketInstance); // Trace message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: EXIT!'); - } - - /** - * Getter for address - * - * @return $address Address from shared information - */ - public final function getAddress () { - // Return it from generic array - return $this->getGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_ADDRESS); - } - - /** - * Getter for port - * - * @return $port Port from shared information - */ - public final function getPort () { - // Return it from generic array - return $this->getGenericArrayElement('connection', 'dummy', 'dummy', LocateableNode::UNL_PART_PORT); - } - - /** - * Getter for protocol name - * - * @return $protocolName Name of used protocol - */ - public final function getProtocolName () { - return $this->protocolName; - } - - /** - * Setter for protocol name - * - * @param $protocolName Name of used protocol - * @return void - */ - protected final function setProtocolName (string $protocolName) { - $this->protocolName = $protocolName; - } - - /** - * Setter for listener instance - * - * @param $listenerInstance A Listenable instance - * @return void - */ - public final function setListenerInstance (Listenable $listenerInstance) { - $this->listenerInstance = $listenerInstance; - } - - /** - * Getter for listener instance - * - * @return $listenerInstance A Listenable instance - */ - public final function getListenerInstance () { - return $this->listenerInstance; + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CONNECTION-INFO: EXIT!'); } } diff --git a/application/hub/classes/listener/class_BaseListener.php b/application/hub/classes/listener/class_BaseListener.php index cb6a549cf..3134a9661 100644 --- a/application/hub/classes/listener/class_BaseListener.php +++ b/application/hub/classes/listener/class_BaseListener.php @@ -87,7 +87,7 @@ abstract class BaseListener extends BaseHubSystem implements Visitable { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/listener/class_BaseListenerDecorator.php b/application/hub/classes/listener/class_BaseListenerDecorator.php index d185d9d47..6918df201 100644 --- a/application/hub/classes/listener/class_BaseListenerDecorator.php +++ b/application/hub/classes/listener/class_BaseListenerDecorator.php @@ -63,7 +63,7 @@ abstract class BaseListenerDecorator extends BaseDecorator implements Visitable * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/miner/class_BaseHubMiner.php b/application/hub/classes/miner/class_BaseHubMiner.php index c44f4387b..3215bde1e 100644 --- a/application/hub/classes/miner/class_BaseHubMiner.php +++ b/application/hub/classes/miner/class_BaseHubMiner.php @@ -77,7 +77,7 @@ abstract class BaseHubMiner extends BaseHubSystem implements Updateable { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php index 238c8a388..2791199c7 100644 --- a/application/hub/classes/nodes/class_BaseHubNode.php +++ b/application/hub/classes/nodes/class_BaseHubNode.php @@ -105,7 +105,7 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/pools/class_BasePool.php b/application/hub/classes/pools/class_BasePool.php index 87474f01a..278337cc9 100644 --- a/application/hub/classes/pools/class_BasePool.php +++ b/application/hub/classes/pools/class_BasePool.php @@ -52,7 +52,7 @@ abstract class BasePool extends BaseHubSystem implements Poolable, Visitable { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/producer/class_BaseProducer.php b/application/hub/classes/producer/class_BaseProducer.php index 377191ba1..d39dfba80 100644 --- a/application/hub/classes/producer/class_BaseProducer.php +++ b/application/hub/classes/producer/class_BaseProducer.php @@ -58,7 +58,7 @@ abstract class BaseProducer extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/producer/cruncher/class_BaseCruncherProducer.php b/application/hub/classes/producer/cruncher/class_BaseCruncherProducer.php index 7efeeb97d..d030ad19a 100644 --- a/application/hub/classes/producer/cruncher/class_BaseCruncherProducer.php +++ b/application/hub/classes/producer/cruncher/class_BaseCruncherProducer.php @@ -37,7 +37,7 @@ abstract class BaseCruncherProducer extends BaseProducer { * @param $className Complete class name * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/producer/cruncher/keys/class_BaseKeyProducer.php b/application/hub/classes/producer/cruncher/keys/class_BaseKeyProducer.php index 309e06d3b..644981e61 100644 --- a/application/hub/classes/producer/cruncher/keys/class_BaseKeyProducer.php +++ b/application/hub/classes/producer/cruncher/keys/class_BaseKeyProducer.php @@ -34,7 +34,7 @@ abstract class BaseKeyProducer extends BaseCruncherProducer { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/producer/cruncher/work_units/class_BaseUnitProducer.php b/application/hub/classes/producer/cruncher/work_units/class_BaseUnitProducer.php index 68f4ef9b7..542f4e4f2 100644 --- a/application/hub/classes/producer/cruncher/work_units/class_BaseUnitProducer.php +++ b/application/hub/classes/producer/cruncher/work_units/class_BaseUnitProducer.php @@ -47,7 +47,7 @@ abstract class BaseUnitProducer extends BaseCruncherProducer { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/producer/miner/blocks/class_BaseBlockProducer.php b/application/hub/classes/producer/miner/blocks/class_BaseBlockProducer.php index 901be771a..5c1975770 100644 --- a/application/hub/classes/producer/miner/blocks/class_BaseBlockProducer.php +++ b/application/hub/classes/producer/miner/blocks/class_BaseBlockProducer.php @@ -38,7 +38,7 @@ abstract class BaseBlockProducer extends BaseMinerProducer { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/producer/miner/class_BaseMinerProducer.php b/application/hub/classes/producer/miner/class_BaseMinerProducer.php index 037a109f3..fa43624d3 100644 --- a/application/hub/classes/producer/miner/class_BaseMinerProducer.php +++ b/application/hub/classes/producer/miner/class_BaseMinerProducer.php @@ -44,7 +44,7 @@ abstract class BaseMinerProducer extends BaseProducer { * @param $className Complete class name * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); diff --git a/application/hub/classes/recipient/class_BaseRecipient.php b/application/hub/classes/recipient/class_BaseRecipient.php index 21203f611..75ce8de35 100644 --- a/application/hub/classes/recipient/class_BaseRecipient.php +++ b/application/hub/classes/recipient/class_BaseRecipient.php @@ -34,7 +34,7 @@ abstract class BaseRecipient extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php b/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php index 3c49e2f3d..7675c3227 100644 --- a/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php +++ b/application/hub/classes/resolver/protocol/class_BaseProtocolResolver.php @@ -39,7 +39,7 @@ abstract class BaseProtocolResolver extends BaseHubSystem implements ProtocolRes * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/resolver/state/class_BaseStateResolver.php b/application/hub/classes/resolver/state/class_BaseStateResolver.php index 8bd11c7ab..a3d1cae90 100644 --- a/application/hub/classes/resolver/state/class_BaseStateResolver.php +++ b/application/hub/classes/resolver/state/class_BaseStateResolver.php @@ -45,7 +45,7 @@ abstract class BaseStateResolver extends BaseResolver { * @param $className Name of the real class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/source/class_BaseSource.php b/application/hub/classes/source/class_BaseSource.php index 5e49280e4..c8d61f115 100644 --- a/application/hub/classes/source/class_BaseSource.php +++ b/application/hub/classes/source/class_BaseSource.php @@ -34,7 +34,7 @@ abstract class BaseSource extends BaseHubSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/source/class_BaseUrlSource.php b/application/hub/classes/source/class_BaseUrlSource.php index a1f74fc86..0fe5a8d25 100644 --- a/application/hub/classes/source/class_BaseUrlSource.php +++ b/application/hub/classes/source/class_BaseUrlSource.php @@ -45,7 +45,7 @@ abstract class BaseUrlSource extends BaseSource { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/states/communicator/class_BaseCommunicatorState.php b/application/hub/classes/states/communicator/class_BaseCommunicatorState.php index 3ab6879a1..072fe2dda 100644 --- a/application/hub/classes/states/communicator/class_BaseCommunicatorState.php +++ b/application/hub/classes/states/communicator/class_BaseCommunicatorState.php @@ -42,7 +42,7 @@ abstract class BaseCommunicatorState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/states/crawler/class_BaseCrawlerState.php b/application/hub/classes/states/crawler/class_BaseCrawlerState.php index 956c64af4..db30dfb76 100644 --- a/application/hub/classes/states/crawler/class_BaseCrawlerState.php +++ b/application/hub/classes/states/crawler/class_BaseCrawlerState.php @@ -34,7 +34,7 @@ abstract class BaseCrawlerState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/states/cruncher/class_BaseCruncherState.php b/application/hub/classes/states/cruncher/class_BaseCruncherState.php index e484a1eac..af24a5a64 100644 --- a/application/hub/classes/states/cruncher/class_BaseCruncherState.php +++ b/application/hub/classes/states/cruncher/class_BaseCruncherState.php @@ -34,7 +34,7 @@ abstract class BaseCruncherState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/states/dht/class_BaseDhtState.php b/application/hub/classes/states/dht/class_BaseDhtState.php index fb5dab1b7..1f50132bf 100644 --- a/application/hub/classes/states/dht/class_BaseDhtState.php +++ b/application/hub/classes/states/dht/class_BaseDhtState.php @@ -35,7 +35,7 @@ abstract class BaseDhtState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/states/miner/class_BaseMinerState.php b/application/hub/classes/states/miner/class_BaseMinerState.php index 5ac79417a..4d7d5f3f2 100644 --- a/application/hub/classes/states/miner/class_BaseMinerState.php +++ b/application/hub/classes/states/miner/class_BaseMinerState.php @@ -38,7 +38,7 @@ abstract class BaseMinerState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/states/node/class_BaseNodeState.php b/application/hub/classes/states/node/class_BaseNodeState.php index 3414cc248..432b027c0 100644 --- a/application/hub/classes/states/node/class_BaseNodeState.php +++ b/application/hub/classes/states/node/class_BaseNodeState.php @@ -34,7 +34,7 @@ abstract class BaseNodeState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/states/peer/class_BasePeerState.php b/application/hub/classes/states/peer/class_BasePeerState.php index 9ea49adfd..931a055d0 100644 --- a/application/hub/classes/states/peer/class_BasePeerState.php +++ b/application/hub/classes/states/peer/class_BasePeerState.php @@ -34,7 +34,7 @@ abstract class BasePeerState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/tags/class_BaseTag.php b/application/hub/classes/tags/class_BaseTag.php index 09bf4faee..0f21e5c91 100644 --- a/application/hub/classes/tags/class_BaseTag.php +++ b/application/hub/classes/tags/class_BaseTag.php @@ -42,7 +42,7 @@ abstract class BaseTag extends BaseHubSystem implements Registerable { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/tasks/class_BaseHubTask.php b/application/hub/classes/tasks/class_BaseHubTask.php index 8b944aa10..dc0470e59 100644 --- a/application/hub/classes/tasks/class_BaseHubTask.php +++ b/application/hub/classes/tasks/class_BaseHubTask.php @@ -43,7 +43,7 @@ abstract class BaseHubTask extends BaseTask { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php b/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php index 6e9731104..bcbe41c95 100644 --- a/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php +++ b/application/hub/classes/tasks/crawler/class_BaseUrlSourceTask.php @@ -45,7 +45,7 @@ abstract class BaseUrlSourceTask extends BaseHubTask { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php b/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php index 5f4cb60e3..f5f2e3961 100644 --- a/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php +++ b/application/hub/classes/template/answer/class_BaseXmlAnswerTemplateEngine.php @@ -44,7 +44,7 @@ abstract class BaseXmlAnswerTemplateEngine extends BaseXmlTemplateEngine impleme * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/hub/classes/template/class_BaseXmlTemplateEngine.php b/application/hub/classes/template/class_BaseXmlTemplateEngine.php index b86515537..1a6c627ed 100644 --- a/application/hub/classes/template/class_BaseXmlTemplateEngine.php +++ b/application/hub/classes/template/class_BaseXmlTemplateEngine.php @@ -77,7 +77,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/core b/core index c15d02389..c1aadb61b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c15d02389e67a880e7b4c6b19f2b06722efa4e6f +Subproject commit c1aadb61b45c15273c07c366887c8f58c53155e3 -- 2.39.5