Merge branch 'main' into fix/require-ext-intl-php-extension

.github/workflows/docker.yml

@@ -26,6 +26,16 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        flavor:
+          - name: apache
+            file: scripts/docker/Dockerfile
+            tag: main
+            suffix:
+          - name: fpm
+            file: scripts/docker/Dockerfile-fpm
+            tag: main-fpm
+            suffix: -fpm
 
     permissions:
       contents: read
@@ -54,6 +64,9 @@ jobs:
             org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you."
             org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager"
             org.opencontainers.image.vendor="Monica"
+          flavor: |
+            latest=${{ matrix.flavor.tag == 'main' && 'auto' || 'false' }}
+            suffix=${{ matrix.flavor.suffix }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -76,9 +89,9 @@ jobs:
         with:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
-          cache-from: type=registry,ref=${{ env.registry }}/${{ github.repository_owner }}/${{ env.package-name }}:main
+          cache-from: type=registry,ref=${{ env.registry }}/${{ github.repository_owner }}/${{ env.package-name }}:${{ matrix.flavor.tag }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          file: scripts/docker/Dockerfile
+          file: ${{ matrix.flavor.file }}
           context: .
           platforms: ${{ (github.event_name != 'pull_request') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=This is MonicaHQ your personal memory! MonicaHQ is like a CRM but for the friends family and acquaintances around you.

composer.json

@@ -51,7 +51,7 @@
     "barryvdh/laravel-ide-helper": "^3.0",
     "brianium/paratest": "^7.0",
     "fakerphp/faker": "^1.9",
-    "larastan/larastan": "^2.7",
+    "larastan/larastan": "2.9.8",
     "laravel-lang/common": "^6.0",
     "laravel/pint": "^1.1",
     "laravel/sail": "^1.14",