Update in alignment with GraphQL 3.0 (#32)

Author: pmelab

.travis.yml

@@ -2,9 +2,13 @@ language: php
 sudo: false
 
 php:
+  - 7.3
+  - 7.2
   - 7.1
-  - 7
-  - 5.6
+  - 7.0
+
+services:
+  - mysql
 
 env:
   global:
@@ -13,24 +17,23 @@ env:
     - SIMPLETEST_DB=mysql://root:@127.0.0.1/graphql
     - TRAVIS=true
   matrix:
-    - DRUPAL_CORE=8.4.x
-    - DRUPAL_CORE=8.5.x
-    - DRUPAL_CORE=8.6.x
+    - DRUPAL_CORE=8.7.x
+    - DRUPAL_CORE=8.8.x
 
 matrix:
   # Don't wait for the allowed failures to build.
   fast_finish: true
   include:
-    - php: 7.1
+    - php: 7.3
       env:
-        - DRUPAL_CORE=8.6.x
+        - DRUPAL_CORE=8.7.x
         # Only run code coverage on the latest php and drupal versions.
         - WITH_PHPDBG_COVERAGE=true
   allow_failures:
     # Allow the code coverage report to fail.
-    - php: 7.1
+    - php: 7.3
       env:
-        - DRUPAL_CORE=8.6.x
+        - DRUPAL_CORE=8.7.x
         # Only run code coverage on the latest php and drupal versions.
         - WITH_PHPDBG_COVERAGE=true
 
@@ -54,14 +57,6 @@ before_install:
       else export PHPINI=$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini;
     fi
 
-  # PHP Deprecated: Automatically populating $HTTP_RAW_POST_DATA is deprecated
-  # and will be removed in a future version. To avoid this warning set
-  # 'always_populate_raw_post_data' to '-1' in php.ini and use the php://input
-  # stream instead.
-  - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]];
-      then echo always_populate_raw_post_data = -1 >> $PHPINI;
-    fi;
-
   # Disable the default memory limit.
   - echo memory_limit = -1 >> $PHPINI
 
@@ -92,10 +87,17 @@ install:
 
   # Bring in the module dependencies without requiring a merge plugin. The
   # require also triggers a full 'composer install'.
-  - composer --working-dir=$DRUPAL_BUILD_DIR require webonyx/graphql-php:^0.12.6
+  - composer --working-dir=$DRUPAL_BUILD_DIR require webonyx/graphql-php:^0.12.5
+
+  # For Drupal < 8.8 we have to manually upgrade zend-stdlib to avoid PHP 7.3
+  # incompatibilities.
+  - if [[ "$DRUPAL_CORE" = "8.6.x" || "$DRUPAL_CORE" = "8.7.x" ]];
+      then composer --working-dir=$DRUPAL_BUILD_DIR require zendframework/zend-stdlib:3.2.1;
+    fi
 
-  # Update PHPUnit for Drupal version >= 8.5.0
-  - if [[ "$DRUPAL_CORE" != "8.4.x" ]];
+  # For Drupal < 8.8 we have to manually upgrade phpunit to avoid PHP 7.3
+  # incompatibilities.
+  - if [[ "$DRUPAL_CORE" = "8.6.x" || "$DRUPAL_CORE" = "8.7.x" ]];
       then composer --working-dir=$DRUPAL_BUILD_DIR run-script drupal-phpunit-upgrade;
     fi
 

tests/src/Kernel/ViewsTest.php

@@ -43,7 +43,7 @@ public function testSimpleView() {
       'node:2',
       'node:3',
       'node_list',
-    ]));
+    ])->addCacheContexts(['user']));
   }
 
   /**
@@ -90,7 +90,7 @@ public function testPagedView() {
       'node:8',
       'node:9',
       'node_list',
-    ]));
+    ])->addCacheContexts(['user']));
   }
 
   /**
@@ -145,7 +145,7 @@ public function testSortedView() {
       'node:8',
       'node:9',
       'node_list',
-    ]));
+    ])->addCacheContexts(['user']));
   }
 
   /**
@@ -177,7 +177,7 @@ public function testFilteredView() {
       'node:4',
       'node:7',
       'node_list',
-    ]));
+    ])->addCacheContexts(['user']));
   }
 
   /**
@@ -214,7 +214,7 @@ public function testMultiValueFilteredView() {
       'node:8',
       'node_list',
 
-    ]));
+    ])->addCacheContexts(['user']));
   }
 
   /**
@@ -256,7 +256,7 @@ public function testComplexFilteredView() {
       'node:8',
       'node:9',
       'node_list',
-    ]));
+    ])->addCacheContexts(['user']));
   }
 
   /**

tests/src/Kernel/ViewsTestBase.php

@@ -2,14 +2,12 @@
 
 namespace Drupal\Tests\graphql_views\Kernel;
 
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\simpletest\ContentTypeCreationTrait;
-use Drupal\simpletest\NodeCreationTrait;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\user\Entity\Role;
+use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
 use Drupal\Tests\graphql_core\Kernel\GraphQLContentTestBase;
-use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait;
+use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
+use Drupal\Tests\node\Traits\NodeCreationTrait;
 
 /**
  * Base class for test views support in GraphQL.
@@ -20,7 +18,6 @@ abstract class ViewsTestBase extends GraphQLContentTestBase {
   use NodeCreationTrait;
   use ContentTypeCreationTrait;
   use EntityReferenceTestTrait;
-  use TaxonomyTestTrait;
 
   /**
    * {@inheritdoc}