Drupal 9 compatibility for 3.x #1067

hugovk · 2020-08-14T15:31:50Z

Fixes #1011.
Based on, replaces and closes #1012 (with thanks to @damienmckenna).

Because the GraphQL v4 module isn't compatible with Drupal 8, contains breaking changes and requires a lot of rewriting, it will help the community to be able migrate to Drupal 9 sooner and by changing fewer things at each step.

Also, v4 is still in beta and therefore not covered by the security advisory policy, so may be not ready for production.

Once migrated to D9, users will be able to perform the v4 upgrade.

The tests pass on Travis CI for Drupal 8.8, 8.9 and 9.0.

Our D8.9 site's own unit tests pass with these changes.

'core: 8.x' not needed for 8.8+ 'core_version_requirement' not needed for test modules https://www.drupal.org/node/3070687 Co-authored-by: Damien McKenna <[email protected]>

Co-authored-by: Damien McKenna <[email protected]>

…it\Framework\MockObject\MockObject Co-authored-by: Damien McKenna <[email protected]>

Co-authored-by: Damien McKenna <[email protected]>

codecov · 2020-08-14T15:45:45Z

Codecov Report

Merging #1067 into 8.x-3.x will increase coverage by 0.00%.
The diff coverage is 75.00%.

@@            Coverage Diff             @@
##             8.x-3.x    #1067   +/-   ##
==========================================
  Coverage      78.71%   78.72%           
  Complexity      1139     1139           
==========================================
  Files            192      192           
  Lines           3026     3027    +1     
==========================================
+ Hits            2382     2383    +1     
  Misses           644      644

Impacted Files	Coverage Δ	Complexity Δ
src/Form/EntityQueryMapImportForm.php	`0.00% <0.00%> (ø)`	`7.00 <0.00> (ø)`
src/Routing/QueryRouteEnhancer.php	`97.05% <100.00%> (+0.08%)`	`17.00 <0.00> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 94cbcd4...7aa668b. Read the comment docs.

carolpettirossi

I created a patch from #1067 and applied successfully to 3.x-dev. :tallyhappy:

Upgrade status marks as green. However, few warnings that could be fixed (maybe in a separate issue?)

acha5066

I have tested this PR with 9.0.6 and all my queries and mutations are working as expected. Nice work!

The warnings mentioned seem to be related to Symfony rather Drupal so they shouldn't be blockers

gheydon · 2020-09-25T11:03:03Z

modules/graphql_core/graphql_core.info.yml

I know this is small, but we should be using the new format for dependencies, graphql:graphql

gheydon · 2020-09-25T11:03:15Z

modules/graphql_core/tests/modules/graphql_block_test/graphql_block_test.info.yml

  - block
  - block_content


gheydon · 2020-09-25T11:03:24Z

modules/graphql_core/tests/modules/graphql_breadcrumbs_test/graphql_breadcrumbs_test.info.yml

@@ -2,6 +2,6 @@ name: GraphQL Breadcrumbs test
 type: module
 description: 'Test for breadcrumbs.'
 package: GraphQL
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 dependencies:
 - graphql_breadcrumbs


gheydon · 2020-09-25T11:03:33Z

modules/graphql_core/tests/modules/graphql_requests_test/graphql_requests_test.info.yml

@@ -2,7 +2,7 @@ type: module
 name: GraphQL Requests Test
 description: Dummy callbacks for internal request testing.
 package: Testing
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: TRUE
 dependencies:
 - graphql_core


gheydon · 2020-09-25T11:03:44Z

modules/graphql_core/tests/modules/graphql_test_menu/graphql_test_menu.info.yml

@@ -1,5 +1,5 @@
 name: 'GraphQL Tests: Menu'
 type: module
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 dependencies:
  - system


gheydon · 2020-09-25T11:03:56Z

tests/modules/graphql_enum_test/graphql_enum_test.info.yml

@@ -2,7 +2,7 @@ type: module
 name: GraphQL Enumeration Test
 description: Test enumeration plugins.
 package: Testing
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: TRUE
 dependencies:
 - graphql


gheydon · 2020-09-25T11:04:04Z

tests/modules/graphql_override_test/graphql_override_test.info.yml

@@ -2,7 +2,7 @@ type: module
 name: GraphQL Override Test
 description: Test plugin overrides in graphql schema.
 package: Testing
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: TRUE
 dependencies:
 - graphql_plugin_test


gheydon · 2020-09-25T11:04:10Z

tests/modules/graphql_test/graphql_test.info.yml

@@ -2,7 +2,7 @@ type: module
 name: GraphQL Test
 description: Provides a default schema plugin for testing.
 package: Testing
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: TRUE
 dependencies:
 - graphql


bartlangelaan · 2020-10-14T11:51:14Z

modules/graphql_core/graphql_core.info.yml

@@ -1,7 +1,6 @@
 name: GraphQL Core
 type: module
 description: 'Provides type system plugins and derivers on behalf of core modules.'
-package: GraphQL
-core: 8.x
+package: Testing


Why? This is not a 'Testing' package - it is a normal submodule that is meant to be installed by users.

* Update core_version_requirement for Drupal 8.8+ and 9+ 'core: 8.x' not needed for 8.8+ 'core_version_requirement' not needed for test modules https://www.drupal.org/node/3070687 Co-authored-by: Damien McKenna <[email protected]> * Test D9.0 on Travis CI * Replace deprecated drupal_set_message() with messenger->addMessage() Co-authored-by: Damien McKenna <[email protected]> * Replace deprecated file_directory_temp() with getTempDirectory() Co-authored-by: Damien McKenna <[email protected]> * Replace deprecated PHPUnit_Framework_MockObject_MockObject with PHPUnit\Framework\MockObject\MockObject Co-authored-by: Damien McKenna <[email protected]> * Replace deprecated RouteEnhancerInterface with EnhancerInterface Co-authored-by: Damien McKenna <[email protected]> * Remove deprecated PHPUnit_Framework_Error_Warning * Replace 'core: 8.x' with 'core_version_requirement: ^8.8 || ^9' * Replace deprecated entity.manager with entity_type.manager * Must enable the path_alias module in tests * Replace deprecated url() with createFileUrl(FALSE) * Assert menu is an object, rather than assert it is true * chore: adjust things mentioned in #1067 * chore: adjust info.yml files for test modules * chore: trigger travis build * chore: keep composer at version 1 Co-authored-by: Hugo van Kemenade <[email protected]> Co-authored-by: Damien McKenna <[email protected]>

hugovk · 2020-10-29T14:54:12Z

Merged in #1102 and released in https://www.drupal.org/project/graphql/releases/8.x-3.1 🎈

hugovk and others added 12 commits August 14, 2020 18:03

Update core_version_requirement for Drupal 8.8+ and 9+

70a620b

'core: 8.x' not needed for 8.8+ 'core_version_requirement' not needed for test modules https://www.drupal.org/node/3070687 Co-authored-by: Damien McKenna <[email protected]>

Test D9.0 on Travis CI

0f5ee9a

Replace deprecated drupal_set_message() with messenger->addMessage()

a2f2c6b

Co-authored-by: Damien McKenna <[email protected]>

Replace deprecated file_directory_temp() with getTempDirectory()

bb46285

Co-authored-by: Damien McKenna <[email protected]>

Replace deprecated PHPUnit_Framework_MockObject_MockObject with PHPUn…

3551fff

…it\Framework\MockObject\MockObject Co-authored-by: Damien McKenna <[email protected]>

Replace deprecated RouteEnhancerInterface with EnhancerInterface

d01e5e7

Co-authored-by: Damien McKenna <[email protected]>

Remove deprecated PHPUnit_Framework_Error_Warning

7d65401

Replace 'core: 8.x' with 'core_version_requirement: ^8.8 || ^9'

f7696ed

Replace deprecated entity.manager with entity_type.manager

da62c79

Must enable the path_alias module in tests

1c1e161

Replace deprecated url() with createFileUrl(FALSE)

227303a

Assert menu is an object, rather than assert it is true

7aa668b

This was referenced Aug 14, 2020

Drupal 9 compatibility #1012

Closed

Drupal 9 compatibility for 3.x #1011

Closed

joaogarin requested review from fubhy and pmelab and removed request for fubhy August 25, 2020 08:10

hugovk mentioned this pull request Aug 31, 2020

Drupal 9 compatibility #1028

Closed

klausi added the 3.x label Aug 31, 2020

carolpettirossi approved these changes Aug 31, 2020

View reviewed changes

acha5066 approved these changes Sep 18, 2020

View reviewed changes

acha5066 mentioned this pull request Sep 21, 2020

Make D9 compatible drupal-graphql/graphql-apq#12

Open

gheydon suggested changes Sep 25, 2020

View reviewed changes

bartlangelaan reviewed Oct 14, 2020

View reviewed changes

Leksat added a commit to Leksat/graphql-drupal that referenced this pull request Oct 27, 2020

chore: adjust things mentioned in drupal-graphql#1067

2068c27

Leksat mentioned this pull request Oct 27, 2020

Drupal 9 compatibility for 3.x #1102

Merged

hugovk closed this Oct 29, 2020

hugovk deleted the 8.x-3.x-drupal-9-compatibility branch October 29, 2020 14:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Drupal 9 compatibility for 3.x #1067

Drupal 9 compatibility for 3.x #1067

Uh oh!

hugovk commented Aug 14, 2020

Uh oh!

codecov bot commented Aug 14, 2020

Uh oh!

carolpettirossi left a comment

Uh oh!

acha5066 left a comment

Uh oh!

gheydon Sep 25, 2020

Uh oh!

gheydon Sep 25, 2020

Uh oh!

gheydon Sep 25, 2020

Uh oh!

gheydon Sep 25, 2020

Uh oh!

gheydon Sep 25, 2020

Uh oh!

gheydon Sep 25, 2020

Uh oh!

gheydon Sep 25, 2020

Uh oh!

gheydon Sep 25, 2020

Uh oh!

bartlangelaan Oct 14, 2020

Uh oh!

hugovk commented Oct 29, 2020

Uh oh!

Uh oh!

Drupal 9 compatibility for 3.x #1067

Drupal 9 compatibility for 3.x #1067

Uh oh!

Conversation

hugovk commented Aug 14, 2020

Uh oh!

codecov bot commented Aug 14, 2020

Codecov Report

Uh oh!

carolpettirossi left a comment

Choose a reason for hiding this comment

Uh oh!

acha5066 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hugovk commented Oct 29, 2020

Uh oh!

Uh oh!