Update master

Karaka-Management · Apr 24, 2024 · 6ef5cb2 · 6ef5cb2
2 parents d5938b6 + 1f8b85b
commit 6ef5cb2
Show file tree

Hide file tree

Showing 234 changed files with 2,346 additions and 1,934 deletions.
diff --git a/.github/workflows/c_template.yml b/.github/workflows/c_template.yml
@@ -0,0 +1,40 @@
+name: CI
+
+on:
+  workflow_call:
+    secrets:
+      GH_TOKEN:
+        required: true
+      GH_PAT:
+        required: true
+      CODECOV_TOKEN:
+        required: true
+
+jobs:
+  codestyle-tests:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'NO_CI')"
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@main
+      with:
+        fetch-depth: 0
+        submodules: recursive
+        token: ${{ secrets.GH_TOKEN }}
+    - name: Checkout Build Repository
+      uses: actions/checkout@main
+      with:
+          fetch-depth: 1
+          ref: develop
+          repository: Karaka-Management/Build
+          path: Build
+    - name: Copy config file
+      run: |
+        cp ./Build/Config/.clang-format ./.clang-format
+    - name: Lint Code Base
+      uses: super-linter/[email protected]
+      env:
+        VALIDATE_ALL_CODEBASE: false
+        VALIDATE_CLANG_FORMAT : true
+        DEFAULT_BRANCH: develop
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/js_template.yml b/.github/workflows/js_template.yml
@@ -0,0 +1,74 @@
+name: CI
+
+on:
+  workflow_call:
+    secrets:
+      GH_TOKEN:
+        required: true
+      GH_PAT:
+        required: true
+      CODECOV_TOKEN:
+        required: true
+
+jobs:
+  codestyle-tests:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'NO_CI')"
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@main
+      with:
+        fetch-depth: 1
+    - name: Checkout Build Repository
+      uses: actions/checkout@main
+      with:
+          fetch-depth: 1
+          ref: develop
+          repository: Karaka-Management/Build
+          path: Build
+    - name: Install NPM
+      uses: actions/setup-node@v3
+      with:
+        node-version: '14'
+        cache: 'npm'
+    - run: npm install
+    - name: eslint
+      run: npx eslint ./ -c Build/Config/.eslintrc.json --fix
+    - name: Check for modified files
+      if: always()
+      id: git-format-check
+      run: echo "modified=$(if git diff-index -G --quiet HEAD --; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT
+    - name: Push changes
+      if: steps.git-format-check.outputs.modified == 'true'
+      run: |
+        git config --global user.name 'Formatter Bot'
+        git config --global user.email '[email protected]'
+        git remote set-url origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}
+        git commit -am "Automated formatting changes (NO_CI)"
+        git push
+  code-tests:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'NO_CI')"
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@main
+      with:
+        fetch-depth: 1
+    - name: Checkout Build Repository
+      uses: actions/checkout@main
+      with:
+          fetch-depth: 1
+          ref: develop
+          repository: Karaka-Management/Build
+          path: Build
+    - name: Install NPM
+      uses: actions/setup-node@v3
+      with:
+        node-version: '14'
+        cache: 'npm'
+    - run: npm install
+    - name: jasmine
+      run: |
+        chmod +x Build/Config/jasmine_build.sh
+        Build/Config/jasmine_build.sh
+        npx jasmine --config=Build/Config/jasmine.json
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,9 +9,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup Node
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: '12.x'
+        node-version: '14'
     - name: Cache dependencies
       id: npm-cache
       run: |
@@ -114,6 +114,17 @@ jobs:
       run: composer install
     - name: phpunit
       run: vendor/bin/phpunit --coverage-clover tests/coverage.xml --configuration tests/phpunit_no_coverage.xml
+    - name: Install NPM
+      uses: actions/setup-node@v3
+      with:
+        node-version: '14'
+        cache: 'npm'
+    - run: npm install
+    - name: jasmine
+      run: |
+        cd jsOMS
+        Build/Config/jasmine_build.sh
+        npx jasmine --config=Build/Config/jasmine.json
   cpp-tests:
     if: "!contains(github.event.head_commit.message, 'NO_CI')"
     strategy:
@@ -220,25 +231,6 @@ jobs:
     - run: npm install
     - name: eslint
       run: npx eslint ./jsOMS -c Build/Config/.eslintrc.json
-  # linting:
-  #   runs-on: ubuntu-latest
-  #   if: "!contains(github.event.head_commit.message, 'NO_CI')"
-  #   strategy:
-  #     fail-fast: false
-  #     max-parallel: 3
-  #   steps:
-  #   - name: Checkout Repository
-  #     uses: actions/checkout@main
-  #     with:
-  #       fetch-depth: 0
-  #       submodules: recursive
-  #       token: ${{ secrets.GH_PAT }}
-  #   - name: Lint Code Base
-  #     uses: github/super-linter/slim@v4
-  #     env:
-  #       VALIDATE_ALL_CODEBASE: false
-  #       DEFAULT_BRANCH: develop
-  #       GITHUB_TOKEN: ${{ secrets.GH_PAT }}
   custom:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'NO_CI')"

diff --git a/.github/workflows/php_template.yml b/.github/workflows/php_template.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
     - name: Checkout Repository
       uses: actions/checkout@main
@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
     - name: Checkout Repository
       uses: actions/checkout@main
@@ -128,7 +128,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
     - name: Checkout Repository
       uses: actions/checkout@main
@@ -176,7 +176,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
     - name: Checkout Repository
       uses: actions/checkout@main
@@ -225,7 +225,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
     - name: Checkout Repository
       uses: actions/checkout@main
@@ -268,7 +268,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.3']
     steps:
     - name: Checkout Repository
       uses: actions/checkout@main

diff --git a/Build b/Build
diff --git a/Cli/CliApplication.php b/Cli/CliApplication.php
@@ -2,7 +2,7 @@
 /**
  * Jingga
  *
- * PHP Version 8.1
+ * PHP Version 8.2
  *
  * @package    Cli
  * @copyright  Dennis Eichhorn
@@ -395,15 +395,11 @@ private function create403Response(CliResponse $response, View $pageView) : void
      */
     private function createDefaultPageView(CliRequest $request, CliResponse $response, CliView $pageView) : void
     {
-        /** @var \Modules\Organization\Models\Unit[] $unit */
-        $unit = UnitMapper::getAll()->execute();
-        $pageView->setOrganizations($unit);
+        $pageView->organizations = UnitMapper::getAll()->executeGetArray();
 
-        /** @var \Modules\Profile\Models\Profile $profile */
-        $profile           = ProfileMapper::get()
+        $pageView->profile = ProfileMapper::get()
             ->where('account', $request->header->account)
             ->execute();
-        $pageView->profile = $profile;
 
         $pageView->setTemplate('/Cli/index');
     }

diff --git a/Cli/CliView.php b/Cli/CliView.php
@@ -2,7 +2,7 @@
 /**
  * Jingga
  *
- * PHP Version 8.1
+ * PHP Version 8.2
  *
  * @package   Cli
  * @copyright Dennis Eichhorn
@@ -54,7 +54,7 @@ class CliView extends View
      * @var Unit[]
      * @since 1.0.0
      */
-    protected array $organizations = [];
+    public array $organizations = [];
 
     /**
      * Constructor
@@ -65,25 +65,10 @@ class CliView extends View
      *
      * @since 1.0.0
      */
-    public function __construct(L11nManager $l11n = null, RequestAbstract $request = null, ResponseAbstract $response = null)
+    public function __construct(?L11nManager $l11n = null, ?RequestAbstract $request = null, ?ResponseAbstract $response = null)
     {
         parent::__construct($l11n, $request, $response);
 
         $this->profile = new NullProfile();
     }
-
-    /**
-     * Set organizations
-     *
-     * @param Unit[] $organizations Organizations
-     *
-     * @return void
-     *
-     * @since 1.0.0
-     * @codeCoverageIgnore
-     */
-    public function setOrganizations(array $organizations) : void
-    {
-        $this->organizations = $organizations;
-    }
 }
diff --git a/Cli/Error/lang/de.lang.php b/Cli/Error/lang/de.lang.php
@@ -2,7 +2,7 @@
 /**
  * Jingga
  *
- * PHP Version 8.1
+ * PHP Version 8.2
  *
  * @package   Cli
  * @copyright Dennis Eichhorn

diff --git a/Cli/Error/lang/en.lang.php b/Cli/Error/lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Jingga
  *
- * PHP Version 8.1
+ * PHP Version 8.2
  *
  * @package   Cli
  * @copyright Dennis Eichhorn

diff --git a/Cli/Hooks.php b/Cli/Hooks.php
@@ -5,9 +5,4 @@
             1 => '\Modules\Media\Controller\CliController:runEncryptionChangeFromHook',
         ],
     ],
-    '/.*/' => [
-        'callback' => [
-            0 => '\Modules\Workflow\Controller\CliController:runWorkflowFromHook',
-        ],
-    ],
 ];
diff --git a/Cli/Routes.php b/Cli/Routes.php
@@ -29,32 +29,4 @@
             'verb' => 16,
         ],
     ],
-    '^.*/workflow/instance( .*$|$)' => [
-        0 => [
-            'dest' => '\Modules\Workflow\Controller\CliController:cliWorkflowInstanceCreate',
-            'verb' => 16,
-        ],
-    ],
-    '^/billing/bill/purchase/parse( .*$|$)' => [
-        0 => [
-            'dest' => '\Modules\Billing\Controller\CliController:cliParseSupplierBill',
-            'verb' => 16,
-        ],
-    ],
-    '^/purchase/order/suggestion/create( .*$|$)' => [
-        0 => [
-            'dest' => '\Modules\Purchase\Controller\CliController:cliGenerateOrderSuggestion',
-            'verb' => 16,
-        ],
-    ],
-    '^.*/orw/check -i all*$' => [
-        0 => [
-            'dest' => '\Modules\OnlineResourceWatcher\Controller\ApiController:apiCheckResources',
-            'permission' => [
-                'module' => 'OnlineResourceWatcher',
-                'type' => 4,
-                'state' => 1,
-            ],
-        ],
-    ],
 ];
diff --git a/Cli/index.tpl.php b/Cli/index.tpl.php
@@ -2,7 +2,7 @@
 /**
  * Jingga
  *
- * PHP Version 8.1
+ * PHP Version 8.2
  *
  * @package   Template
  * @copyright Dennis Eichhorn
@@ -12,8 +12,6 @@
  */
 declare(strict_types=1);
 
-use phpOMS\Contract\RenderableInterface;
-
 $dispatch = $this->getData('dispatch') ?? [];
 
 echo \PHP_EOL;

diff --git a/Cli/lang/en.lang.php b/Cli/lang/en.lang.php
@@ -2,7 +2,7 @@
 /**
  * Jingga
  *
- * PHP Version 8.1
+ * PHP Version 8.2
  *
  * @package   Cli
  * @copyright Dennis Eichhorn

diff --git a/Developer-Guide b/Developer-Guide
diff --git a/ICAL.txt → ICLA.txt b/ICAL.txt → ICLA.txt
+1 −1		Backup/cron.sh
+27 −13		Backup/local.sh
+0 −3		Config/.clang-format
+10 −0		Config/jasmine.json
+13 −0		Config/jasmine_build.sh
+0 −251		Config/snippets.code-snippets
+3 −3		Helper/Php/createPhpFromJsonDb.php
+1 −1		Helper/Php/findMissingAdminTest.php
+1 −1		Helper/Php/findMissingApiFunctions.php
+1 −1		Helper/Php/findMissingInvalidApiControllerTest.php
+2 −2		Helper/Php/findMissingNullModelTest.php
+1 −1		Helper/Php/langUsageInspector.php
+1 −1		Helper/Php/reconcileTestReportElements.php
+13 −13		Helper/Scripts/release.sh
+644 −0		Helper/Scripts/screenshots.js
+0 −0		ICLA.txt
+0 −10		Js/build.sh
+0 −0		Js/build3D.sh
+0 −0		Js/buildBase.sh
+0 −27		Js/buildChart.sh
+0 −11		Js/buildLib.sh
+0 −10		Js/buildMath.sh
+0 −0		Js/buildSocket.sh
+0 −0		Js/buildUI.sh
+4 −0		LICENSE.txt
+1 −1		README.md
+0 −0		ICLA.txt
+0 −8		SUMMARY.md
+2 −2		application/concepts/tables.md
+1 −1		general/first_steps.md
+9 −8		general/setup.md
+1 −1		phpOMS/basics/language_files.md
+1 −1		phpOMS/basics/views.md
+1 −1		phpOMS/datastorage/cache.md
+1 −1		phpOMS/datastorage/session.md
+2 −2		phpOMS/services/localization.md
+62 −22		quality/inspections.md
+1 −1		standards/cpp.md
+2 −2		standards/documentation.md
+1 −1		standards/general.md