Skip to content

Commit 8732ab8

Browse files
committed
Merge pull request #445 from justlevine/release/0.13.0.1
release: 0.13.0.1
2 parents 718a2ff + d936be2 commit 8732ab8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1202
-1060
lines changed

.distignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.devcontainer
12
/.git
23
/.github
34
/.idea
@@ -6,7 +7,9 @@
67
/.wordpress-org
78
/bin
89
/docker
10+
/docker-output
911
/docs
12+
/img
1013
/phpstan
1114
/plugin-build
1215
/tests
@@ -17,6 +20,7 @@
1720
.DS_Store
1821
.env
1922
.env.dist
23+
.gitattributes
2024
.gitignore
2125
.phpcs.xml
2226
.phpcs.xml.dist

.editorconfig

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This file is for unifying the coding style for different editors and IDEs
2+
# editorconfig.org
3+
4+
# WordPress Coding Standards
5+
# https://make.wordpress.org/core/handbook/coding-standards/
6+
7+
root = true
8+
9+
[*]
10+
charset = utf-8
11+
end_of_line = lf
12+
indent_size = 4
13+
tab_width = 4
14+
indent_style = tab
15+
insert_final_newline = true
16+
trim_trailing_whitespace = true
17+
18+
[*.txt]
19+
trim_trailing_whitespace = false
20+
21+
[*.{md,json,yml}]
22+
trim_trailing_whitespace = false
23+
indent_style = space
24+
indent_size = 2
25+
26+
[*.json]
27+
indent_style = tab

.env.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WP_URL=http://localhost
77
WP_DOMAIN=localhost
88
99
ADMIN_USERNAME=admin
10-
ADMIN_PASSWORD=root
10+
ADMIN_PASSWORD=password
1111
ADMIN_PATH=/wp-admin
1212

1313
TEST_DB_NAME=wptests

.gitattributes

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/.github export-ignore
2+
/bin export-ignore
3+
/docker export-ignore
4+
/docs export-ignore
5+
/phpstan export-ignore
6+
/plugin-build export-ignore
7+
/tests export-ignore
8+
/.coveralls.yml export-ignore
9+
/.distignore export-ignore
10+
/.dockerignore export-ignore
11+
/.editorconfig
12+
/.env.dist export-ignore
13+
/.gitattributes export-ignore
14+
/.gitignore export-ignore
15+
/.phpcs.xml.dist export-ignore
16+
/codeception.dist.yml export-ignore
17+
/composer.lock export-ignore
18+
/docker-compose.yml export-ignore
19+
/phpstan.neon.dist export-ignore

.github/workflows/integration-testing.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,13 @@ jobs:
3030

3131
strategy:
3232
matrix:
33-
php: [ '8.2', '8.1', '8.0' ]
34-
wordpress: [ '6.5', '6.4','6.3', '6.2']
33+
## GF 2.9.x only supports from WP 6.5, and we have no way to access earlier versions.
34+
php: [ '8.2', '8.1' ]
35+
wordpress: [ '6.8', '6.7', '6.6', '6.5' ]
3536
include:
3637
- php: '8.2'
37-
wordpress: '6.5'
38+
wordpress: '6.8'
3839
coverage: 1
39-
- php: '8.0'
40-
wordpress: '6.1'
41-
- php: '8.0'
42-
wordpress: '6.0'
43-
- php: '7.4'
44-
wordpress: '6.1'
45-
- php: '7.4'
46-
wordpress: '6.0'
47-
exclude:
48-
# New WP versions that dont support older PHP versions
49-
- php: "8.0"
50-
wordpress: "6.5"
5140
fail-fast: false
5241

5342
steps:
@@ -57,7 +46,7 @@ jobs:
5746
ref: ${{ github.event.pull_request.head.sha }}
5847

5948
- name: Install PHP
60-
uses: shivammathur/setup-php@v2
49+
uses: shivammathur/setup-php@v3
6150
with:
6251
php-version: ${{ matrix.php }}
6352
extensions: json, mbstring
@@ -128,7 +117,7 @@ jobs:
128117

129118
- name: Push CodeCoverage to CodeClimate
130119
if: ${{ matrix.coverage == 1 }}
131-
uses: paambaati/codeclimate-action@v5
120+
uses: paambaati/codeclimate-action@v9
132121
env:
133122
CC_TEST_REPORTER_ID: c8f992fb9d2400821643b093de584af5a3c8d0a8f1f6f4e000592ccf0270ee29
134123
with:

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ auth.json
2525

2626
# Composer deps
2727
vendor
28+
vendor-prefixed
29+
30+
# NPM deps
31+
node_modules
32+
33+
# Built assets - enable once this is on wpackagist
34+
# build
35+
build/tsconfig.tsbuildinfo
2836

2937
# Generated Schema used in some tooling. Versioned Schema is uploaded as a Release artifact to Github.
3038
schema.graphql
@@ -34,6 +42,9 @@ wp-cli.local.yml
3442

3543
# Tests
3644
*.sql
45+
*.tar.gz
3746
!tests
3847
tests/*.suite.yml
3948
coverage/*
49+
.log/
50+
c3.php

.phpcs.xml.dist

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<ruleset name="WordPress Coding Standards for WPGraphQL for Gravity Forms" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="WordPress Coding Standards for WPGraphQL for Gravity Forms" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
33
<description>Sniffs for the WPGraphQL plugin ecosystem.</description>
44

55
<!-- What to scan: include any root-level PHP files, and the /src folder -->
@@ -28,7 +28,7 @@
2828
<!-- Enables parallel processing when available for faster results. -->
2929
<arg name="parallel" value="20"/>
3030
<!-- Set severity to 1 to see everything that isn't effectively turned off. -->
31-
<arg name="severity" value="1"/>
31+
<arg name="severity" value="1" />
3232

3333
<!-- Ruleset Config: set these to match your project constraints-->
3434

@@ -42,33 +42,45 @@
4242
Tests for WordPress version compatibility.
4343
https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/wiki/Customizable-sniff-properties
4444
-->
45-
<config name="minimum_supported_wp_version" value="6.0"/>
45+
<config name="minimum_wp_version" value="6.2"/>
4646

4747
<!-- Rules: WPGraphQL Coding Standards -->
4848
<!-- https://github.com/AxeWP/WPGraphQL-Coding-Standards/WPGraphQL/ruleset.xml -->
4949
<rule ref="WPGraphQL">
5050
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification" />
5151
<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification" />
5252
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
53+
<!-- @todo remove after PHPCS v4-->
54+
<exclude name="WordPressVIPMinimum.JS" />
55+
<exclude name="Generic.Functions.CallTimePassByReference" />
5356
</rule>
5457

5558
<!-- Individual rule configuration -->
5659
<rule ref="WordPress.WP.Capabilities">
5760
<properties>
58-
<!-- Value: replace the capabilities used. Separate multiple capabilities with a comma. -->
59-
<property name="custom_capabilities" type="array" value="gravityforms_view_entries, gform_full_access" />
61+
<property name="custom_capabilities" type="array">
62+
<element value="gravityforms_view_entries" />
63+
<element value="gform_full_access" />
64+
</property>
6065
</properties>
6166
</rule>
6267
<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
6368
<properties>
6469
<!-- Value: replace the function, class, and variable prefixes used. Separate multiple prefixes with a comma. -->
65-
<property name="prefixes" type="array" value="WPGraphQL\GF, wp_graphql, graphql_gf, _gf, WPGRAPHQL_GF" />
70+
<property name="prefixes" type="array">
71+
<element value="graphql_gf"/>
72+
<element value="WPGRAPHQL_GF"/>
73+
<element value="_gf"/>
74+
<element value="wp_graphql"/>
75+
<element value="WPGraphQL\GF" />
76+
</property>
6677
</properties>
6778
</rule>
6879
<rule ref="WordPress.WP.I18n">
6980
<properties>
70-
<!-- Value: replace the text domain used. -->
71-
<property name="text_domain" type="array" value="wp-graphql-gravity-forms"/>
81+
<property name="text_domain" type="array">
82+
<element value="wp-graphql-gravity-forms" />
83+
</property>
7284
</properties>
7385
</rule>
7486

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@
22

33
## [Unreleased]
44

5+
- ci: Test compatibility against WP 6.8.x and WPGraphQL 1.31.x
6+
- chore: Update Composer dependencies, and remediate PHPCS/PHPStan issues.
7+
- tests: Fix Composer-dev namespace for tests.
8+
9+
## [v0.13.0.1]
10+
11+
This _patch_ release fixes compatibility with Composer-based WordPress installations, and a few minor issues introduced in the previous release.
12+
513
- fix: Check if classes are loaded by a different autoloader before attempting to autoload them. H/t @cvanh
614
- fix: Return `wp_max_upload_size()` instead of `null` if `GfFieldWithFileSizeSetting.maxFileSize` is `null`. H/t @Gytjarek
715
- fix: Fix typo in Autoloader release URL.
816
- fix: Ensure a valid source ID exists before attempting to resolve a `connectedFormField`.
17+
- ci: Test compatibility against WP 6.6.
918
- ci: Replace calls to `docker-compose` with `docker compose`.
1019

1120
## v0.13.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ A WordPress plugin that adds <a href="https://wpgraphql.com" target="_blank">WPG
88

99
-----
1010

11-
![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)<br />
11+
![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)<br />
1212
[![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)
1313

1414
## Overview

bin/run-docker.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ print_usage_instructions() {
1616
echo " composer build-app"
1717
echo " composer run-app"
1818
echo ""
19-
echo " WP_VERSION=6.5 PHP_VERSION=8.2 composer build-app"
20-
echo " WP_VERSION=6.5 PHP_VERSION=8.2 composer run-app"
19+
echo " WP_VERSION=6.8 PHP_VERSION=8.2 composer build-app"
20+
echo " WP_VERSION=6.8 PHP_VERSION=8.2 composer run-app"
2121
echo ""
22-
echo " WP_VERSION=6.5 PHP_VERSION=8.2 bin/run-docker.sh build -a"
23-
echo " WP_VERSION=6.5 PHP_VERSION=8.2 bin/run-docker.sh run -a"
22+
echo " WP_VERSION=6.8 PHP_VERSION=8.2 bin/run-docker.sh build -a"
23+
echo " WP_VERSION=6.8 PHP_VERSION=8.2 bin/run-docker.sh run -a"
2424
exit 1
2525
}
2626

@@ -29,7 +29,7 @@ if [ $# -eq 0 ]; then
2929
fi
3030

3131
TAG=${TAG-latest}
32-
WP_VERSION=${WP_VERSION-6.5}
32+
WP_VERSION=${WP_VERSION-6.8}
3333
PHP_VERSION=${PHP_VERSION-8.2}
3434

3535
BUILD_NO_CACHE=${BUILD_NO_CACHE-}

0 commit comments

Comments
 (0)