From 975a02f7655e59fd50aa6092cd725b45cbe5f5bc Mon Sep 17 00:00:00 2001
From: Danny van der Sluijs <danny.vandersluijs@icloud.com>
Date: Tue, 20 Jun 2023 15:07:41 +0200
Subject: [PATCH 1/2] ci: Update to use GitHub Actions V3 (#1812)

---
 .github/workflows/continuous-integration.yml | 6 +++---
 .github/workflows/lint.yml                   | 2 +-
 .github/workflows/phpstan.yml                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index efa84bdad..7a0e7f0b3 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -45,7 +45,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: Run CouchDB
         timeout-minutes: 3
@@ -134,7 +134,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       # required for elasticsearch
       - name: Configure sysctl limits
@@ -213,7 +213,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       # required for elasticsearch
       - name: Configure sysctl limits
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a7482acee..a4e440599 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index fcf5007e8..6b375ca1d 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -37,7 +37,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

From 0ff87cf3214d184555490723f2d1c9dbcefa9cc0 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 21 Jun 2023 10:44:08 +0200
Subject: [PATCH 2/2] Fix display_errors handling to handle string values,
 fixes #1804

---
 src/Monolog/ErrorHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php
index 576f1713f..039a6594c 100644
--- a/src/Monolog/ErrorHandler.php
+++ b/src/Monolog/ErrorHandler.php
@@ -198,7 +198,7 @@ private function handleException(\Throwable $e): void
             ($this->previousExceptionHandler)($e);
         }
 
-        if (!headers_sent() && !ini_get('display_errors')) {
+        if (!headers_sent() && in_array(strtolower(ini_get('display_errors')), ['0', '', 'false', 'off', 'none', 'no'], true)) {
             http_response_code(500);
         }