Merge pull request #43 from AxeWP/dev/support-php-8.1

dev: add explicit support for PHP 8.1
hsimah-services · Jan 12, 2023 · 6aa07bd · 6aa07bd
2 parents f1d60b5 + ae2bfa5
commit 6aa07bd
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Setup PHP w/ Composer & WP-CLI
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: mbstring, intl, bcmath, exif, gd, mysqli, opcache, zip, pdo_mysql
           coverage: none
           tools: composer:v2, wp-cli

diff --git a/.github/workflows/code-standard.yml b/.github/workflows/code-standard.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: mbstring, intl
           tools: composer:v2
           coverage: none

diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
@@ -26,8 +26,8 @@ jobs:
         php: ["7.4", "8.0"]
         wordpress: [ "6.1", "6.0", "5.9", "5.8" ]
         include:
-          - php: "8.0"
-            wordpress: "6.0"
+          - php: "8.1"
+            wordpress: "6.1"
             coverage: 1
           - php: "7.4"
             wordpress: "5.7"

diff --git a/.github/workflows/schema-linter.yml b/.github/workflows/schema-linter.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Setup PHP w/ Composer & WP-CLI
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: mbstring, intl, bcmath, exif, gd, mysqli, opcache, zip, pdo_mysql
           coverage: none
           tools: composer:v2, wp-cli

diff --git a/.github/workflows/upload-schema-artifact.yml b/.github/workflows/upload-schema-artifact.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup PHP w/ Composer & WP-CLI
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: mbstring, intl, bcmath, exif, gd, mysqli, opcache, zip, pdo_mysql
           coverage: none
           tools: composer:v2, wp-cli

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - chore: switch `poolshark/wp-graphql-stubs` for `axepress/wp-graphql-stubs`
 - chore: stub `FWP()` and FacetWP class properties.
 - chore: change stubfile extensions to `.php`.
+- dev: add explicit support for PHP 8.1.
 - dev: use `camelCase` for FacetQueryArgs field names by default. Fields using `snake_case` have been deprecated and will be removed in a future version.
 - dev: add `get_graphql_allowed_facets()` access function.
 - dev: allow for (programmatically) overwriting GraphQL-specific field properties.

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ This plugin has been tested and is functional with SearchWP.
 
 ## System Requirements
 
-* PHP 7.4+ || 8.0
+* PHP 7.4-8.1.x
 * WordPress 5.4.1+
 * WPGraphQL 1.6.0+ (1.9.0+ recommended)
 * FacetWP 4.0

diff --git a/bin/run-docker.sh b/bin/run-docker.sh
@@ -16,11 +16,11 @@ print_usage_instructions() {
 	echo "  composer build-app"
 	echo "  composer run-app"
 	echo ""
-	echo "  WP_VERSION=6.1 PHP_VERSION=8.0 composer build-app"
-	echo "  WP_VERSION=6.1 PHP_VERSION=8.0 composer run-app"
+	echo "  WP_VERSION=6.1 PHP_VERSION=8.1 composer build-app"
+	echo "  WP_VERSION=6.1 PHP_VERSION=8.1 composer run-app"
 	echo ""
-	echo "  WP_VERSION=6.1 PHP_VERSION=8.0  bin/run-docker.sh build -a"
-	echo "  WP_VERSION=6.1 PHP_VERSION=8.0  bin/run-docker.sh run -a"
+	echo "  WP_VERSION=6.1 PHP_VERSION=8.1  bin/run-docker.sh build -a"
+	echo "  WP_VERSION=6.1 PHP_VERSION=8.1  bin/run-docker.sh run -a"
 	exit 1
 }
 
@@ -30,7 +30,7 @@ fi
 
 TAG=${TAG-latest}
 WP_VERSION=${WP_VERSION-6.1}
-PHP_VERSION=${PHP_VERSION-8.0}
+PHP_VERSION=${PHP_VERSION-8.1}
 
 BUILD_NO_CACHE=${BUILD_NO_CACHE-}
 

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
 		}
 	},
 	"require": {
-		"php": "^7.4||^8.0"
+		"php": ">=7.4, <=8.1"
 	},
 	"require-dev": {
 		"codeception/lib-innerbrowser": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   app:
     depends_on:
       - app_db
-    image: wp-graphql-facetwp:latest-wp${WP_VERSION-6.0}-php${PHP_VERSION-8.0}
+    image: wp-graphql-facetwp:latest-wp${WP_VERSION-6.0}-php${PHP_VERSION-8.1}
     volumes:
       - .:/var/www/html/wp-content/plugins/wp-graphql-facetwp
       - ./.log/app:/var/log/apache2
@@ -36,7 +36,7 @@ services:
   testing:
     depends_on:
       - app_db
-    image: wp-graphql-facetwp-testing:latest-wp${WP_VERSION-6.0}-php${PHP_VERSION-8.0}
+    image: wp-graphql-facetwp-testing:latest-wp${WP_VERSION-6.0}-php${PHP_VERSION-8.1}
     volumes:
       - .:/var/www/html/wp-content/plugins/wp-graphql-facetwp
       - ./.log/testing:/var/log/apache2

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'hsimah-services/wp-graphql-facetwp',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => 'e62d1343bce6cc4a6a6387946e74d866f266feab',
+        'reference' => 'f1d60b508743a71ff8b72cea43b6ab8690563339',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'hsimah-services/wp-graphql-facetwp' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => 'e62d1343bce6cc4a6a6387946e74d866f266feab',
+            'reference' => 'f1d60b508743a71ff8b72cea43b6ab8690563339',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),