From 088d000a7c0cdee0026ac6db1aaf2628b762dcb0 Mon Sep 17 00:00:00 2001 From: David Levine Date: Fri, 2 Aug 2024 22:56:25 +0000 Subject: [PATCH 1/2] chore: version bump --- CHANGELOG.md | 4 ++++ README.md | 2 +- phpstan/constants.php | 2 +- readme.txt | 2 +- wp-graphql-gravity-forms.php | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26a1e594..a382e3ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +## [v0.13.0.1] + +This _patch_ release fixes compatibility with Composer-based WordPress installations, and a few minor issues introduced in the previous release. + - fix: Check if classes are loaded by a different autoloader before attempting to autoload them. H/t @cvanh - fix: Return `wp_max_upload_size()` instead of `null` if `GfFieldWithFileSizeSetting.maxFileSize` is `null`. H/t @Gytjarek - fix: Fix typo in Autoloader release URL. diff --git a/README.md b/README.md index ebc7699d..dfabbd53 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A WordPress plugin that adds WPG ----- -![Packagist License](https://img.shields.io/packagist/l/harness-software/wp-graphql-gravity-forms?color=green) ![Packagist Version](https://img.shields.io/packagist/v/harness-software/wp-graphql-gravity-forms?label=stable) ![GitHub commits since latest release (by SemVer)](https://img.shields.io/github/commits-since/axewp/wp-graphql-gravity-forms/v0.13.0) ![GitHub forks](https://img.shields.io/github/forks/axewp/wp-graphql-gravity-forms?style=social) ![GitHub Repo stars](https://img.shields.io/github/stars/axewp/wp-graphql-gravity-forms?style=social)
+![Packagist License](https://img.shields.io/packagist/l/harness-software/wp-graphql-gravity-forms?color=green) ![Packagist Version](https://img.shields.io/packagist/v/harness-software/wp-graphql-gravity-forms?label=stable) ![GitHub commits since latest release (by SemVer)](https://img.shields.io/github/commits-since/axewp/wp-graphql-gravity-forms/v0.13.0.1) ![GitHub forks](https://img.shields.io/github/forks/axewp/wp-graphql-gravity-forms?style=social) ![GitHub Repo stars](https://img.shields.io/github/stars/axewp/wp-graphql-gravity-forms?style=social)
[![Coverage Status](https://coveralls.io/repos/github/AxeWP/wp-graphql-gravity-forms/badge.svg?branch=develop)](https://coveralls.io/github/AxeWP/wp-graphql-gravity-forms?branch=develop) [![WordPress Coding Standards](https://github.com/axewp/wp-graphql-gravity-forms/actions/workflows/code-standard.yml/badge.svg)](https://github.com/axewp/wp-graphql-gravity-forms/actions/workflows/code-standard.yml) [![Code Quality](https://github.com/axewp/wp-graphql-gravity-forms/actions/workflows/code-quality.yml/badge.svg)](https://github.com/axewp/wp-graphql-gravity-forms/actions/workflows/code-quality.yml) [![Schema Linter](https://github.com/axewp/wp-graphql-gravity-forms/actions/workflows/schema-linter.yml/badge.svg)](https://github.com/axewp/wp-graphql-gravity-forms/actions/workflows/schema-linter.yml) ## Overview diff --git a/phpstan/constants.php b/phpstan/constants.php index f6a7546f..77b72ef9 100644 --- a/phpstan/constants.php +++ b/phpstan/constants.php @@ -5,4 +5,4 @@ define( 'CRGEARY_JAMSTACK_DEPLOYMENTS_OPTIONS_KEY', 'wp-jamstack-deployments' ); define( 'WPGRAPHQL_GF_PLUGIN_FILE', 'wp-graphql-gravity-forms.php' ); -define( 'WPGRAPHQL_GF_VERSION', '0.13.0' ); +define( 'WPGRAPHQL_GF_VERSION', '0.13.0.1' ); diff --git a/readme.txt b/readme.txt index d63aeb5f..cbcd3703 100644 --- a/readme.txt +++ b/readme.txt @@ -6,7 +6,7 @@ Tested up to: 6.5 Requires PHP: 7.4 Requires Gravity Forms: 2.7.0 Requires WPGraphQL: 1.26.0 -Stable tag: 0.13.0 +Stable tag: 0.13.0.1 Maintained at: https://github.com/axewp/wp-graphql-gravity-forms License: GPL-3 License URI: https://www.gnu.org/licenses/gpl-3.0.html diff --git a/wp-graphql-gravity-forms.php b/wp-graphql-gravity-forms.php index f0f9cd22..fe38e5e6 100644 --- a/wp-graphql-gravity-forms.php +++ b/wp-graphql-gravity-forms.php @@ -7,7 +7,7 @@ * Author: AxePress Development * Author URI: https://axepress.dev * Update URI: https://github.com/axewp/wp-graphql-gravity-forms/releases - * Version: 0.13.0 + * Version: 0.13.0.1 * Text Domain: wp-graphql-gravity-forms * Domain Path: /languages * Requires at least: 6.0 @@ -51,7 +51,7 @@ function constants(): void { // Plugin version. if ( ! defined( 'WPGRAPHQL_GF_VERSION' ) ) { - define( 'WPGRAPHQL_GF_VERSION', '0.13.0' ); + define( 'WPGRAPHQL_GF_VERSION', '0.13.1' ); } // Plugin Folder Path. From d936be2feb3dc534bec9c174f40f5f323da7c2d5 Mon Sep 17 00:00:00 2001 From: David Levine Date: Fri, 2 Aug 2024 23:02:42 +0000 Subject: [PATCH 2/2] ci: test compatibility with WP 6.6 --- .github/workflows/integration-testing.yml | 6 ++++-- CHANGELOG.md | 1 + bin/run-docker.sh | 10 +++++----- readme.txt | 2 +- wp-graphql-gravity-forms.php | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml index 9befa2dd..545b76d6 100644 --- a/.github/workflows/integration-testing.yml +++ b/.github/workflows/integration-testing.yml @@ -31,10 +31,10 @@ jobs: strategy: matrix: php: [ '8.2', '8.1', '8.0' ] - wordpress: [ '6.5', '6.4','6.3', '6.2'] + wordpress: [ '6.6', '6.5', '6.4','6.3', '6.2'] include: - php: '8.2' - wordpress: '6.5' + wordpress: '6.6' coverage: 1 - php: '8.0' wordpress: '6.1' @@ -48,6 +48,8 @@ jobs: # New WP versions that dont support older PHP versions - php: "8.0" wordpress: "6.5" + - php: "8.0" + wordpress: "6.6" fail-fast: false steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index a382e3ad..7b7a61e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This _patch_ release fixes compatibility with Composer-based WordPress installat - fix: Return `wp_max_upload_size()` instead of `null` if `GfFieldWithFileSizeSetting.maxFileSize` is `null`. H/t @Gytjarek - fix: Fix typo in Autoloader release URL. - fix: Ensure a valid source ID exists before attempting to resolve a `connectedFormField`. +- ci: Test compatibility against WP 6.6. - ci: Replace calls to `docker-compose` with `docker compose`. ## v0.13.0 diff --git a/bin/run-docker.sh b/bin/run-docker.sh index ddb6cdf0..01fe6edc 100644 --- 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.5 PHP_VERSION=8.2 composer build-app" - echo " WP_VERSION=6.5 PHP_VERSION=8.2 composer run-app" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 composer build-app" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 composer run-app" echo "" - echo " WP_VERSION=6.5 PHP_VERSION=8.2 bin/run-docker.sh build -a" - echo " WP_VERSION=6.5 PHP_VERSION=8.2 bin/run-docker.sh run -a" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 bin/run-docker.sh build -a" + echo " WP_VERSION=6.6 PHP_VERSION=8.2 bin/run-docker.sh run -a" exit 1 } @@ -29,7 +29,7 @@ if [ $# -eq 0 ]; then fi TAG=${TAG-latest} -WP_VERSION=${WP_VERSION-6.5} +WP_VERSION=${WP_VERSION-6.6} PHP_VERSION=${PHP_VERSION-8.2} BUILD_NO_CACHE=${BUILD_NO_CACHE-} diff --git a/readme.txt b/readme.txt index cbcd3703..fc64112d 100644 --- a/readme.txt +++ b/readme.txt @@ -2,7 +2,7 @@ Contributors: justlevine, kellenmace, mtdbyanechko, tinytoolbox Tags: Forms, GraphQL, Gatsby, Headless, GF, Gravity, WPGraphQL, React Requires at least: 6.0 -Tested up to: 6.5 +Tested up to: 6.6 Requires PHP: 7.4 Requires Gravity Forms: 2.7.0 Requires WPGraphQL: 1.26.0 diff --git a/wp-graphql-gravity-forms.php b/wp-graphql-gravity-forms.php index fe38e5e6..fa0ce49b 100644 --- a/wp-graphql-gravity-forms.php +++ b/wp-graphql-gravity-forms.php @@ -11,7 +11,7 @@ * Text Domain: wp-graphql-gravity-forms * Domain Path: /languages * Requires at least: 6.0 - * Tested up to: 6.5 + * Tested up to: 6.6 * Requires PHP: 7.4 * Requires Plugins: wp-graphql * WPGraphQL requires at least: 1.26.0