Skip to content

Commit 22fbddd

Browse files
authored
Merge pull request #5 from benada002/fix-1.6-compat
Update wp-graphql to v1.6.*
2 parents 6470846 + da97c8f commit 22fbddd

File tree

206 files changed

+5408
-3657
lines changed

Some content is hidden

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

206 files changed

+5408
-3657
lines changed

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
},
1818
"require": {
1919
"php": ">=7.1.0",
20-
"wp-graphql/wp-graphql": "^1.3",
21-
"ivome/graphql-relay-php": "^0.5.0"
20+
"wp-graphql/wp-graphql": "^1.6",
21+
"ivome/graphql-relay-php": "^0.6.0"
2222
},
2323
"require-dev": {
2424
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",

composer.lock

+32-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Registry.php

+2
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ public function registerWidgetType($typeName, $config)
192192
$objectName = \graphql_format_type_name($typeName);
193193
$this->widgetTypes[$typeName] = $objectName;
194194

195+
$config['eagerlyLoadType'] = true;
196+
195197
\register_graphql_object_type($objectName, $config);
196198
}
197199
}

vendor/composer/installed.json

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
[
22
{
33
"name": "ivome/graphql-relay-php",
4-
"version": "v0.5.0",
5-
"version_normalized": "0.5.0.0",
4+
"version": "v0.6.0",
5+
"version_normalized": "0.6.0.0",
66
"source": {
77
"type": "git",
88
"url": "https://github.com/ivome/graphql-relay-php.git",
9-
"reference": "b227c17e79564d147db2162329f5bdbe19192313"
9+
"reference": "7055fd45b7e552cee4d1290849b84294b0049373"
1010
},
1111
"dist": {
1212
"type": "zip",
13-
"url": "https://api.github.com/repos/ivome/graphql-relay-php/zipball/b227c17e79564d147db2162329f5bdbe19192313",
14-
"reference": "b227c17e79564d147db2162329f5bdbe19192313",
13+
"url": "https://api.github.com/repos/ivome/graphql-relay-php/zipball/7055fd45b7e552cee4d1290849b84294b0049373",
14+
"reference": "7055fd45b7e552cee4d1290849b84294b0049373",
1515
"shasum": ""
1616
},
1717
"require": {
18-
"php": ">=5.4,<8.0-DEV",
19-
"webonyx/graphql-php": ">=0.7.0"
18+
"php": "^7.1 || ^8.0",
19+
"webonyx/graphql-php": "^14.0"
2020
},
2121
"require-dev": {
22-
"phpunit/phpunit": "^4.8",
22+
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
2323
"satooshi/php-coveralls": "~1.0"
2424
},
25-
"time": "2018-05-10T20:18:11+00:00",
25+
"time": "2021-04-24T19:31:29+00:00",
2626
"type": "library",
2727
"installation-source": "dist",
2828
"autoload": {
@@ -44,17 +44,17 @@
4444
},
4545
{
4646
"name": "webonyx/graphql-php",
47-
"version": "v14.4.0",
48-
"version_normalized": "14.4.0.0",
47+
"version": "v14.9.0",
48+
"version_normalized": "14.9.0.0",
4949
"source": {
5050
"type": "git",
5151
"url": "https://github.com/webonyx/graphql-php.git",
52-
"reference": "aab3d49181467db064b41429cde117a7589625fc"
52+
"reference": "36b83621deb5eae354347a2e86dc7aec81b32a82"
5353
},
5454
"dist": {
5555
"type": "zip",
56-
"url": "https://api.github.com/repos/webonyx/graphql-php/zipball/aab3d49181467db064b41429cde117a7589625fc",
57-
"reference": "aab3d49181467db064b41429cde117a7589625fc",
56+
"url": "https://api.github.com/repos/webonyx/graphql-php/zipball/36b83621deb5eae354347a2e86dc7aec81b32a82",
57+
"reference": "36b83621deb5eae354347a2e86dc7aec81b32a82",
5858
"shasum": ""
5959
},
6060
"require": {
@@ -68,9 +68,9 @@
6868
"nyholm/psr7": "^1.2",
6969
"phpbench/phpbench": "^0.16.10",
7070
"phpstan/extension-installer": "^1.0",
71-
"phpstan/phpstan": "0.12.32",
72-
"phpstan/phpstan-phpunit": "0.12.11",
73-
"phpstan/phpstan-strict-rules": "0.12.2",
71+
"phpstan/phpstan": "0.12.82",
72+
"phpstan/phpstan-phpunit": "0.12.18",
73+
"phpstan/phpstan-strict-rules": "0.12.9",
7474
"phpunit/phpunit": "^7.2|^8.5",
7575
"psr/http-message": "^1.0",
7676
"react/promise": "2.*",
@@ -81,7 +81,7 @@
8181
"psr/http-message": "To use standard GraphQL server",
8282
"react/promise": "To leverage async resolving on React PHP platform"
8383
},
84-
"time": "2020-12-03T16:05:21+00:00",
84+
"time": "2021-06-15T16:14:17+00:00",
8585
"type": "library",
8686
"installation-source": "dist",
8787
"autoload": {
@@ -108,23 +108,23 @@
108108
},
109109
{
110110
"name": "wp-graphql/wp-graphql",
111-
"version": "v1.3.5",
112-
"version_normalized": "1.3.5.0",
111+
"version": "v1.6.3",
112+
"version_normalized": "1.6.3.0",
113113
"source": {
114114
"type": "git",
115115
"url": "https://github.com/wp-graphql/wp-graphql.git",
116-
"reference": "b2471c50f338080ea10c8f2f519cf141b32273b1"
116+
"reference": "0068cb66cdb3ad2fe35223862e4b57914f15d01c"
117117
},
118118
"dist": {
119119
"type": "zip",
120-
"url": "https://api.github.com/repos/wp-graphql/wp-graphql/zipball/b2471c50f338080ea10c8f2f519cf141b32273b1",
121-
"reference": "b2471c50f338080ea10c8f2f519cf141b32273b1",
120+
"url": "https://api.github.com/repos/wp-graphql/wp-graphql/zipball/0068cb66cdb3ad2fe35223862e4b57914f15d01c",
121+
"reference": "0068cb66cdb3ad2fe35223862e4b57914f15d01c",
122122
"shasum": ""
123123
},
124124
"require": {
125-
"ivome/graphql-relay-php": "0.5.0",
126-
"php": ">=7.1.0",
127-
"webonyx/graphql-php": "14.4.0"
125+
"ivome/graphql-relay-php": "0.6.0",
126+
"php": "^7.1 || ^8.0",
127+
"webonyx/graphql-php": "14.9.0"
128128
},
129129
"require-dev": {
130130
"automattic/vipwpcs": "^2.2",
@@ -141,14 +141,14 @@
141141
"phpcompatibility/phpcompatibility-wp": "^2.1.0",
142142
"phpstan/extension-installer": "^1.1",
143143
"phpstan/phpstan": "^0.12.64",
144-
"phpunit/phpunit": "^7.5",
144+
"phpunit/phpunit": "^8.5",
145145
"simpod/php-coveralls-mirror": "^3.0",
146146
"squizlabs/php_codesniffer": "^3.5.7",
147147
"szepeviktor/phpstan-wordpress": "^0.7.1",
148148
"wp-coding-standards/wpcs": "^2.3",
149-
"wp-graphql/wp-graphql-testcase": "^1.1"
149+
"wp-graphql/wp-graphql-testcase": "~2.1"
150150
},
151-
"time": "2021-04-07T13:36:57+00:00",
151+
"time": "2021-08-13T17:22:35+00:00",
152152
"type": "wordpress-plugin",
153153
"installation-source": "dist",
154154
"autoload": {

vendor/ivome/graphql-relay-php/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/composer.lock
44
/vendor/
55
/bin/
6-
/build/
6+
/build/
7+
/.phpunit.result.cache
+10-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
language: php
22

33
php:
4-
- 5.4
5-
- 5.5
6-
- 5.6
7-
- 7.0
8-
- nightly
9-
- hhvm
4+
- 7.1
5+
- 7.2
6+
- 7.3
7+
- 7.4
8+
- 8.0
9+
- nightly
1010

1111
install:
12-
- composer install --prefer-dist
12+
- composer install --prefer-dist
1313

1414
script:
15-
- mkdir -p build/logs
16-
- ./bin/phpunit --coverage-clover build/logs/clover.xml tests/
15+
- mkdir -p build/logs
16+
- ./bin/phpunit --coverage-clover build/logs/clover.xml tests/
1717

1818
after_script:
19-
- ./bin/coveralls -v
19+
- ./bin/coveralls -v

vendor/ivome/graphql-relay-php/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"API"
1111
],
1212
"require": {
13-
"php": ">=5.4,<8.0-DEV",
14-
"webonyx/graphql-php": ">=0.7.0"
13+
"php": "^7.1 || ^8.0",
14+
"webonyx/graphql-php": "^14.0"
1515
},
1616
"require-dev": {
17-
"phpunit/phpunit": "^4.8",
17+
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
1818
"satooshi/php-coveralls": "~1.0"
1919
},
2020
"config": {

vendor/ivome/graphql-relay-php/tests/Connection/ArrayConnectionTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
namespace GraphQLRelay\Tests\Connection;
99

1010
use GraphQLRelay\Connection\ArrayConnection;
11+
use PHPUnit\Framework\TestCase;
1112

12-
class ArrayConnectionTest extends \PHPUnit_Framework_TestCase
13+
class ArrayConnectionTest extends TestCase
1314
{
1415
protected $letters = ['A', 'B', 'C', 'D', 'E'];
1516

0 commit comments

Comments
 (0)