From a4fd24597fb81048cb411e3f38caf4302fd59d72 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 26 Jan 2024 22:53:58 +0000 Subject: [PATCH] auto fixes + some impl. --- Config/.php-cs-fixer.php | 26 +++++++------- Config/reportLang.php | 2 +- .../findMissingInvalidApiControllerTest.php | 2 +- Helper/Scripts/sitespeedDemoUrls.txt | 36 +++++++++---------- Js/createImages.js | 4 +-- LICENSE.txt | 2 +- 6 files changed, 37 insertions(+), 35 deletions(-) diff --git a/Config/.php-cs-fixer.php b/Config/.php-cs-fixer.php index 7f84d88..a428ed1 100644 --- a/Config/.php-cs-fixer.php +++ b/Config/.php-cs-fixer.php @@ -3,6 +3,7 @@ $finder = PhpCsFixer\Finder::create() ->exclude('MainRepository') ->exclude('vendor') + ->exclude('node_modules') ->exclude('Build') ->in(__DIR__ . '/../../'); @@ -18,18 +19,18 @@ $rules = '{ }, "binary_operator_spaces": { "operators": { - "=": "align", - ".=": "align", - "+=": "align", - "-=": "align", - "*=": "align", - "\/=": "align", - "|=": "align", - "&=": "align", - "=>": "align", - "??=": "align", - ">>=": "align", - "<<=": "align" + "=": "align_single_space_minimal", + ".=": "align_single_space_minimal", + "+=": "align_single_space_minimal", + "-=": "align_single_space_minimal", + "*=": "align_single_space_minimal", + "\/=": "align_single_space_minimal", + "|=": "align_single_space_minimal", + "&=": "align_single_space_minimal", + "=>": "align_single_space_minimal", + "??=": "align_single_space_minimal", + ">>=": "align_single_space_minimal", + "<<=": "align_single_space_minimal" } }, "cast_spaces": { @@ -48,6 +49,7 @@ $rules = '{ "declare_equal_normalize": { "space": "none" }, + "nullable_type_declaration_for_default_null_value": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, diff --git a/Config/reportLang.php b/Config/reportLang.php index 0e6fed0..884e4a6 100755 --- a/Config/reportLang.php +++ b/Config/reportLang.php @@ -2187,7 +2187,7 @@ return [ 'phpOMS\tests\Utils\PermutationTest:testPermute' => ['description' => 'An array can be permuted', 'type' => 'framework'], 'phpOMS\tests\Utils\PermutationTest:testIsPermutation' => ['description' => 'Two string can be checked if they are a permutation of each other', 'type' => 'framework'], 'phpOMS\tests\Utils\PermutationTest:testIsPalindrome' => ['description' => 'A string can be checked if it is a palindrome', 'type' => 'framework'], - 'phpOMS\tests\Utils\PermutationTest:testPermutate' => ['description' => 'An array can be permuted with a permutation key', 'type' => 'framework'], + 'phpOMS\tests\Utils\PermutationTest:testPermute' => ['description' => 'An array can be permuted with a permutation key', 'type' => 'framework'], 'phpOMS\tests\Utils\PermutationTest:testWrongPermuteKeyLength' => ['description' => 'A none-existing permutation key throws a OutOfBoundsException', 'type' => 'framework'], 'phpOMS\tests\Utils\StringCompareTest' => ['description' => 'String comparison / dictionary', 'type' => 'framework'], diff --git a/Helper/Php/findMissingInvalidApiControllerTest.php b/Helper/Php/findMissingInvalidApiControllerTest.php index a6b55fb..c70de70 100644 --- a/Helper/Php/findMissingInvalidApiControllerTest.php +++ b/Helper/Php/findMissingInvalidApiControllerTest.php @@ -28,7 +28,7 @@ function createFunction($name) public function testInvalid{$name}() : void { \$response = new HttpResponse(); - \$request = new HttpRequest(new HttpUri('')); + \$request = new HttpRequest(); \$request->header->account = 1; \$this->module->{$name}(\$request, \$response); diff --git a/Helper/Scripts/sitespeedDemoUrls.txt b/Helper/Scripts/sitespeedDemoUrls.txt index 494134a..2f3cbce 100644 --- a/Helper/Scripts/sitespeedDemoUrls.txt +++ b/Helper/Scripts/sitespeedDemoUrls.txt @@ -21,20 +21,20 @@ http://192.168.178.38/en/admin/monitoring/general http://192.168.178.38/en/admin/monitoring/log/list http://192.168.178.38/en/admin/monitoring/stats http://192.168.178.38/en/admin/audit/list -http://192.168.178.38/en/admin/audit/single?id=1 +http://192.168.178.38/en/admin/audit/view?id=1 http://192.168.178.38/en/organization/organigram http://192.168.178.38/en/organization/unit/list -http://192.168.178.38/en/organization/unit/profile?id=1 +http://192.168.178.38/en/organization/unit/view?id=1 http://192.168.178.38/en/organization/department/list -http://192.168.178.38/en/organization/department/profile?id=1 +http://192.168.178.38/en/organization/department/view?id=1 http://192.168.178.38/en/organization/position/list -http://192.168.178.38/en/organization/position/profile?id=1 +http://192.168.178.38/en/organization/position/view?id=1 http://192.168.178.38/en/messages/dashboard http://192.168.178.38/en/messages/template/list -http://192.168.178.38/en/messages/template/single?id=1 +http://192.168.178.38/en/messages/template/view?id=1 http://192.168.178.38/en/calendar/dashboard http://192.168.178.38/en/profile/list -http://192.168.178.38/en/profile/single?id=2 +http://192.168.178.38/en/profile/view?id=2 http://192.168.178.38/en/media/list http://192.168.178.38/en/media/upload http://192.168.178.38/en/media/file/create @@ -46,7 +46,7 @@ http://192.168.178.38/en/news/create http://192.168.178.38/en/news/draft/list http://192.168.178.38/en/news/analysis http://192.168.178.38/en/editor/list -http://192.168.178.38/en/editor/single?id=1 +http://192.168.178.38/en/editor/view?id=1 http://192.168.178.38/en/orw/resource/list http://192.168.178.38/en/kanban/dashboard http://192.168.178.38/en/kanban/board?id=1 @@ -55,7 +55,7 @@ http://192.168.178.38/en/contract/list http://192.168.178.38/en/contract/type/list http://192.168.178.38/en/survey/list http://192.168.178.38/en/wiki/dashboard -http://192.168.178.38/en/wiki/doc/single?id=1 +http://192.168.178.38/en/wiki/doc/view?id=1 http://192.168.178.38/en/wiki/category/list http://192.168.178.38/en/wiki/list http://192.168.178.38/en/qa/dashboard @@ -68,16 +68,16 @@ http://192.168.178.38/en/checklist/list http://192.168.178.38/en/dbeditor/list http://192.168.178.38/en/dbeditor/editor http://192.168.178.38/en/tag/list -http://192.168.178.38/en/tag/single?id=1 +http://192.168.178.38/en/tag/view?id=1 http://192.168.178.38/en/workflow/instance/list http://192.168.178.38/en/workflow/template/list -http://192.168.178.38/en/workflow/template/profile?id=1 +http://192.168.178.38/en/workflow/template/view?id=1 http://192.168.178.38/en/private/timerecording/dashboard http://192.168.178.38/en/private/support/dashboard http://192.168.178.38/en/private/purchase/recognition/dashboard http://192.168.178.38/en/private/purchase/bill?id=1 http://192.168.178.38/en/private/investment/list -http://192.168.178.38/en/finance/investment/profile?id=1 +http://192.168.178.38/en/finance/investment/view?id=1 http://192.168.178.38/en/businessexpenses/expense/list http://192.168.178.38/en/businessexpenses/expense?id=1 http://192.168.178.38/en/cms/application/list @@ -90,9 +90,9 @@ http://192.168.178.38/en/cms/application/theme?app=2 http://192.168.178.38/en/item/attribute/type/list http://192.168.178.38/en/item/attribute/type?id=1 http://192.168.178.38/en/item/list -http://192.168.178.38/en/item/profile?id=3 +http://192.168.178.38/en/item/view?id=3 http://192.168.178.38/en/sales/client/list -http://192.168.178.38/en/sales/client/profile?id=1 +http://192.168.178.38/en/sales/client/view?id=1 http://192.168.178.38/en/sales/client/attribute/type/list http://192.168.178.38/en/sales/client/attribute/type?id=1 http://192.168.178.38/en/sales/item/list @@ -105,7 +105,7 @@ http://192.168.178.38/en/sales/analysis/bill http://192.168.178.38/en/sales/analysis/region http://192.168.178.38/en/sales/analysis/rep http://192.168.178.38/en/purchase/supplier/list -http://192.168.178.38/en/purchase/supplier/profile?id=1 +http://192.168.178.38/en/purchase/supplier/view?id=1 http://192.168.178.38/en/purchase/supplier/attribute/type/list http://192.168.178.38/en/purchase/supplier/attribute/type?id=1 http://192.168.178.38/en/purchase/item/list @@ -127,7 +127,7 @@ http://192.168.178.38/en/accounting/coa/list http://192.168.178.38/en/admin/group/settings?id=1#c-tab-1 http://192.168.178.38/en/accounting/stack/list http://192.168.178.38/en/finance/investment/list -http://192.168.178.38/en/finance/investment/profile?id=1 +http://192.168.178.38/en/finance/investment/view?id=1 http://192.168.178.38/en/finance/loan/list http://192.168.178.38/en/marketing/promotion/list http://192.168.178.38/en/marketing/event/list @@ -142,16 +142,16 @@ http://192.168.178.38/en/support/list http://192.168.178.38/en/support/settings/dashboard http://192.168.178.38/en/support/analysis/dashboard http://192.168.178.38/en/fleet/vehicle/list -http://192.168.178.38/en/fleet/vehicle/profile?id=1 +http://192.168.178.38/en/fleet/vehicle/view?id=1 http://192.168.178.38/en/fleet/driver/list -http://192.168.178.38/en/fleet/driver/profile?id=1 +http://192.168.178.38/en/fleet/driver/view?id=1 http://192.168.178.38/en/fleet/inspection/list http://192.168.178.38/en/fleet/vehicle/attribute/type/list http://192.168.178.38/en/fleet/vehicle/attribute/type?id=1 http://192.168.178.38/en/fleet/driver/attribute/type/list http://192.168.178.38/en/fleet/vehicle/attribute/type?id=1 http://192.168.178.38/en/equipment/list -http://192.168.178.38/en/equipment/equipment/profile?id=1 +http://192.168.178.38/en/equipment/equipment/view?id=1 http://192.168.178.38/en/equipment/inspection/list http://192.168.178.38/en/equipment/attribute/type/list http://192.168.178.38/en/fleet/equipment/attribute/type?id=1 diff --git a/Js/createImages.js b/Js/createImages.js index 4f0404d..bf7ee07 100755 --- a/Js/createImages.js +++ b/Js/createImages.js @@ -47,12 +47,12 @@ const src = [ __dirname + '/../../Modules/Help/Docs/Help/img/help-general-module-list.png' ], [ - 'http://192.168.178.38/en/backend/help/module/single?id=Admin', + 'http://192.168.178.38/en/backend/help/module/view?id=Admin', '//*[@id="content"]', __dirname + '/../../Modules/Help/Docs/Help/img/help-general-module-readme.png' ], [ - 'http://192.168.178.38/en/backend/help/module/single?id=Admin&page=Dev%2Fstructure', + 'http://192.168.178.38/en/backend/help/module/view?id=Admin&page=Dev%2Fstructure', '//*[@id="content"]', __dirname + '/../../Modules/Help/Docs/Help/img/help-general-module-structure.png' ], diff --git a/LICENSE.txt b/LICENSE.txt index 18d430e..4ba0161 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -27,7 +27,7 @@ Version 2.0 Subject to the terms and conditions of this License, each Contributor grants to You after purchase a perpetual, worldwide, non-exclusive, irrevocable copyright license to prepare Derivative Works of, publicly display, publicly perform the Work and such Derivative Works in Source or Object form. You are not allowed to sublicense, reproduce, or distribute the Work and such Derivative Works in Source or Object form. -3. Redistribution. +3. Redistribution You may not reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form.