From 1440aa71d69abfae2e1e0a2abbc7b9b0ec9d9a95 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 19 May 2017 16:35:29 +0200 Subject: [PATCH] Next wave of rewrites: - now request/response is provided by FrameworkBootstrap and no longer needs to be handled all over again to all places - 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/classes/apt-proxy/class_ | 2 +- .../console/class_NodeConsoleAptProxy.php | 2 +- application/hub/classes/chat/class_ | 2 +- .../chat/console/class_NodeConsoleChat.php | 2 +- application/hub/classes/crawler/class_ | 2 +- .../crawler/console/class_NodeConsoleCrawler.php | 2 +- application/hub/classes/cruncher/class_ | 10 +++------- ...ss_NodeDistributedHashTableDatabaseWrapper.php | 3 ++- .../node/class_NodeInformationDatabaseWrapper.php | 3 ++- .../factories/node/class_NodeObjectFactory.php | 6 ++---- application/hub/classes/miner/class_ | 10 +++------- .../hub/classes/nodes/boot/class_HubBootNode.php | 11 ++++------- application/hub/classes/nodes/class_ | 10 +++------- .../hub/classes/nodes/class_BaseHubNode.php | 15 ++++++++------- .../hub/classes/nodes/list/class_HubListNode.php | 6 +----- .../classes/nodes/master/class_HubMasterNode.php | 9 ++------- .../nodes/regular/class_HubRegularNode.php | 6 +----- .../template/class_BaseXmlTemplateEngine.php | 3 ++- .../hub/interfaces/apt-proxy/class_AptProxy.php | 2 +- application/hub/interfaces/chat/class_Chatter.php | 2 +- .../hub/interfaces/crawler/class_Crawler.php | 2 +- .../interfaces/cruncher/class_CruncherHelper.php | 2 +- .../interfaces/helper/nodes/class_NodeHelper.php | 2 +- .../hub/interfaces/miner/class_MinerHelper.php | 2 +- core | 2 +- 25 files changed, 46 insertions(+), 72 deletions(-) diff --git a/application/hub/classes/apt-proxy/class_ b/application/hub/classes/apt-proxy/class_ index 636123729..f9605703e 100644 --- a/application/hub/classes/apt-proxy/class_ +++ b/application/hub/classes/apt-proxy/class_ @@ -55,7 +55,7 @@ class Node???AptProxy extends BaseNodeAptProxy implements AptProxyter { /** * Method to "bootstrap" the apt-proxy. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php index 8432d9bbe..73382b424 100644 --- a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php +++ b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php @@ -56,7 +56,7 @@ class NodeConsoleAptProxy extends BaseNodeAptProxy implements AptProxy, Register /** * Method to "bootstrap" the apt-proxy. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/classes/chat/class_ b/application/hub/classes/chat/class_ index 553875c69..38cba859c 100644 --- a/application/hub/classes/chat/class_ +++ b/application/hub/classes/chat/class_ @@ -55,7 +55,7 @@ class Node???Chat extends BaseNodeChat implements Chatter { /** * Method to "bootstrap" the chatter. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/classes/chat/console/class_NodeConsoleChat.php b/application/hub/classes/chat/console/class_NodeConsoleChat.php index f179307dc..8ceb69842 100644 --- a/application/hub/classes/chat/console/class_NodeConsoleChat.php +++ b/application/hub/classes/chat/console/class_NodeConsoleChat.php @@ -56,7 +56,7 @@ class NodeConsoleChat extends BaseNodeChat implements Chatter, Registerable { /** * Method to "bootstrap" the chatter. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/classes/crawler/class_ b/application/hub/classes/crawler/class_ index eafb128ee..7f8629f22 100644 --- a/application/hub/classes/crawler/class_ +++ b/application/hub/classes/crawler/class_ @@ -54,7 +54,7 @@ class Node???Crawler extends BaseNodeCrawler implements Crawler { /** * Method to "bootstrap" the crawler. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php index 192d3e577..b20687337 100644 --- a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php +++ b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php @@ -56,7 +56,7 @@ class NodeConsoleCrawler extends BaseNodeCrawler implements Crawler, Registerabl /** * Method to "bootstrap" the crawler. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/classes/cruncher/class_ b/application/hub/classes/cruncher/class_ index 2ba92d4b9..cc0e948ab 100644 --- a/application/hub/classes/cruncher/class_ +++ b/application/hub/classes/cruncher/class_ @@ -3,7 +3,7 @@ namespace Hub\Cruncher; // Import framework stuff -use CoreFramework\Request\Requestable; +use CoreFramework\Registry\Registerable; /** * A hub-cruncher class for the '???' mode @@ -44,16 +44,12 @@ class Hub???Cruncher extends BaseHubCruncher implements CruncherHelper, Register /** * Creates an instance of this hub-cruncher class * - * @param $requestInstance An instance of a Requestable class - * @return $cruncherInstance An instance of this hub-cruncher class + * @return $cruncherInstance An instance of this hub-cruncher class */ - public final static function createHub???Cruncher (Requestable $requestInstance) { + public final static function createHub???Cruncher () { // Get a new instance $cruncherInstance = new Hub???Cruncher(); - // Set the request instance - $cruncherInstance->setRequestInstance($requestInstance); - // Return the instance return $cruncherInstance; } diff --git a/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php b/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php index d9d412d46..5815b6525 100644 --- a/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php +++ b/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php @@ -8,6 +8,7 @@ use Hub\Factory\Node\NodeObjectFactory; use Hub\Node\BaseHubNode; // Import framework stuff +use CoreFramework\Bootstrap\FrameworkBootstrap; use CoreFramework\Criteria\Local\LocalSearchCriteria; use CoreFramework\Criteria\Storing\StoreableCriteria; use CoreFramework\Database\Frontend\BaseDatabaseWrapper; @@ -160,7 +161,7 @@ class NodeDistributedHashTableDatabaseWrapper extends BaseDatabaseWrapper implem // Get node/request instances $nodeInstance = NodeObjectFactory::createNodeInstance(); - $requestInstance = ApplicationHelper::getSelfInstance()->getRequestInstance(); + $requestInstance = FrameworkBootstrap::getRequestInstance(); // Get a dataset instance $dataSetInstance = ObjectFactory::createObjectByConfiguredName('dataset_criteria_class', array(self::DB_TABLE_NODE_DHT)); diff --git a/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php b/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php index e8c0d4ec1..df0ffc20d 100644 --- a/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php +++ b/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php @@ -8,6 +8,7 @@ use Hub\Node\BaseHubNode; use Hub\Helper\Node\NodeHelper; // Import framework stuff +use CoreFramework\Bootstrap\FrameworkBootstrap; use CoreFramework\Criteria\Local\LocalSearchCriteria; use CoreFramework\Database\Frontend\BaseDatabaseWrapper; use CoreFramework\Factory\ObjectFactory; @@ -90,7 +91,7 @@ class NodeInformationDatabaseWrapper extends BaseDatabaseWrapper implements Node // Search for the node number one which is hard-coded the default $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR , 1); - $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_MODE, $nodeInstance->getRequestInstance()->getRequestElement('mode')); + $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_MODE, FrameworkBootstrap::getRequestInstance()->getRequestElement('mode')); $searchInstance->setLimit(1); // Get a result back diff --git a/application/hub/classes/factories/node/class_NodeObjectFactory.php b/application/hub/classes/factories/node/class_NodeObjectFactory.php index 727019bc5..c051e9964 100644 --- a/application/hub/classes/factories/node/class_NodeObjectFactory.php +++ b/application/hub/classes/factories/node/class_NodeObjectFactory.php @@ -78,7 +78,7 @@ class NodeObjectFactory extends ObjectFactory { ); // Get the node instance - $nodeInstance = ObjectFactory::createObjectByName($className, array($requestInstance)); + $nodeInstance = ObjectFactory::createObjectByName($className); // Get a registry $applicationInstance = Registry::getRegistry()->getInstance('app'); @@ -99,7 +99,5 @@ class NodeObjectFactory extends ObjectFactory { // Return the instance return $nodeInstance; } -} -// [EOF] -?> +} diff --git a/application/hub/classes/miner/class_ b/application/hub/classes/miner/class_ index 9f0aa4355..46a808e22 100644 --- a/application/hub/classes/miner/class_ +++ b/application/hub/classes/miner/class_ @@ -3,7 +3,7 @@ namespace Hub\Miner; // Import framework stuff -use CoreFramework\Request\Requestable; +use CoreFramework\Registry\Registerable; /** * A hub-miner class for the '???' mode @@ -44,16 +44,12 @@ class Hub???Miner extends BaseHubMiner implements MinerHelper, Registerable { /** * Creates an instance of this hub-miner class * - * @param $requestInstance An instance of a Requestable class - * @return $minerInstance An instance of this hub-miner class + * @return $minerInstance An instance of this hub-miner class */ - public final static function createHub???Miner (Requestable $requestInstance) { + public final static function createHub???Miner () { // Get a new instance $minerInstance = new Hub???Miner(); - // Set the request instance - $minerInstance->setRequestInstance($requestInstance); - // Return the instance return $minerInstance; } diff --git a/application/hub/classes/nodes/boot/class_HubBootNode.php b/application/hub/classes/nodes/boot/class_HubBootNode.php index 97de1bfe0..65533c551 100644 --- a/application/hub/classes/nodes/boot/class_HubBootNode.php +++ b/application/hub/classes/nodes/boot/class_HubBootNode.php @@ -7,11 +7,11 @@ use Hub\Node\BaseHubNode; use Hub\Helper\Node\NodeHelper; // Import framework stuff +use CoreFramework\Bootstrap\FrameworkBootstrap; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Handler\Task\HandleableTask; use CoreFramework\Registry\Registry; use CoreFramework\Registry\Registerable; -use CoreFramework\Request\Requestable; /** * A hub-node class for the 'Boot' mode @@ -52,13 +52,10 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable { * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public static final function createHubBootNode (Requestable $requestInstance) { + public static final function createHubBootNode () { // Get a new instance $nodeInstance = new HubBootNode(); - // Set the request instance - $nodeInstance->setRequestInstance($requestInstance); - // Return the instance return $nodeInstance; } @@ -92,12 +89,12 @@ class HubBootNode extends BaseHubNode implements NodeHelper, Registerable { self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: UNL matches bootstrap node ' . $this->getBootUniversalNodeLocator() . '.'); // Now, does the mode match - if ($this->getRequestInstance()->getRequestElement('mode') == self::NODE_TYPE_BOOT) { + if (FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') == self::NODE_TYPE_BOOT) { // Output debug message self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Our node is a valid bootstrap node.'); } else { // Output warning - self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: WARNING: Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=' . BaseHubNode::NODE_TYPE_BOOT . ' detected.'); + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: WARNING: Mismatching mode ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . '!=' . BaseHubNode::NODE_TYPE_BOOT . ' detected.'); } } else { // IP does match, but no port diff --git a/application/hub/classes/nodes/class_ b/application/hub/classes/nodes/class_ index 614be7947..db94391dd 100644 --- a/application/hub/classes/nodes/class_ +++ b/application/hub/classes/nodes/class_ @@ -7,7 +7,7 @@ use Hub\Node\BaseHubNode; use Hub\Helper\Node\NodeHelper; // Import framework stuff -use CoreFramework\Request\Requestable; +use CoreFramework\Registry\Registerable; /** * A hub-node class for the '???' mode @@ -45,16 +45,12 @@ class Hub???Node extends BaseHubNode implements NodeHelper, Registerable { /** * Creates an instance of this hub-node class * - * @param $requestInstance An instance of a Requestable class - * @return $nodeInstance An instance of this hub-node class + * @return $nodeInstance An instance of this hub-node class */ - public final static function createHub???Node (Requestable $requestInstance) { + public final static function createHub???Node () { // Get a new instance $nodeInstance = new Hub???Node(); - // Set the request instance - $nodeInstance->setRequestInstance($requestInstance); - // Return the instance return $nodeInstance; } diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php index 61e88833b..201fd91bf 100644 --- a/application/hub/classes/nodes/class_BaseHubNode.php +++ b/application/hub/classes/nodes/class_BaseHubNode.php @@ -10,6 +10,7 @@ use Hub\Network\Receive\Receivable; use Hub\Tools\HubTools; // Import framework stuff +use CoreFramework\Bootstrap\FrameworkBootstrap; use CoreFramework\Criteria\Add\AddableCriteria; use CoreFramework\Criteria\Local\LocalSearchCriteria; use CoreFramework\Criteria\Storing\StoreableCriteria; @@ -143,7 +144,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { $this->setPrivateKeyHash($this->getCryptoInstance()->hashString($this->getPrivateKey())); // Register the node id with our wrapper - $this->getWrapperInstance()->registerPrivateKey($this, $this->getRequestInstance(), $searchInstance); + $this->getWrapperInstance()->registerPrivateKey($this, FrameworkBootstrap::getRequestInstance(), $searchInstance); // Output message self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Created new private key with hash: ' . $this->getPrivateKeyHash() . ''); @@ -162,7 +163,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class'); // Generate a pseudo-random string - $randomString = $rngInstance->randomString($length) . ':' . $this->getBootUniversalNodeLocator() . ':' . $this->getRequestInstance()->getRequestElement('mode'); + $randomString = $rngInstance->randomString($length) . ':' . $this->getBootUniversalNodeLocator() . ':' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode'); // Add UUID for even more entropy for the hasher $randomString .= $this->getCryptoInstance()->createUuid(); @@ -264,7 +265,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { // Output all lines self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' '); - self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . $this->getRequestInstance()->getRequestElement('mode') . ' mode active'); + self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' mode active'); self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2015 Hub Developer Team'); self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' '); self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.'); @@ -301,7 +302,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { $this->setNodeId($this->getCryptoInstance()->hashString($this->getCryptoInstance()->encryptString($randomString))); // Register the node id with our wrapper - $this->getWrapperInstance()->registerNodeId($this, $this->getRequestInstance()); + $this->getWrapperInstance()->registerNodeId($this, FrameworkBootstrap::getRequestInstance()); // Output message self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Created new node-id: ' . $this->getNodeId() . ''); @@ -319,7 +320,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { // Search for the node number one which is hard-coded the default $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_NR , 1); - $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_MODE, $this->getRequestInstance()->getRequestElement('mode')); + $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_MODE, FrameworkBootstrap::getRequestInstance()->getRequestElement('mode')); $searchInstance->addCriteria(NodeInformationDatabaseWrapper::DB_COLUMN_NODE_ID , $this->getNodeId()); $searchInstance->setLimit(1); @@ -333,7 +334,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { $this->setSessionId($this->getCryptoInstance()->hashString($this->getCryptoInstance()->encryptString($randomString))); // Register the node id with our wrapper - $this->getWrapperInstance()->registerSessionId($this, $this->getRequestInstance(), $searchInstance); + $this->getWrapperInstance()->registerSessionId($this, FrameworkBootstrap::getRequestInstance(), $searchInstance); // Output message self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BOOTSTRAP: Created new session-id: ' . $this->getSessionId() . ''); @@ -742,7 +743,7 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { * HubRegularNode is faster, but if e.g. HubRegularI2PNode will be * added then the next check will be TRUE. */ - $acceptsRequest = ((!$this instanceof HubRegularNode) && ($this->getRequestInstance()->getRequestElement('mode') != self::NODE_TYPE_REGULAR)); + $acceptsRequest = ((!$this instanceof HubRegularNode) && (FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') != self::NODE_TYPE_REGULAR)); // Return it return $acceptsRequest; diff --git a/application/hub/classes/nodes/list/class_HubListNode.php b/application/hub/classes/nodes/list/class_HubListNode.php index 27e891940..a2e943fa7 100644 --- a/application/hub/classes/nodes/list/class_HubListNode.php +++ b/application/hub/classes/nodes/list/class_HubListNode.php @@ -11,7 +11,6 @@ use CoreFramework\Factory\ObjectFactory; use CoreFramework\Handler\Task\HandleableTask; use CoreFramework\Registry\Registry; use CoreFramework\Registry\Registerable; -use CoreFramework\Request\Requestable; /** * A hub-node class for the 'List' mode @@ -52,13 +51,10 @@ class HubListNode extends BaseHubNode implements NodeHelper, Registerable { * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public static final function createHubListNode (Requestable $requestInstance) { + public static final function createHubListNode () { // Get a new instance $nodeInstance = new HubListNode(); - // Set the request instance - $nodeInstance->setRequestInstance($requestInstance); - // Return the instance return $nodeInstance; } diff --git a/application/hub/classes/nodes/master/class_HubMasterNode.php b/application/hub/classes/nodes/master/class_HubMasterNode.php index f0b070b55..e2f8a2790 100644 --- a/application/hub/classes/nodes/master/class_HubMasterNode.php +++ b/application/hub/classes/nodes/master/class_HubMasterNode.php @@ -11,7 +11,6 @@ use CoreFramework\Factory\ObjectFactory; use CoreFramework\Handler\Task\HandleableTask; use CoreFramework\Registry\Registry; use CoreFramework\Registry\Registerable; -use CoreFramework\Request\Requestable; /** * A hub-node class for the 'Master' mode @@ -49,16 +48,12 @@ class HubMasterNode extends BaseHubNode implements NodeHelper, Registerable { /** * Creates an instance of this hub-node class * - * @param $requestInstance An instance of a Requestable class - * @return $nodeInstance An instance of this hub-node class + * @return $nodeInstance An instance of this hub-node class */ - public static final function createHubMasterNode (Requestable $requestInstance) { + public static final function createHubMasterNode () { // Get a new instance $nodeInstance = new HubMasterNode(); - // Set the request instance - $nodeInstance->setRequestInstance($requestInstance); - // Return the instance return $nodeInstance; } diff --git a/application/hub/classes/nodes/regular/class_HubRegularNode.php b/application/hub/classes/nodes/regular/class_HubRegularNode.php index cb16dd301..085493ec1 100644 --- a/application/hub/classes/nodes/regular/class_HubRegularNode.php +++ b/application/hub/classes/nodes/regular/class_HubRegularNode.php @@ -11,7 +11,6 @@ use CoreFramework\Factory\ObjectFactory; use CoreFramework\Handler\Task\HandleableTask; use CoreFramework\Registry\Registry; use CoreFramework\Registry\Registerable; -use CoreFramework\Request\Requestable; /** * A hub-node class for the 'regular' mode @@ -52,13 +51,10 @@ class HubRegularNode extends BaseHubNode implements NodeHelper, Registerable { * @param $requestInstance An instance of a Requestable class * @return $nodeInstance An instance of this hub-node class */ - public static final function createHubRegularNode (Requestable $requestInstance) { + public static final function createHubRegularNode () { // Get a new instance $nodeInstance = new HubRegularNode(); - // Set the request instance - $nodeInstance->setRequestInstance($requestInstance); - // Return the instance return $nodeInstance; } diff --git a/application/hub/classes/template/class_BaseXmlTemplateEngine.php b/application/hub/classes/template/class_BaseXmlTemplateEngine.php index b59b6d72c..1569e8ba6 100644 --- a/application/hub/classes/template/class_BaseXmlTemplateEngine.php +++ b/application/hub/classes/template/class_BaseXmlTemplateEngine.php @@ -3,6 +3,7 @@ namespace Hub\TemplateEngine\Xml; // Import framework stuff +use CoreFramework\Bootstrap\FrameworkBootstrap; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Registry\Registry; @@ -94,7 +95,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine { $applicationInstance = Registry::getRegistry()->getInstance('app'); // Determine base path - $templateBasePath = $this->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/'; + $templateBasePath = $this->getConfigInstance()->getConfigEntry('application_base_path') . FrameworkBootstrap::getRequestInstance()->getRequestElement('app') . '/'; // Is the base path valid? if (empty($templateBasePath)) { diff --git a/application/hub/interfaces/apt-proxy/class_AptProxy.php b/application/hub/interfaces/apt-proxy/class_AptProxy.php index b0d79b73e..5f6dfbf50 100644 --- a/application/hub/interfaces/apt-proxy/class_AptProxy.php +++ b/application/hub/interfaces/apt-proxy/class_AptProxy.php @@ -34,7 +34,7 @@ interface AptProxy extends FrameworkInterface { /** * Method to "bootstrap" the apt-proxy. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/interfaces/chat/class_Chatter.php b/application/hub/interfaces/chat/class_Chatter.php index 647bb3f1d..78a7522ef 100644 --- a/application/hub/interfaces/chat/class_Chatter.php +++ b/application/hub/interfaces/chat/class_Chatter.php @@ -34,7 +34,7 @@ interface Chatter extends FrameworkInterface { /** * Method to "bootstrap" the chatter. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/interfaces/crawler/class_Crawler.php b/application/hub/interfaces/crawler/class_Crawler.php index 0121b919c..d87d18409 100644 --- a/application/hub/interfaces/crawler/class_Crawler.php +++ b/application/hub/interfaces/crawler/class_Crawler.php @@ -35,7 +35,7 @@ interface Crawler extends FrameworkInterface { /** * Method to "bootstrap" the crawler. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/interfaces/cruncher/class_CruncherHelper.php b/application/hub/interfaces/cruncher/class_CruncherHelper.php index 8872ad10a..ddb3f293e 100644 --- a/application/hub/interfaces/cruncher/class_CruncherHelper.php +++ b/application/hub/interfaces/cruncher/class_CruncherHelper.php @@ -34,7 +34,7 @@ interface CruncherHelper extends FrameworkInterface { /** * Method to "bootstrap" the cruncher. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/interfaces/helper/nodes/class_NodeHelper.php b/application/hub/interfaces/helper/nodes/class_NodeHelper.php index 36d1fc0b5..dbac138ca 100644 --- a/application/hub/interfaces/helper/nodes/class_NodeHelper.php +++ b/application/hub/interfaces/helper/nodes/class_NodeHelper.php @@ -40,7 +40,7 @@ interface NodeHelper extends Helper, AddableCriteria { /** * Method to "bootstrap" the node. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/application/hub/interfaces/miner/class_MinerHelper.php b/application/hub/interfaces/miner/class_MinerHelper.php index d7050acdf..83d6372a7 100644 --- a/application/hub/interfaces/miner/class_MinerHelper.php +++ b/application/hub/interfaces/miner/class_MinerHelper.php @@ -34,7 +34,7 @@ interface MinerHelper extends FrameworkInterface { /** * Method to "bootstrap" the miner. This step does also apply provided * command-line arguments stored in the request instance. You should now - * get it from calling $this->getRequestInstance(). + * get it from calling FrameworkBootstrap::getRequestInstance(). * * @return void */ diff --git a/core b/core index 49fe7de1c..de0fb4d6e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 49fe7de1c03a4424e4f62a70c8ab1eae2593faf0 +Subproject commit de0fb4d6e2785338f2ba881761efc7b15c4a9530 -- 2.39.5