From 968ba0ca4d40c1779a64fc0e5ce0919035de5f0b Mon Sep 17 00:00:00 2001
From: Luis Pabon <luis.pabon@auronconsulting.co.uk>
Date: Fri, 16 Aug 2024 11:39:30 +0100
Subject: [PATCH 1/5] Update to actions/checkout@v4

---
 .github/workflows/deploy.yaml | 2 +-
 .github/workflows/tests.yaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 128915d7..4773e6cc 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU (required for arm build)
         uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9f896fa9..296adac4 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get Composer Cache Directory
         id: composer-cache

From 812c386666885fff3b211348e63c6a34d6895d43 Mon Sep 17 00:00:00 2001
From: Luis Pabon <luis.pabon@auronconsulting.co.uk>
Date: Fri, 16 Aug 2024 11:40:33 +0100
Subject: [PATCH 2/5] Update docker github actions to their newest

---
 .github/workflows/deploy.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 4773e6cc..0e146ce6 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -30,13 +30,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU (required for arm build)
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

From cef4b20ef688997db8aff571518cd57ec5c1fc68 Mon Sep 17 00:00:00 2001
From: Luis Pabon <luis.pabon@auronconsulting.co.uk>
Date: Fri, 16 Aug 2024 11:41:49 +0100
Subject: [PATCH 3/5] Update to actions/stale@v9

---
 .github/workflows/cleanup-repo.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cleanup-repo.yaml b/.github/workflows/cleanup-repo.yaml
index 98c1719e..5ddd154a 100644
--- a/.github/workflows/cleanup-repo.yaml
+++ b/.github/workflows/cleanup-repo.yaml
@@ -14,7 +14,7 @@ jobs:
     steps:
 
       # Mark issues and PRs with no activity as stale after a while, and close them after a while longer
-      - uses: actions/stale@v3
+      - uses: actions/stale@v9
         with:
           stale-issue-message: 'Marking issue as stale'
           stale-pr-message: 'Marking PR as stale'

From 27c310e15246cbc7f4a72ba8c5c538e2efa29923 Mon Sep 17 00:00:00 2001
From: Luis Pabon <luis.pabon@auronconsulting.co.uk>
Date: Fri, 16 Aug 2024 11:42:54 +0100
Subject: [PATCH 4/5] Upgrade to actions/cache@v4

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 296adac4..8d3a18aa 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "dir=$(make composer-cache-dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

From da14156d8def070e8285e9f93ed20dc8501e1bf8 Mon Sep 17 00:00:00 2001
From: Luis Pabon <luis.pabon@auronconsulting.co.uk>
Date: Fri, 16 Aug 2024 11:48:46 +0100
Subject: [PATCH 5/5] Fix space after newline character on php packages in
 generated Dockerfile

Fixes https://github.com/phpdocker-io/phpdocker.io/issues/366
---
 src/PHPDocker/Template/dockerfile-php-fpm.conf.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PHPDocker/Template/dockerfile-php-fpm.conf.twig b/src/PHPDocker/Template/dockerfile-php-fpm.conf.twig
index 038b53af..9b6f5dd5 100644
--- a/src/PHPDocker/Template/dockerfile-php-fpm.conf.twig
+++ b/src/PHPDocker/Template/dockerfile-php-fpm.conf.twig
@@ -4,7 +4,7 @@ WORKDIR "{{ dockerWorkingDir }}"
 {% if packages %}
 RUN apt-get update \
     && apt-get -y --no-install-recommends install \
-        {{ packages | join(' \\ \n        ') }} \
+        {{ packages | join(' \\\n        ') }} \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 {% endif %}