Merge pull request #335 from dotkernel/issue-330

Replace controllers with handlers
The foundation of version 6

Author: arhimede

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 - 2024 DotKernel (https://www.dotkernel.com)
+Copyright (c) 2020 - 2024 Dotkernel (https://www.dotkernel.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -27,12 +27,12 @@ Documentation is available at: https://docs.dotkernel.org/admin-documentation/
 [![Qodana](https://github.com/dotkernel/admin/actions/workflows/qodana_code_quality.yml/badge.svg?branch=5.0)](https://github.com/dotkernel/admin/actions/workflows/qodana_code_quality.yml)
 [![PHPStan](https://github.com/dotkernel/admin/actions/workflows/static-analysis.yml/badge.svg?branch=5.0)](https://github.com/dotkernel/admin/actions/workflows/static-analysis.yml)
 
-## Installing DotKernel `admin`
+## Installing Dotkernel `admin`
 
 ## Tools
 
-DotKernel can be installed through a single command that utilizes [Composer](https://getcomposer.org/). Because of that,
-Composer is required to install DotKernel `admin`.
+Dotkernel can be installed through a single command that utilizes [Composer](https://getcomposer.org/). Because of that,
+Composer is required to install Dotkernel `admin`.
 
 ### Composer
 
@@ -44,19 +44,19 @@ Installation instructions:
 >If you have never used composer before make sure you read
 >the [`Composer Basic Usage`](https://getcomposer.org/doc/01-basic-usage.md) section in Composer's documentation
 
-## Choosing an installation path for DotKernel `admin`
+## Choosing an installation path for Dotkernel `admin`
 
 Example:
 
 - absolute path `/var/www/dk-admin`
 - or relative path `dk-admin` (equivalent with `./dk-admin`)
 
-## Installing DotKernel `admin`
+## Installing Dotkernel `admin`
 
-After choosing the path for DotKernel (`dk-admin` will be used for the remainder of this example) it must be installed.
+After choosing the path for Dotkernel (`dk-admin` will be used for the remainder of this example) it must be installed.
 There are two installation methods.
 
-### I. Installing DotKernel `admin` using composer
+### I. Installing Dotkernel `admin` using composer
 
 >please use the below CLI commands in terminal, do NOT use the PhpStorm buttons
 
@@ -73,7 +73,7 @@ The setup script prompts for some configuration settings, for example the lines
       [1] config/config.php
       Make your selection (default is 1):
 
-Simply select `[0] Do not inject`, because DotKernel includes its own configProvider which already contains the prompted
+Simply select `[0] Do not inject`, because Dotkernel includes its own configProvider which already contains the prompted
 configurations.
 
 If you choose `[1] config/config.php` Laminas's `ConfigProvider` from `session` will be injected.
@@ -84,7 +84,7 @@ The next question is:
 
 Type `y` here, and hit `enter`
 
-### II. Installing DotKernel `admin` using git clone
+### II. Installing Dotkernel `admin` using git clone
 
 This method requires more manual input, but it ensures that the default branch is installed, even if it is not released.
 Run the following command:
@@ -95,7 +95,7 @@ The dependencies have to be installed separately, by running this command
 
     composer install
 
-Just like for `II Installing DotKernel admin using composer` (see above), the setup asks for configuration settings
+Just like for `II Installing Dotkernel admin using composer` (see above), the setup asks for configuration settings
 regarding injections (type `0` and hit `enter`) and a confirmation to use this setting for other packages (type `y` and
 hit `enter`)
 
@@ -248,7 +248,7 @@ If you are still getting exceptions or errors regarding some missing services, t
 
 - Open a web browser and visit `http://localhost:8080/`
 
-You should see the `DotKernel admin` login page.
+You should see the `Dotkernel admin` login page.
 
 If you ran the migrations you will have an admin user in the database with the following credentials:
 

composer.json

@@ -13,7 +13,7 @@
     ],
     "authors": [
         {
-            "name": "DotKernel Team",
+            "name": "Dotkernel Team",
             "email": "team@dotkernel.com"
         }
     ],
@@ -31,7 +31,6 @@
         "ext-gettext": "*",
         "dotkernel/dot-cache": "^4.0",
         "dotkernel/dot-cli": "^3.5.0",
-        "dotkernel/dot-controller": "^3.4.3",
         "dotkernel/dot-data-fixtures": "^1.1.3",
         "dotkernel/dot-dependency-injection": "^1.0",
         "dotkernel/dot-errorhandler": "^4.0.0",
@@ -72,6 +71,8 @@
         "psr-4": {
             "Admin\\App\\": "src/App/src/",
             "Admin\\Admin\\": "src/Admin/src/",
+            "Admin\\Page\\": "src/Page/src/",
+            "Admin\\Dashboard\\": "src/Dashboard/src/",
             "Admin\\Setting\\": "src/Setting/src/"
         }
     },
@@ -92,7 +93,6 @@
         "development-disable": "laminas-development-mode disable",
         "development-enable": "laminas-development-mode enable",
         "development-status": "laminas-development-mode status",
-        "mezzio": "mezzio --ansi",
         "check": [
             "@cs-check",
             "@test",
@@ -104,7 +104,6 @@
         "serve": "php -S 0.0.0.0:8080 -t public/",
         "static-analysis": "phpstan analyse --memory-limit 1G",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "twig-cs-check": "vendor/bin/twig-cs-fixer lint --config=config/twig-cs-fixer.php",
         "twig-cs-fix": "vendor/bin/twig-cs-fixer lint --config=config/twig-cs-fixer.php --fix"
     }

config/autoload/local.php.dist

@@ -30,6 +30,11 @@ return [
         'name' => $app['name'] ?? '',
         'url'  => $baseUrl,
     ],
+    'routes'      => [
+        'page' => [
+            'component'      => 'components',
+        ],
+    ],
     'databases'   => $databases,
     'doctrine'    => [
         'connection' => [

config/autoload/navigation.global.php

@@ -14,9 +14,8 @@
                         [
                             'options' => [
                                 'label' => 'Dashboard',
-                                'uri'   => '/',
                                 'route' => [
-                                    'route_name' => 'dashboard',
+                                    'route_name' => 'dashboard::dashboard-view',
                                 ],
                                 'icon'  => 'c-blue-500 ti-home',
                             ],
@@ -31,23 +30,26 @@
                                 [
                                     'options' => [
                                         'label' => 'Admins',
-                                        'uri'   => '/admin/list',
+                                        'route' => [
+                                            'route_name' => 'admin::admin-list',
+                                        ],
                                     ],
                                 ],
                                 [
                                     'options' => [
                                         'label' => 'Logins',
-                                        'uri'   => '/admin/logins',
+                                        'route' => [
+                                            'route_name' => 'admin::admin-login-list',
+                                        ],
                                     ],
                                 ],
                             ],
                         ],
                         [
                             'options' => [
                                 'label' => 'Components',
-                                'uri'   => '/page/components',
                                 'route' => [
-                                    'route_name' => 'page',
+                                    'route_name' => 'page::components',
                                 ],
                                 'icon'  => 'c-pink-500 ti-palette',
                             ],
@@ -63,10 +65,7 @@
                             'options' => [
                                 'label' => 'Profile',
                                 'route' => [
-                                    'route_name'   => 'admin',
-                                    'route_params' => [
-                                        'action' => 'account',
-                                    ],
+                                    'route_name' => 'admin::account-edit-form',
                                 ],
                                 'icon'  => 'ti-user',
                             ],
@@ -75,10 +74,7 @@
                             'options' => [
                                 'label' => 'Logout',
                                 'route' => [
-                                    'route_name'   => 'admin',
-                                    'route_params' => [
-                                        'action' => 'logout',
-                                    ],
+                                    'route_name' => 'admin::admin-logout',
                                 ],
                                 'icon'  => 'ti-power-off',
                             ],

config/config.php

@@ -51,6 +51,8 @@
     Admin\App\ConfigProvider::class,
     Admin\Admin\ConfigProvider::class,
     Admin\Setting\ConfigProvider::class,
+    Admin\Page\ConfigProvider::class,
+    Admin\Dashboard\ConfigProvider::class,
 
     // Load application config in a pre-defined order in such a way that local settings
     // overwrite global settings. (Loaded as first to last):

data/doctrine/fixtures/AdminLoader.php

@@ -21,7 +21,7 @@ public function load(ObjectManager $manager): void
         $admin = (new Admin())
             ->setIdentity('admin')
             ->setPassword(password_hash('dotadmin', PASSWORD_DEFAULT))
-            ->setFirstName('DotKernel')
+            ->setFirstName('Dotkernel')
             ->setLastName('Admin')
             ->addRole(
                 $manager->getRepository(AdminRole::class)->findOneBy(['name' => AdminRole::ROLE_SUPERUSER])

package.json

@@ -14,7 +14,7 @@
   },
   "keywords": [],
   "author": {
-    "name": "DotKernel Team",
+    "name": "Dotkernel Team",
     "email": "team@dotkernel.com"
   },
   "license": "ISC",

phpstan.neon

@@ -21,8 +21,8 @@ parameters:
             path: src
         -
             message: '#Call to an undefined method Laminas\\Authentication\\AuthenticationServiceInterface::getAdapter\(\)#'
-            path: src/Admin/src/Controller/AdminController.php
+            path: src/Admin/src/Handler/Account/PostAccountLoginHandler.php
         -
             message: '#Call to an undefined method Laminas\\Authentication\\AuthenticationServiceInterface::getStorage\(\)#'
-            path: src/Admin/src/Controller/AdminController.php
+            path: src/Admin/src/Handler/Account/PostAccountLoginHandler.php