Continued:

[core.git] / framework / main / classes / commands / html / class_HtmlLoginCommand.php

diff --git a/framework/main/classes/commands/html/class_HtmlLoginCommand.php b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
index 77f9be23716bcdbb8f505f7350e0730a4a46bdbf..9b25923d4a0d53c63beb94dbc09e42f03e00ce8e 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -7,8 +7,9 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -18,7 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -41,7 +42,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -52,7 +53,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
         * @param       $resolverInstance       An instance of a command resolver class
         * @return      $commandInstance        An instance a prepared command class
         */
-       public static final function createHtmlLoginCommand (CommandResolver $resolverInstance) {
+       public static final function createHtmlLoginCommand (CommandResolver $resolverInstance): Commandable {
                // Get new instance
                $commandInstance = new HtmlLoginCommand();
 
@@ -70,12 +71,12 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
         */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+       public function execute (Requestable $requestInstance, Responseable $responseInstance): void {
                // Set request instance as extra instance
-               GenericRegistry::getRegistry()->addInstance('extra', $this);
+               ObjectRegistry::getRegistry('generic')->addInstance('extra', $this);
 
                // Get the application instance
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Assign application data with template engine
                $this->getTemplateInstance()->assignApplicationData();
@@ -114,7 +115,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
 
                // Construct the menu in every command. We could do this in BaseCommand class. But this means
                // *every* command has a navigation system and that is want we don't want.
-               $menuInstance = ObjectFactory::createObjectByConfiguredName('login_menu_class', array($applicationInstance));
+               $menuInstance = ObjectFactory::createObjectByConfiguredName('login_menu_class');
 
                // Render the menu
                $menuInstance->renderMenu();
@@ -140,7 +141,7 @@ class HtmlLoginCommand extends BaseCommand implements Commandable {
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void
         */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
+       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance): void {
                // Empty for now
        }