Skip to content

Commit afe6a52

Browse files
actions-useractions-user
committed
Auto-merge master back to develop
2 parents 28f0952 + 8b106a5 commit afe6a52

18 files changed

+62
-46
lines changed

‎.github/workflows/graphiql-e2e-tests.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
name: GraphiQL End-to-End Tests
22

33
on:
4-
pull_request:
5-
push:
6-
branches:
7-
- master
8-
- develop
9-
- 'release/**'
4+
workflow_dispatch:
105

116
jobs:
127
admin:

‎.github/workflows/graphiql-unit-tests.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
name: GraphiQL Unit Tests
22

33
on:
4-
pull_request:
5-
push:
6-
branches:
7-
- master
8-
- develop
9-
- 'release/**'
4+
workflow_dispatch:
105

116
jobs:
127
admin:

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## 1.21.0
4+
5+
### New Features
6+
- [#3035](https://github.com/wp-graphql/wp-graphql/pull/3035): feat: provide better error when field references a type that does not exist
7+
- [#3027](https://github.com/wp-graphql/wp-graphql/pull/3027): feat: Add register_graphql_admin_notice API and intial use to inform users of the new WPGraphQL for ACF plugin
8+
9+
### Chores / Bugfixes
10+
11+
- [#3038](https://github.com/wp-graphql/wp-graphql/pull/3038): chore(deps-dev): bump the composer group across 1 directories with 1 update. Thanks @dependabot!
12+
- [#3033](https://github.com/wp-graphql/wp-graphql/pull/3033): fix: php deprecation error for dynamic properties on AppContext class
13+
- [#3031](https://github.com/wp-graphql/wp-graphql/pull/3031): fix(graphiql): Allow GraphiQL to run even if a valid schema cannot be returned. Thanks @linucks!
14+
315
## 1.20.0
416

517
### New Features

‎constants.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function graphql_setup_constants() {
1818

1919
// Plugin version.
2020
if ( ! defined( 'WPGRAPHQL_VERSION' ) ) {
21-
define( 'WPGRAPHQL_VERSION', '1.20.0' );
21+
define( 'WPGRAPHQL_VERSION', '1.21.0' );
2222
}
2323

2424
// Plugin Folder Path.

‎readme.txt‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: GraphQL, JSON, API, Gatsby, Faust, Headless, Decoupled, Svelte, React, Nex
44
Requires at least: 5.0
55
Tested up to: 6.4.1
66
Requires PHP: 7.1
7-
Stable tag: 1.20.0
7+
Stable tag: 1.21.0
88
License: GPL-3
99
License URI: https://www.gnu.org/licenses/gpl-3.0.html
1010

@@ -252,7 +252,21 @@ Composer dependencies are no longer versioned in Github. Recommended install sou
252252

253253
== Changelog ==
254254

255-
= 1.20.0=
255+
= 1.21.0 =
256+
257+
**New Features**
258+
259+
- [#3035](https://github.com/wp-graphql/wp-graphql/pull/3035): feat: provide better error when field references a type that does not exist
260+
- [#3027](https://github.com/wp-graphql/wp-graphql/pull/3027): feat: Add register_graphql_admin_notice API and intial use to inform users of the new WPGraphQL for ACF plugin
261+
262+
**Chores / Bugfixes**
263+
264+
- [#3038](https://github.com/wp-graphql/wp-graphql/pull/3038): chore(deps-dev): bump the composer group across 1 directories with 1 update. Thanks @dependabot!
265+
- [#3033](https://github.com/wp-graphql/wp-graphql/pull/3033): fix: php deprecation error for dynamic properties on AppContext class
266+
- [#3031](https://github.com/wp-graphql/wp-graphql/pull/3031): fix(graphiql): Allow GraphiQL to run even if a valid schema cannot be returned. Thanks @linucks!
267+
268+
269+
= 1.20.0 =
256270

257271
**New Features**
258272

@@ -273,7 +287,7 @@ Composer dependencies are no longer versioned in Github. Recommended install sou
273287
- [#2996](https://github.com/wp-graphql/wp-graphql/pull/2996): fix: Field id duplicates uri field description. Thanks @marcinkrzeminski!
274288

275289

276-
= 1.19.0=
290+
= 1.19.0 =
277291

278292
**New Features**
279293

‎src/Admin/AdminNotices.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* Breaking changes to this class will not be considered a semver breaking change as there's no
1212
* expectation that users will be calling these functions directly or extending this class.
13-
*
13+
*
1414
* @internal
1515
*/
1616
class AdminNotices {
@@ -113,48 +113,48 @@ public function add_admin_notice( string $slug, array $config ): array {
113113
/**
114114
* Pass the notice through a filter before registering it
115115
*
116-
* @param array<string,mixed> $config The config of the admin notice
117-
* @param string $slug The slug identifying the admin notice
116+
* @param array<string,mixed> $config The config of the admin notice
117+
* @param string $slug The slug identifying the admin notice
118118
*/
119119
$filtered_notice = apply_filters( 'graphql_add_admin_notice', $config, $slug );
120120

121121
// If not a valid config, bail early.
122122
if ( ! $this->is_valid_config( $config ) ) {
123123
return [];
124124
}
125-
125+
126126
$this->admin_notices[ $slug ] = $filtered_notice;
127127
return $this->admin_notices[ $slug ];
128128
}
129129

130130
/**
131131
* Throw an error if the config is not valid.
132132
*
133-
* @since @TODO
133+
* @since v1.21.0
134134
*
135135
* @param array<string,mixed> $config The config of the admin notice
136136
*/
137137
public function is_valid_config( array $config ): bool {
138138
if ( empty( $config['message'] ) ) {
139-
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'Config message is required', 'wp-graphql' ), '@TODO' );
139+
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'Config message is required', 'wp-graphql' ), '1.21.0' );
140140
return false;
141141
}
142142

143143
if ( isset( $config['conditions'] ) && ! is_callable( $config['conditions'] ) ) {
144-
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'Config conditions should be callable', 'wp-graphql' ), '@TODO' );
144+
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'Config conditions should be callable', 'wp-graphql' ), '1.21.0' );
145145
return false;
146146
}
147147

148148
if ( isset( $config['type'] ) && ! in_array( $config['type'], [ 'error', 'warning', 'success', 'info' ], true ) ) {
149-
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'Config type should be one of the following: error | warning | success | info', 'wp-graphql' ), '@TODO' );
149+
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'Config type should be one of the following: error | warning | success | info', 'wp-graphql' ), '1.21.0' );
150150
return false;
151151
}
152152

153153
if ( isset( $config['is_dismissable'] ) && ! is_bool( $config['is_dismissable'] ) ) {
154-
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'is_dismissable should be a boolean', 'wp-graphql' ), '@TODO' );
154+
_doing_it_wrong( 'register_graphql_admin_notice', esc_html__( 'is_dismissable should be a boolean', 'wp-graphql' ), '1.21.0' );
155155
return false;
156156
}
157-
157+
158158
return true;
159159
}
160160

‎src/Data/DataSource.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class DataSource {
5959
* @throws \GraphQL\Error\UserError Throws UserError.
6060
* @throws \Exception Throws UserError.
6161
*
62-
* @since 0.0.5
62+
* @since 0.0.5
6363
*
6464
* @deprecated Use the Loader passed in $context instead
6565
*/

‎tests/wpunit/AssertValidSchemaTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class AssertValidSchemaTest extends \Tests\WPGraphQL\TestCase\WPGraphQLTestCase {
44

55
public function setUp(): void {
6-
parent::setUp(); // TODO: Change the autogenerated stub
6+
parent::setUp();
77

88
$settings = get_option( 'graphql_general_settings' );
99
$settings['public_introspection_enabled'] = 'on';

‎tests/wpunit/ConnectionInterfaceTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ class ConnectionInterfaceTest extends \Tests\WPGraphQL\TestCase\WPGraphQLTestCas
44

55
public function setUp(): void {
66
$this->clearSchema();
7-
parent::setUp(); // TODO: Change the autogenerated stub
7+
parent::setUp();
88
}
99

1010
public function tearDown(): void {
1111
$this->clearSchema();
12-
parent::tearDown(); // TODO: Change the autogenerated stub
12+
parent::tearDown();
1313
}
1414

1515
public function interfaceQuery( string $name ) {

‎tests/wpunit/ContentNodeInterfaceTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class ContentNodeInterfaceTest extends \Tests\WPGraphQL\TestCase\WPGraphQLTestCa
55
public $admin;
66

77
public function setUp(): void {
8-
parent::setUp(); // TODO: Change the autogenerated stub
8+
parent::setUp();
99

1010
$this->admin = $this->factory()->user->create(
1111
[
@@ -20,7 +20,7 @@ public function tearDown(): void {
2020
$this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
2121
$this->clearSchema();
2222

23-
parent::tearDown(); // TODO: Change the autogenerated stub
23+
parent::tearDown();
2424
}
2525

2626
/**

0 commit comments

Comments
 (0)