From 5403bf7e0ff351eb9e95701e285b2784274d20b5 Mon Sep 17 00:00:00 2001
From: James ZHNAG <thenorthmemory@qq.com>
Date: Thu, 5 Sep 2024 18:38:22 +0800
Subject: [PATCH] PHP8.4 support

---
 .github/workflows/ci.yml | 14 +++++++++-----
 phpstan.v8.4.neon        |  7 +++++++
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 phpstan.v8.4.neon

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 604a0b9..85fddd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         os: [ubuntu-latest, macOS-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -21,7 +21,7 @@ jobs:
           git config --global core.symlinks true
         if: runner.os == 'Windows'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP${{ matrix.php-version }}@${{ matrix.os }}
         uses: shivammathur/setup-php@v2
@@ -40,7 +40,7 @@ jobs:
       - name: Cache dependencies on PHP(=7.1)@${{ matrix.os }}
         if: matrix.php-version == '7.1'
         id: dependencies-cache-71
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ matrix.os }}-php${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
@@ -50,7 +50,7 @@ jobs:
       - name: Cache dependencies on PHP(=7.2)@${{ matrix.os }}
         if: matrix.php-version == '7.2'
         id: dependencies-cache-72
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ matrix.os }}-php${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
@@ -60,7 +60,7 @@ jobs:
       - name: Cache dependencies on PHP(>7.2)@${{ matrix.os }}
         if: matrix.php-version > 7.2
         id: dependencies-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ matrix.os }}-php-${{ hashFiles('**/composer.lock') }}
@@ -89,6 +89,10 @@ jobs:
         if: 8.1 < matrix.php-version && matrix.php-version < '8.4'
         id: phpstan-php-8_2-8_3
 
+      - run: vendor/bin/phpstan analyse --no-progress --memory-limit=-1 -c phpstan.v8.4.neon
+        if: matrix.php-version == '8.4'
+        id: phpstan-php-8_4
+
       - run: |
           make keygen
           make x509crt
diff --git a/phpstan.v8.4.neon b/phpstan.v8.4.neon
new file mode 100644
index 0000000..b408dec
--- /dev/null
+++ b/phpstan.v8.4.neon
@@ -0,0 +1,7 @@
+includes:
+	- phpstan.v8.2.neon
+parameters:
+	ignoreErrors:
+		-
+			message: "#^(?:Left|Right) side of && is always true#"
+			path: src/Crypto/Hash.php