From ef93903b863981ee270b407d7980d101089010a9 Mon Sep 17 00:00:00 2001
From: Eric Fortmeyer <efortmeyer@bethel.jw.org>
Date: Sat, 6 May 2023 13:13:32 -0500
Subject: [PATCH] ci: fix latest build workflow

---
 .github/workflows/php-latest.yml | 7 ++-----
 composer.json                    | 3 ++-
 composer.lock                    | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/php-latest.yml b/.github/workflows/php-latest.yml
index c741561..96379e0 100644
--- a/.github/workflows/php-latest.yml
+++ b/.github/workflows/php-latest.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: ['ubuntu-20.04', 'windows-latest', 'macos-latest']
+        operating-system: ['ubuntu-22.04', 'ubuntu-20.04', 'windows-latest', 'macos-latest']
         php-versions: [latest, nightly]
         phpunit-versions: ['latest']
     steps:
@@ -34,8 +34,5 @@ jobs:
     - name: Install dependencies
       run: composer update --no-ansi --no-interaction --prefer-dist --no-progress --ignore-platform-req=ext-ast
 
-    - name: Run static analysis
-      run: composer ci:analyze
-
     - name: Run test suite
-      run: composer ci:test
+      run: composer ci:test-build
diff --git a/composer.json b/composer.json
index 4c547e9..62d6ac1 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,7 @@
         "ci:lint": "composer exec \"@lint\"",
         "ci:lint-fix": "composer exec \"@lint-fix\"",
         "ci:test": "XDEBUG_MODE=coverage composer exec \"@test --configuration=phpunit.ci.xml --coverage-clover=build/logs/clover.xml\"",
+        "ci:test-build": "composer exec \"@test --configuration=phpunit.ci.xml\"",
         "ci:generate-coverage-badge": "composer exec \"php-coveralls -v\"",
         "docs:generate": "composer exec \"phpdoc --setting graphs.enabled=true\"",
         "lint": "phpcs",
@@ -71,6 +72,6 @@
         ]
     },
     "require": {
-        "php": "^8.1"
+        "php": "< 9"
     }
 }
diff --git a/composer.lock b/composer.lock
index 32bcc06..b83b3ab 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "876fab07b0f4d822687fa011407da332",
+    "content-hash": "9b644993397e047c1bf374160225ec57",
     "packages": [],
     "packages-dev": [
         {
@@ -4661,7 +4661,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1"
+        "php": "< 9"
     },
     "platform-dev": {
         "ext-mbstring": "*"