test with php 8.2

texthtml · Jul 3, 2023 · 9968251 · 9968251
1 parent ad9331e
commit 9968251
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 6,619 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1
+FROM php:8.2
 
 COPY dev.sh /tmp/library-scripts/
 

diff --git a/.docker/dev.sh b/.docker/dev.sh
@@ -63,7 +63,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
         libkrb5-3 \
         libgssapi-krb5-2 \
         libicu[0-9][0-9] \
-        liblttng-ust0 \
+        liblttng-ust[0-9] \
         libstdc++6 \
         zlib1g \
         locales \

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.1', '8.2']
 
     steps:
       - uses: actions/checkout@v3
@@ -36,9 +36,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: tools/apigen/vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('tools/apigen/composer.lock') }}
+          key: ${{ runner.os }}-php-${{ matrix.php-versions }}-${{ hashFiles('tools/apigen/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-php-
+            ${{ runner.os }}-php-${{ matrix.php-versions }}-
 
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.1', '8.2']
 
     steps:
       - uses: actions/checkout@v3
@@ -27,17 +27,17 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           ini-values:  zend.assertions=1,  assert.exception=1
 
-      - name: Validate composer.json and composer.lock
+      - name: Validate composer.json
         run: composer validate --strict
 
       - name: Cache Composer packages
         id: composer-cache
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('composer.lock') }}
+          key: ${{ runner.os }}-php-${{ matrix.php-versions }}-${{ hashFiles('composer.json') }}
           restore-keys: |
-            ${{ runner.os }}-php-
+            ${{ runner.os }}-php-${{ matrix.php-versions }}
 
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/
+/composer.lock
 /phpstan.neon
 /.phpunit.result.cache
 /docs/