From 583cf6751aae268fec69c6e3455a6aeecccf56bb Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Wed, 16 Sep 2020 13:51:29 +0100
Subject: [PATCH] test php8 build

---
 .github/workflows/test_and_publish.yml | 9 +++++----
 composer.json                          | 2 +-
 composer.lock                          | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test_and_publish.yml b/.github/workflows/test_and_publish.yml
index eabd4150..2b47a03c 100644
--- a/.github/workflows/test_and_publish.yml
+++ b/.github/workflows/test_and_publish.yml
@@ -13,7 +13,7 @@ jobs:
       max-parallel: 3
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
         database: ['pgsql', 'mysql', 'sqlite']
 
     runs-on: ubuntu-latest
@@ -56,11 +56,11 @@ jobs:
       run: composer validate
 
     - name: Install PHP dependencies
-      run: composer install --prefer-dist --no-progress --no-suggest
+      run: composer update && composer install --prefer-dist --no-progress --no-suggest
 
     - name: Install shimmie
       run: php index.php
-        
+
     - name: Run test suite
       run: |
         if [[ "${{ matrix.database }}" == "pgsql" ]]; then
@@ -73,8 +73,9 @@ jobs:
             export TEST_DSN="sqlite:data/shimmie.sqlite"
         fi
         vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover=data/coverage.clover
-      
+
     - name: Upload coverage
+      if: matrix.php == '7.4'
       run: |
           wget https://scrutinizer-ci.com/ocular.phar
           php ocular.phar code-coverage:upload --format=php-clover data/coverage.clover
diff --git a/composer.json b/composer.json
index 5f98a3bb..9cc2c229 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
 	],
 
 	"require" : {
-		"php" : "^7.3",
+		"php" : "^7.3 | ^8.0",
 		"ext-pdo": "*",
 		"ext-json": "*",
 		"ext-fileinfo": "*",
diff --git a/composer.lock b/composer.lock
index 8688f1a0..4e588969 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": "da65b5a34a244840672147b4e6c1bea0",
+    "content-hash": "7bec754711e9dae28c4237a723ad824a",
     "packages": [
         {
             "name": "bower-asset/jquery",
@@ -2428,7 +2428,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.3",
+        "php": "^7.3 | ^8.0",
         "ext-pdo": "*",
         "ext-json": "*",
         "ext-fileinfo": "*"