Update main with latest engelsystem main

.editorconfig

@@ -45,7 +45,7 @@ indent_size = 4
 [*.sh]
 indent_size = 2
 
-[{db/*.sql,includes/**}]
+[{db/*.sql,includes/**,*.json}]
 max_line_length = unset
 
 [*.{yml,yaml}]

.gitlab-ci.yml

@@ -34,7 +34,7 @@ stages:
   needs:
     - composer install
   before_script:
-    - composer install --no-ansi --no-progress
+    - composer install --no-ansi --no-progress --ignore-platform-req=php
 
 # for jobs that depend on yarn
 .use_yarn: &use_yarn
@@ -62,7 +62,7 @@ composer install:
     - composer audit
     - composer validate
   script:
-    - composer install --no-ansi --no-progress
+    - composer install --no-ansi --no-progress --ignore-platform-req=php
 
 composer audit:
   image: php:latest
@@ -120,6 +120,7 @@ generate-version:
           (git describe --abbrev=0 --tags | tr -d '\n')\
           && echo "-${CI_COMMIT_REF_NAME}+${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}"\
         )\
+        || echo "0-${CI_COMMIT_REF_NAME}+${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}"\
       )"
     - echo "${VERSION}"
     - echo -n "${VERSION}" > storage/app/VERSION
@@ -386,7 +387,7 @@ deploy:
 .kubectl_deployment: &kubectl_deployment
   stage: deploy
   image:
-    name: bitnami/kubectl:latest
+    name: bitnamisecure/kubectl:latest
     entrypoint: [ '' ]
   needs:
     - test

.phpcs.xml

@@ -30,6 +30,7 @@
         <exclude-pattern>/includes</exclude-pattern>
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification" />
     </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue" />
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
         <exclude-pattern>/includes</exclude-pattern>
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />

DEVELOPMENT.md

@@ -229,3 +229,11 @@ If unspecific issues appear try using Docker version >= 20.10.14.
 
 ### `service "es_workspace" is not running`
 Make sure you're running your docker commands from the `docker/dev` directory, not from `docker`
+
+### `main` is broken after pulling the latest commits from upstream
+Try running
+```bash
+composer install
+```
+from this repository's root directory.
+If dependencies have been updated in `composer.json` since you last synced `main`, this should fix it.

bin/pre-commit

@@ -16,7 +16,7 @@ testing 'PHP ⚙️'
 composer validate
 composer phpcs
 composer phpstan
-./vendor/bin/phpunit
+php -d memory_limit=-1 ./vendor/bin/phpunit
 
 testing 'translations 🗺️'
 find resources/lang -type f -name '*.po' -exec sh -c 'msgfmt "${1%.*}.po" -o"${1%.*}.mo"' shell {} \;

composer.json

@@ -24,8 +24,8 @@
             "phpcbf -p"
         ],
         "phpstan": "phpstan",
-        "phpunit": "phpunit",
-        "phpunit:coverage": "phpunit --coverage-text --coverage-html ./public/coverage/"
+        "phpunit": "php -d memory_limit=-1 vendor/bin/phpunit",
+        "phpunit:coverage": "php -d memory_limit=-1 vendor/bin/phpunit --coverage-text --coverage-html ./public/coverage/"
     },
     "require": {
         "php": ">=8.2.0",
@@ -35,14 +35,17 @@
         "ext-pdo": "*",
         "ext-simplexml": "*",
         "ext-xml": "*",
-        "erusev/parsedown": "^1.7",
+        "bacon/bacon-qr-code": "^3.0",
+        "firebase/php-jwt": "^6.11",
         "gettext/gettext": "^5.7",
         "gettext/translator": "^1.2",
-        "guzzlehttp/guzzle": "^7.9",
-        "illuminate/container": "^11.27",
-        "illuminate/database": "^11.27",
-        "illuminate/support": "^11.27",
-        "laravel/serializable-closure": "^1.3",
+        "guzzlehttp/guzzle": "^7.10",
+        "illuminate/container": "^12.39",
+        "illuminate/database": "^12.39",
+        "illuminate/pagination": "^12.39",
+        "illuminate/support": "^12.39",
+        "laravel/serializable-closure": "^2.0",
+        "league/commonmark": "^2.7",
         "league/oauth2-client": "^2.7",
         "league/openapi-psr7-validator": "^0.22.0",
         "nikic/fast-route": "^1.3",
@@ -51,24 +54,24 @@
         "psr/http-message": "^1.1",
         "psr/http-server-middleware": "^1.0",
         "psr/log": "^3.0",
-        "rcrowe/twigbridge": "^0.14.x-dev",
-        "respect/validation": "^1.1",
-        "symfony/http-foundation": "^7.1",
-        "symfony/mailer": "^7.1",
-        "symfony/psr-http-message-bridge": "^7.1",
-        "twig/twig": "^3.14",
+        "rcrowe/twigbridge": "^0.14",
+        "respect/validation": "^2.4",
+        "symfony/http-foundation": "^7.3",
+        "symfony/mailer": "^7.3",
+        "symfony/psr-http-message-bridge": "^7.3",
+        "twig/twig": "^3.22",
         "vlucas/phpdotenv": "^5.6"
     },
     "require-dev": {
         "dms/phpunit-arraysubset-asserts": "^0.5.0",
-        "fakerphp/faker": "^1.23",
-        "fig/log-test": "^1.1",
-        "filp/whoops": "^2.16",
-        "phpstan/phpstan": "^1.12",
+        "fakerphp/faker": "^1.24",
+        "fig/log-test": "^1.2",
+        "filp/whoops": "^2.18",
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^9.6",
-        "slevomat/coding-standard": "^8.15",
-        "squizlabs/php_codesniffer": "^3.10",
-        "symfony/var-dumper": "^7.1"
+        "slevomat/coding-standard": "^8.25",
+        "squizlabs/php_codesniffer": "^4.0",
+        "symfony/var-dumper": "^7.3"
     },
     "autoload": {
         "psr-4": {