From e3a33819f61e7a75bff08af3b7bbb51164140b13 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 26 Jan 2024 22:53:59 +0000 Subject: [PATCH] auto fixes + some impl. --- Admin/Routes/Web/Backend.php | 30 +++++----- Controller/BackendController.php | 1 - Theme/Backend/Lang/Navigation.de.lang.php | 24 ++++---- Theme/Backend/Lang/Navigation.en.lang.php | 24 ++++---- Theme/Backend/Lang/de.lang.php | 4 +- Theme/Backend/Lang/en.lang.php | 4 +- tests/Autoloader.php | 4 +- tests/Bootstrap.php | 71 +++++++++++++---------- 8 files changed, 86 insertions(+), 76 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index f9673dd..536d748 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/controlling/budget/dashboard.*$' => [ + '^.*/controlling/budget/dashboard(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingDashboard', 'verb' => RouteVerb::GET, @@ -17,7 +17,7 @@ return [ ], ], ], - '^.*/controlling/budget/pl.*$' => [ + '^.*/controlling/budget/pl(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingIncomeStatement', 'verb' => RouteVerb::GET, @@ -28,7 +28,7 @@ return [ ], ], ], - '^.*/controlling/budget/balance.*$' => [ + '^.*/controlling/budget/balance(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingBalance', 'verb' => RouteVerb::GET, @@ -39,7 +39,7 @@ return [ ], ], ], - '^.*/controlling/budget/sales.*$' => [ + '^.*/controlling/budget/sales(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingSales', 'verb' => RouteVerb::GET, @@ -50,7 +50,7 @@ return [ ], ], ], - '^.*/controlling/budget/material.*$' => [ + '^.*/controlling/budget/material(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingMaterial', 'verb' => RouteVerb::GET, @@ -61,7 +61,7 @@ return [ ], ], ], - '^.*/controlling/budget/opex.*$' => [ + '^.*/controlling/budget/opex(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingOpex', 'verb' => RouteVerb::GET, @@ -72,7 +72,7 @@ return [ ], ], ], - '^.*/controlling/budget/hr.*$' => [ + '^.*/controlling/budget/hr(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingHR', 'verb' => RouteVerb::GET, @@ -83,7 +83,7 @@ return [ ], ], ], - '^.*/controlling/budget/investment.*$' => [ + '^.*/controlling/budget/investment(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingInvestment', 'verb' => RouteVerb::GET, @@ -94,7 +94,7 @@ return [ ], ], ], - '^.*/controlling/budget/loan.*$' => [ + '^.*/controlling/budget/loan(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingLoan', 'verb' => RouteVerb::GET, @@ -105,7 +105,7 @@ return [ ], ], ], - '^.*/controlling/budget/cashflow.*$' => [ + '^.*/controlling/budget/cashflow(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingCashFlow', 'verb' => RouteVerb::GET, @@ -116,7 +116,7 @@ return [ ], ], ], - '^.*/controlling/budget/profitcenter.*$' => [ + '^.*/controlling/budget/profitcenter(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingProfitCenter', 'verb' => RouteVerb::GET, @@ -127,7 +127,7 @@ return [ ], ], ], - '^.*/controlling/budget/projects.*$' => [ + '^.*/controlling/budget/projects(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingProjects', 'verb' => RouteVerb::GET, @@ -138,7 +138,7 @@ return [ ], ], ], - '^.*/controlling/budget/marketing.*$' => [ + '^.*/controlling/budget/marketing(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingMarketing', 'verb' => RouteVerb::GET, @@ -149,7 +149,7 @@ return [ ], ], ], - '^.*/controlling/budget/event.*$' => [ + '^.*/controlling/budget/event(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingEvent', 'verb' => RouteVerb::GET, @@ -160,7 +160,7 @@ return [ ], ], ], - '^.*/controlling/budget/leasing.*$' => [ + '^.*/controlling/budget/leasing(\?.*$|$)' => [ [ 'dest' => '\Modules\BudgetManagement\Controller\BackendController:viewBudgetingLeasing', 'verb' => RouteVerb::GET, diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ed665bd..041bb51 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\BudgetManagement\Controller; -use Modules\ItemManagement\Models\Attribute\ItemAttributeMapper; use Modules\ItemManagement\Models\Attribute\ItemAttributeTypeMapper; use phpOMS\Contract\RenderableInterface; use phpOMS\Message\RequestAbstract; diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index 8e7c447..4ef26b3 100644 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -13,17 +13,17 @@ declare(strict_types=1); return ['Navigation' => [ - 'Budgeting' => 'Planung', - 'Dashboard' => 'Dashboard', + 'Budgeting' => 'Planung', + 'Dashboard' => 'Dashboard', 'IncomeStatement' => 'GuV', - 'Material' => 'Material', - 'OPEX' => 'SBA', - 'Event' => 'Event', - 'Leasing' => 'Leasing', - 'HR' => 'HR', - 'Investment' => 'Investitionen', - 'Loan' => 'Darlehen', - 'Cashflow' => 'Cashflow', - 'ProfitCenter' => 'Profit Center', - 'Projects' => 'Projekte', + 'Material' => 'Material', + 'OPEX' => 'SBA', + 'Event' => 'Event', + 'Leasing' => 'Leasing', + 'HR' => 'HR', + 'Investment' => 'Investitionen', + 'Loan' => 'Darlehen', + 'Cashflow' => 'Cashflow', + 'ProfitCenter' => 'Profit Center', + 'Projects' => 'Projekte', ]]; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 163f122..52daee6 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,17 +13,17 @@ declare(strict_types=1); return ['Navigation' => [ - 'Budgeting' => 'Budgeting', - 'Dashboard' => 'Dashboard', + 'Budgeting' => 'Budgeting', + 'Dashboard' => 'Dashboard', 'IncomeStatement' => 'Income Statement', - 'Material' => 'Material', - 'OPEX' => 'OPEX', - 'Event' => 'Event', - 'Leasing' => 'Leasing', - 'HR' => 'HR', - 'Investment' => 'Investment', - 'Loan' => 'Loan', - 'Cashflow' => 'Cashflow', - 'ProfitCenter' => 'Profit Center', - 'Projects' => 'Projects', + 'Material' => 'Material', + 'OPEX' => 'OPEX', + 'Event' => 'Event', + 'Leasing' => 'Leasing', + 'HR' => 'HR', + 'Investment' => 'Investment', + 'Loan' => 'Loan', + 'Cashflow' => 'Cashflow', + 'ProfitCenter' => 'Profit Center', + 'Projects' => 'Projects', ]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 7fedbb9..757aa59 100644 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -13,7 +13,7 @@ declare(strict_types=1); return ['BudgetManagement' => [ - 'Segments' => 'Segmente', + 'Segments' => 'Segmente', 'Customers' => 'Kunden', - 'Monthly' => 'Monatlich', + 'Monthly' => 'Monatlich', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index fd8daac..18f73bb 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,7 +13,7 @@ declare(strict_types=1); return ['BudgetManagement' => [ - 'Segments' => 'Segments', + 'Segments' => 'Segments', 'Customers' => 'Customers', - 'Monthly' => 'Monthly', + 'Monthly' => 'Monthly', ]]; diff --git a/tests/Autoloader.php b/tests/Autoloader.php index 81da6bc..3133cab 100644 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -75,8 +75,8 @@ final class Autoloader */ public static function defaultAutoloader(string $class) : void { - $class = \ltrim($class, '\\'); - $class = \strtr($class, '_\\', '//'); + $class = \ltrim($class, '\\'); + $class = \strtr($class, '_\\', '//'); if (\stripos($class, 'Web/Backend') !== false || \stripos($class, 'Web/Api') !== false) { $class = \is_dir(__DIR__ . '/Web') ? $class : \str_replace('Web/', 'MainRepository/Web/', $class); diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index ddc049d..c9e41e5 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -1,4 +1,15 @@ [ + 'db' => [ 'core' => [ 'masters' => [ - 'admin' => [ + 'admin' => [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ @@ -80,7 +91,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'insert' => [ + 'insert' => [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ @@ -90,7 +101,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'select' => [ + 'select' => [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ @@ -100,7 +111,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'update' => [ + 'update' => [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ @@ -110,7 +121,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'delete' => [ + 'delete' => [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ @@ -120,7 +131,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'schema' => [ + 'schema' => [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ @@ -132,7 +143,7 @@ $CONFIG = [ ], ], 'postgresql' => [ - 'admin' => [ + 'admin' => [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ @@ -142,7 +153,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'insert' => [ + 'insert' => [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ @@ -152,7 +163,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'select' => [ + 'select' => [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ @@ -162,7 +173,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'update' => [ + 'update' => [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ @@ -172,7 +183,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'delete' => [ + 'delete' => [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ @@ -182,7 +193,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'schema' => [ + 'schema' => [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ @@ -194,37 +205,37 @@ $CONFIG = [ ], ], 'sqlite' => [ - 'admin' => [ + 'admin' => [ 'db' => 'sqlite', /* db type */ 'database' => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'insert' => [ + 'insert' => [ 'db' => 'sqlite', /* db type */ 'database' => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'select' => [ + 'select' => [ 'db' => 'sqlite', /* db type */ 'database' => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'update' => [ + 'update' => [ 'db' => 'sqlite', /* db type */ 'database' => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'delete' => [ + 'delete' => [ 'db' => 'sqlite', /* db type */ 'database' => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'schema' => [ + 'schema' => [ 'db' => 'sqlite', /* db type */ 'database' => __DIR__ . '/../Karaka/phpOMS/Localization/Defaults/localization.sqlite', /* db name */ 'weight' => 1000, /* db table prefix */ @@ -232,7 +243,7 @@ $CONFIG = [ ], ], 'mssql' => [ - 'admin' => [ + 'admin' => [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ @@ -242,7 +253,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'insert' => [ + 'insert' => [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ @@ -252,7 +263,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'select' => [ + 'select' => [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ @@ -262,7 +273,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'update' => [ + 'update' => [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ @@ -272,7 +283,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'delete' => [ + 'delete' => [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ @@ -282,7 +293,7 @@ $CONFIG = [ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], - 'schema' => [ + 'schema' => [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ @@ -322,16 +333,16 @@ $CONFIG = [ 'password' => '123456', ], ], - 'log' => [ + 'log' => [ 'file' => [ 'path' => __DIR__ . '/Logs', ], ], - 'page' => [ + 'page' => [ 'root' => '/', 'https' => false, ], - 'app' => [ + 'app' => [ 'path' => __DIR__, 'default' => [ 'app' => 'Backend', @@ -350,7 +361,7 @@ $CONFIG = [ ], ], ], - 'socket' => [ + 'socket' => [ 'master' => [ 'host' => '127.0.0.1', 'limit' => 300, @@ -360,7 +371,7 @@ $CONFIG = [ 'language' => [ 'en', ], - 'apis' => [ + 'apis' => [ ], ];