From a1bad3558564e4a0d81d5846f09a0004e310fc5d Mon Sep 17 00:00:00 2001
From: Martijn <12066560+Kipjr@users.noreply.github.com>
Date: Wed, 28 Feb 2024 19:10:55 +0100
Subject: [PATCH] Update composer.json & Fix lockfile (#118)

* Update composer.json & Fix lock error
---
 .github/workflows/docker-publish.yml | 4 +++-
 .github/workflows/laravel.yml        | 4 +++-
 .github/workflows/sail-publish.yml   | 4 +++-
 composer.json                        | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 89461e78..f50c92b8 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -30,7 +30,9 @@ jobs:
                cp '.env.example' '.env'
            fi
       - name: Install Dependencies
-        run: composer require laravel/sail -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+        run: |
+           composer update --lock
+           composer require laravel/sail -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
     
 
       # Login against a Docker registry except on PR
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
index 5569bafc..08efa643 100644
--- a/.github/workflows/laravel.yml
+++ b/.github/workflows/laravel.yml
@@ -19,7 +19,9 @@ jobs:
       - name: Copy .env
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Install Dependencies
-        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+        run: | 
+           composer update --lock
+           composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
       - name: Generate key
         run: php artisan key:generate
       - name: Directory Permissions
diff --git a/.github/workflows/sail-publish.yml b/.github/workflows/sail-publish.yml
index 99b05515..b7129820 100644
--- a/.github/workflows/sail-publish.yml
+++ b/.github/workflows/sail-publish.yml
@@ -27,7 +27,9 @@ jobs:
                cp '.env.example' '.env'
            fi
       - name: Install Dependencies
-        run: composer require laravel/sail -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+        run: |
+           composer update --lock
+           composer require laravel/sail -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
diff --git a/composer.json b/composer.json
index 6579e426..a9acbb1d 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.8.1",
-        "filp/whoops": "^2.15.2"    
+        "filp/whoops": "^2.15.2",
         "fakerphp/faker": "^1.23",
         "mockery/mockery": "^1.6.2",
         "laravel/pint": "^1.10.3",