Add completions

2026-03-06 12:44:20 +01:00 · 2025-10-18 17:18:10 +02:00
5 changed files with 79 additions and 135 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,6 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true

-permissions:
-  contents: read
-  packages: write
-
 jobs:
  tests:
    name: Tests
@@ -61,62 +57,17 @@ jobs:
        run: docker compose exec -T php vendor/bin/phpunit
      - name: Doctrine Schema Validator
        run: docker compose exec -T php bin/console -e test doctrine:schema:validate
-  
-  build-deploy:
-    name: Build and deploy to ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
+  deploy:
+    name: Deploy
    environment:
      name: ${{ startsWith(github.ref, 'refs/tags/') && 'production' || (github.ref == 'refs/heads/main' && 'acceptance' || '') }}
      url: ${{ vars.URL }}
    needs: tests
    runs-on: ubuntu-latest
-    if: (github.ref == 'refs/heads/main' && false) || startsWith(github.ref, 'refs/tags/')
+    if: startsWith(github.ref, 'refs/tags/')
    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata
-        id: meta
-        run: |
-          REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
-          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            TAG="${GITHUB_REF#refs/tags/}"
-            {
-              echo "tag=$TAG"
-              echo "full_name=ghcr.io/${REPO_LOWER}:$TAG"
-            } >> "$GITHUB_OUTPUT"
-          else
-            SHORT_SHA=$(git rev-parse --short HEAD)
-            {
-              echo "tag=$SHORT_SHA"
-              echo "full_name=ghcr.io/${REPO_LOWER}:$SHORT_SHA"
-            } >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Build and Push Docker images
-        uses: docker/bake-action@v5
-        with:
-          pull: true
-          push: true
-          files: |
-            compose.yaml
-            compose.build.yaml
-          set: |
-            *.cache-from=type=gha,scope=${{github.ref}}
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{github.ref}},mode=max
-            *.tags=${{ steps.meta.outputs.full_name }}
-
-      - name: Trigger Portainer Deployment
-        shell: bash
+      - shell: bash
        env:
          PORTAINER_WEBHOOK: ${{secrets.PORTAINER_WEBHOOK}}
        run: |
-          curl -v -X POST "$PORTAINER_WEBHOOK"?IMAGE_TAG=${{steps.meta.outputs.tag}} --fail-with-body
+          curl -v -X POST "$PORTAINER_WEBHOOK"
--- a/8
+++ b/8
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	file \
 	gettext \
 	git \
-    && rm -rf /var/lib/apt/lists/*
+	&& rm -rf /var/lib/apt/lists/*

 RUN set -eux; \
 	install-php-extensions \
@@ -60,10 +60,8 @@ FROM frankenphp_base AS frankenphp_dev

 ENV APP_ENV=dev XDEBUG_MODE=off

-# hadolint ignore=DL3008
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get install -y --no-install-recommends \
    bash-completion \
-    && rm -rf /var/lib/apt/lists/*

 COPY --link frankenphp/console-complete.bash /usr/share/bash-completion/completions/console
 COPY --link frankenphp/composer-complete.bash /usr/share/bash-completion/completions/composer
@@ -84,8 +82,6 @@ CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ]
 # Prod FrankenPHP image
 FROM frankenphp_base AS frankenphp_prod

-RUN rm -rf /var/lib/apt/lists/*
-
 ENV APP_ENV=prod
 ENV FRANKENPHP_CONFIG="import worker.Caddyfile"

--- a/compose.build.yaml
+++ b/compose.build.yaml
@@ -1,5 +0,0 @@
-services:
-  php:
-    build:
-      context: .
-      target: frankenphp_prod
--- a/compose.prod.yaml
+++ b/compose.prod.yaml
@@ -1,7 +1,9 @@
 # Production environment override
 services:
  php:
-    image: ghcr.io/marijndoeve/tijdvoordetest:${IMAGE_TAG}
+    build:
+      context: .
+      target: frankenphp_prod
    environment:
      APP_SECRET: ${APP_SECRET}
      MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
--- a/composer.lock
+++ b/composer.lock
@@ -250,16 +250,16 @@
        },
        {
            "name": "doctrine/dbal",
-            "version": "4.3.4",
+            "version": "4.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "1a2fbd0e93b8dec7c3d1ac2b6396a7b929b130dc"
+                "reference": "231959669bb2173194c95636eae7f1b41b2a8b19"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/1a2fbd0e93b8dec7c3d1ac2b6396a7b929b130dc",
-                "reference": "1a2fbd0e93b8dec7c3d1ac2b6396a7b929b130dc",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/231959669bb2173194c95636eae7f1b41b2a8b19",
+                "reference": "231959669bb2173194c95636eae7f1b41b2a8b19",
                "shasum": ""
            },
            "require": {
@@ -269,15 +269,15 @@
                "psr/log": "^1|^2|^3"
            },
            "require-dev": {
-                "doctrine/coding-standard": "14.0.0",
+                "doctrine/coding-standard": "13.0.1",
                "fig/log-test": "^1",
                "jetbrains/phpstorm-stubs": "2023.2",
-                "phpstan/phpstan": "2.1.30",
-                "phpstan/phpstan-phpunit": "2.0.7",
+                "phpstan/phpstan": "2.1.22",
+                "phpstan/phpstan-phpunit": "2.0.6",
                "phpstan/phpstan-strict-rules": "^2",
                "phpunit/phpunit": "11.5.23",
-                "slevomat/coding-standard": "8.24.0",
-                "squizlabs/php_codesniffer": "4.0.0",
+                "slevomat/coding-standard": "8.16.2",
+                "squizlabs/php_codesniffer": "3.13.1",
                "symfony/cache": "^6.3.8|^7.0",
                "symfony/console": "^5.4|^6.3|^7.0"
            },
@@ -336,7 +336,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/4.3.4"
+                "source": "https://github.com/doctrine/dbal/tree/4.3.3"
            },
            "funding": [
                {
@@ -352,7 +352,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-09T09:11:36+00:00"
+            "time": "2025-09-04T23:52:42+00:00"
        },
        {
            "name": "doctrine/deprecations",
@@ -404,21 +404,20 @@
        },
        {
            "name": "doctrine/doctrine-bundle",
-            "version": "2.18.0",
+            "version": "2.16.2",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "cd5d4da6a5f7cf3d8708e17211234657b5eb4e95"
+                "reference": "1c10de0fe995f01eca6b073d1c2549ef0b603a7f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/cd5d4da6a5f7cf3d8708e17211234657b5eb4e95",
-                "reference": "cd5d4da6a5f7cf3d8708e17211234657b5eb4e95",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1c10de0fe995f01eca6b073d1c2549ef0b603a7f",
+                "reference": "1c10de0fe995f01eca6b073d1c2549ef0b603a7f",
                "shasum": ""
            },
            "require": {
                "doctrine/dbal": "^3.7.0 || ^4.0",
-                "doctrine/deprecations": "^1.0",
                "doctrine/persistence": "^3.1 || ^4",
                "doctrine/sql-formatter": "^1.0.1",
                "php": "^8.1",
@@ -426,6 +425,7 @@
                "symfony/config": "^6.4 || ^7.0",
                "symfony/console": "^6.4 || ^7.0",
                "symfony/dependency-injection": "^6.4 || ^7.0",
+                "symfony/deprecation-contracts": "^2.1 || ^3",
                "symfony/doctrine-bridge": "^6.4.3 || ^7.0.3",
                "symfony/framework-bundle": "^6.4 || ^7.0",
                "symfony/service-contracts": "^2.5 || ^3"
@@ -440,13 +440,14 @@
            "require-dev": {
                "doctrine/annotations": "^1 || ^2",
                "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^14",
+                "doctrine/coding-standard": "^13",
+                "doctrine/deprecations": "^1.0",
                "doctrine/orm": "^2.17 || ^3.1",
                "friendsofphp/proxy-manager-lts": "^1.0",
                "phpstan/phpstan": "2.1.1",
                "phpstan/phpstan-phpunit": "2.0.3",
                "phpstan/phpstan-strict-rules": "^2",
-                "phpunit/phpunit": "^10.5.53 || ^12.3.10",
+                "phpunit/phpunit": "^10.5.53",
                "psr/log": "^1.1.4 || ^2.0 || ^3.0",
                "symfony/doctrine-messenger": "^6.4 || ^7.0",
                "symfony/expression-language": "^6.4 || ^7.0",
@@ -460,7 +461,7 @@
                "symfony/var-exporter": "^6.4.1 || ^7.0.1",
                "symfony/web-profiler-bundle": "^6.4 || ^7.0",
                "symfony/yaml": "^6.4 || ^7.0",
-                "twig/twig": "^2.14.7 || ^3.0.4"
+                "twig/twig": "^2.13 || ^3.0.4"
            },
            "suggest": {
                "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
@@ -505,7 +506,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/DoctrineBundle/issues",
-                "source": "https://github.com/doctrine/DoctrineBundle/tree/2.18.0"
+                "source": "https://github.com/doctrine/DoctrineBundle/tree/2.16.2"
            },
            "funding": [
                {
@@ -521,7 +522,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-11T04:43:27+00:00"
+            "time": "2025-09-10T19:14:48+00:00"
        },
        {
            "name": "doctrine/doctrine-migrations-bundle",
@@ -1131,16 +1132,16 @@
        },
        {
            "name": "doctrine/persistence",
-            "version": "4.1.1",
+            "version": "4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/persistence.git",
-                "reference": "b9c49ad3558bb77ef973f4e173f2e9c2eca9be09"
+                "reference": "dcbdfe4b211ae09478e192289cae7ab0987b29a4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/persistence/zipball/b9c49ad3558bb77ef973f4e173f2e9c2eca9be09",
-                "reference": "b9c49ad3558bb77ef973f4e173f2e9c2eca9be09",
+                "url": "https://api.github.com/repos/doctrine/persistence/zipball/dcbdfe4b211ae09478e192289cae7ab0987b29a4",
+                "reference": "dcbdfe4b211ae09478e192289cae7ab0987b29a4",
                "shasum": ""
            },
            "require": {
@@ -1149,11 +1150,11 @@
                "psr/cache": "^1.0 || ^2.0 || ^3.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^14",
-                "phpstan/phpstan": "2.1.30",
-                "phpstan/phpstan-phpunit": "^2",
-                "phpstan/phpstan-strict-rules": "^2",
-                "phpunit/phpunit": "^10.5.58 || ^12",
+                "doctrine/coding-standard": "^12",
+                "phpstan/phpstan": "1.12.7",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpstan/phpstan-strict-rules": "^1.6",
+                "phpunit/phpunit": "^9.6",
                "symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0",
                "symfony/finder": "^4.4 || ^5.4 || ^6.0 || ^7.0"
            },
@@ -1204,7 +1205,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/persistence/issues",
-                "source": "https://github.com/doctrine/persistence/tree/4.1.1"
+                "source": "https://github.com/doctrine/persistence/tree/4.1.0"
            },
            "funding": [
                {
@@ -1220,7 +1221,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-16T20:13:18+00:00"
+            "time": "2025-08-21T16:00:31+00:00"
        },
        {
            "name": "doctrine/sql-formatter",
@@ -8676,16 +8677,16 @@
        },
        {
            "name": "doctrine/data-fixtures",
-            "version": "2.2.0",
+            "version": "2.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/data-fixtures.git",
-                "reference": "7a615ba135e45d67674bb623d90f34f6c7b6bd97"
+                "reference": "f161e20f04ba5440a09330e156b40f04dd70d47f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/7a615ba135e45d67674bb623d90f34f6c7b6bd97",
-                "reference": "7a615ba135e45d67674bb623d90f34f6c7b6bd97",
+                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/f161e20f04ba5440a09330e156b40f04dd70d47f",
+                "reference": "f161e20f04ba5440a09330e156b40f04dd70d47f",
                "shasum": ""
            },
            "require": {
@@ -8699,14 +8700,14 @@
                "doctrine/phpcr-odm": "<1.3.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^14",
+                "doctrine/coding-standard": "^13",
                "doctrine/dbal": "^3.5 || ^4",
                "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
                "doctrine/orm": "^2.14 || ^3",
                "ext-sqlite3": "*",
                "fig/log-test": "^1",
-                "phpstan/phpstan": "2.1.31",
-                "phpunit/phpunit": "10.5.45 || 12.4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpunit/phpunit": "10.5.45",
                "symfony/cache": "^6.4 || ^7",
                "symfony/var-exporter": "^6.4 || ^7"
            },
@@ -8739,7 +8740,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/data-fixtures/issues",
-                "source": "https://github.com/doctrine/data-fixtures/tree/2.2.0"
+                "source": "https://github.com/doctrine/data-fixtures/tree/2.1.0"
            },
            "funding": [
                {
@@ -8755,25 +8756,25 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-17T20:06:20+00:00"
+            "time": "2025-07-08T17:48:20+00:00"
        },
        {
            "name": "doctrine/doctrine-fixtures-bundle",
-            "version": "4.3.0",
+            "version": "4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
-                "reference": "11941deb6f2899b91e8b8680b07ffe63899d864b"
+                "reference": "a06db6b81ff20a2980bf92063d80c013bb8b4b7c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/11941deb6f2899b91e8b8680b07ffe63899d864b",
-                "reference": "11941deb6f2899b91e8b8680b07ffe63899d864b",
+                "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/a06db6b81ff20a2980bf92063d80c013bb8b4b7c",
+                "reference": "a06db6b81ff20a2980bf92063d80c013bb8b4b7c",
                "shasum": ""
            },
            "require": {
-                "doctrine/data-fixtures": "^2.2",
-                "doctrine/doctrine-bundle": "^2.2 || ^3.0",
+                "doctrine/data-fixtures": "^2.0",
+                "doctrine/doctrine-bundle": "^2.2",
                "doctrine/orm": "^2.14.0 || ^3.0",
                "doctrine/persistence": "^2.4 || ^3.0 || ^4.0",
                "php": "^8.1",
@@ -8789,7 +8790,7 @@
                "doctrine/dbal": "< 3"
            },
            "require-dev": {
-                "doctrine/coding-standard": "14.0.0",
+                "doctrine/coding-standard": "13.0.0",
                "phpstan/phpstan": "2.1.11",
                "phpunit/phpunit": "^10.5.38 || 11.4.14"
            },
@@ -8825,7 +8826,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues",
-                "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/4.3.0"
+                "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/4.1.0"
            },
            "funding": [
                {
@@ -8841,7 +8842,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-20T06:18:40+00:00"
+            "time": "2025-03-26T10:56:26+00:00"
        },
        {
            "name": "evenement/evenement",
@@ -9408,11 +9409,11 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.31",
+            "version": "2.1.30",
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ead89849d879fe203ce9292c6ef5e7e76f867b96",
-                "reference": "ead89849d879fe203ce9292c6ef5e7e76f867b96",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
+                "reference": "a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
                "shasum": ""
            },
            "require": {
@@ -9457,20 +9458,20 @@
                    "type": "github"
                }
            ],
-            "time": "2025-10-10T14:14:11+00:00"
+            "time": "2025-10-02T16:07:52+00:00"
        },
        {
            "name": "phpstan/phpstan-doctrine",
-            "version": "2.0.10",
+            "version": "2.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan-doctrine.git",
-                "reference": "5eaf37b87288474051469aee9f937fc9d862f330"
+                "reference": "934f5734812341358fc41c44006b30fa00c785f0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/5eaf37b87288474051469aee9f937fc9d862f330",
-                "reference": "5eaf37b87288474051469aee9f937fc9d862f330",
+                "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/934f5734812341358fc41c44006b30fa00c785f0",
+                "reference": "934f5734812341358fc41c44006b30fa00c785f0",
                "shasum": ""
            },
            "require": {
@@ -9504,8 +9505,7 @@
                "phpstan/phpstan-strict-rules": "^2.0",
                "phpunit/phpunit": "^9.6.20",
                "ramsey/uuid": "^4.2",
-                "symfony/cache": "^5.4",
-                "symfony/uid": "^5.4 || ^6.4 || ^7.3"
+                "symfony/cache": "^5.4"
            },
            "type": "phpstan-extension",
            "extra": {
@@ -9528,9 +9528,9 @@
            "description": "Doctrine extensions for PHPStan",
            "support": {
                "issues": "https://github.com/phpstan/phpstan-doctrine/issues",
-                "source": "https://github.com/phpstan/phpstan-doctrine/tree/2.0.10"
+                "source": "https://github.com/phpstan/phpstan-doctrine/tree/2.0.6"
            },
-            "time": "2025-10-06T10:01:02+00:00"
+            "time": "2025-09-10T07:06:30+00:00"
        },
        {
            "name": "phpstan/phpstan-phpunit",
@@ -10623,21 +10623,21 @@
        },
        {
            "name": "rector/rector",
-            "version": "2.2.3",
+            "version": "2.1.7",
            "source": {
                "type": "git",
                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "d27f976a332a87b5d03553c2e6f04adbe5da034f"
+                "reference": "c34cc07c4698f007a20dc5c99ff820089ae413ce"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/d27f976a332a87b5d03553c2e6f04adbe5da034f",
-                "reference": "d27f976a332a87b5d03553c2e6f04adbe5da034f",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/c34cc07c4698f007a20dc5c99ff820089ae413ce",
+                "reference": "c34cc07c4698f007a20dc5c99ff820089ae413ce",
                "shasum": ""
            },
            "require": {
                "php": "^7.4|^8.0",
-                "phpstan/phpstan": "^2.1.26"
+                "phpstan/phpstan": "^2.1.18"
            },
            "conflict": {
                "rector/rector-doctrine": "*",
@@ -10671,7 +10671,7 @@
            ],
            "support": {
                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.2.3"
+                "source": "https://github.com/rectorphp/rector/tree/2.1.7"
            },
            "funding": [
                {
@@ -10679,7 +10679,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-10-11T21:50:23+00:00"
+            "time": "2025-09-10T11:13:58+00:00"
        },
        {
            "name": "roave/security-advisories",