From 5744c620f28ce36939ba04d589048fe05f869067 Mon Sep 17 00:00:00 2001
From: Felipe Dalcin <felipe.sdalcin@gmail.com>
Date: Tue, 18 Oct 2022 15:58:17 -0400
Subject: [PATCH] chore: php 8 support (#361)

* chore: add php 8 support

* chore: update pipeline
---
 .github/workflows/standards-and-tests.yml | 12 ++++++------
 composer.json                             |  7 ++-----
 composer.lock                             |  7 ++-----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/standards-and-tests.yml b/.github/workflows/standards-and-tests.yml
index 68aaad9..ff7b8dd 100644
--- a/.github/workflows/standards-and-tests.yml
+++ b/.github/workflows/standards-and-tests.yml
@@ -13,15 +13,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.4 ]
+        php: [ 7.4, 8.0 ]
         os: [ ubuntu-20.04 ]
         wordpress: [ 6.0.2, latest ]
-        experimental: [ false ]
         include:
-          - php: 8.0
-            os: ubuntu-20.04
-            wordpress: latest
-            experimental: true
+          - experimental: true
+          - experimental: false
+            php: 8.0
+            wordpress: 6.0.2
+
     name: Test - PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}
 
     env:
diff --git a/composer.json b/composer.json
index aacfda2..f4e2acc 100644
--- a/composer.json
+++ b/composer.json
@@ -18,17 +18,14 @@
 		"forum": "https://discourse.pressbooks.org/"
 	},
 	"config": {
-		"platform": {
-			"php": "7.4"
-		},
-    "sort-packages": true,
+		"sort-packages": true,
 		"allow-plugins": {
 			"composer/installers": true,
 			"dealerdirect/phpcodesniffer-composer-installer": true
 		}
 	},
 	"require": {
-		"php": ">=7.4",
+		"php": "^7.4|8.0.*",
 		"composer/installers": "^2",
 		"phpcompatibility/php-compatibility": "^9.3",
 		"pressbooks/mix": "^2.1",
diff --git a/composer.lock b/composer.lock
index 4e1bf9c..bb10d07 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": "4d7cd01dc8e472d2a68d952060a21d78",
+    "content-hash": "bca254bf292cf20628d024e2b7bf1d91",
     "packages": [
         {
             "name": "composer/installers",
@@ -2857,11 +2857,8 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4"
+        "php": "^7.4|8.0.*"
     },
     "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.4"
-    },
     "plugin-api-version": "2.3.0"
 }