Basemodule cleanup. (#374)

Author: pmelab

src/Plugin/GraphQL/Fields/JsonPathToUrl.php

@@ -3,7 +3,7 @@
 namespace Drupal\graphql_json\Plugin\GraphQL\Fields;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\graphql_core\Plugin\GraphQL\Fields\Route;
+use Drupal\graphql_core\Plugin\GraphQL\Fields\Routing\Route;
 use Youshido\GraphQL\Execution\ResolveInfo;
 
 /**

src/Plugin/GraphQL/Fields/JsonResponseContent.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\graphql_json\Plugin\GraphQL\Fields;
 
-use Drupal\graphql_core\Plugin\GraphQL\Fields\ResponseContent;
+use Drupal\graphql_core\Plugin\GraphQL\Fields\Routing\ResponseContent;
 use Youshido\GraphQL\Execution\ResolveInfo;
 
 /**

tests/src/Kernel/JsonEntitySerializeTest.php

@@ -6,7 +6,7 @@
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
-use Drupal\Tests\graphql_core\Kernel\GraphQLFileTestBase;
+use Drupal\Tests\graphql\Kernel\GraphQLFileTestBase;
 use Drupal\user\Entity\Role;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Psr7\Response;
@@ -24,6 +24,7 @@ class JsonEntitySerializeTest extends GraphQLFileTestBase {
   public static $modules = [
     'node',
     'serialization',
+    'graphql_core',
     'graphql_content',
     'graphql_json',
   ];

tests/src/Kernel/JsonEntityTest.php

@@ -6,7 +6,7 @@
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\node\Entity\Node;
 use Drupal\node\NodeInterface;
-use Drupal\Tests\graphql_core\Kernel\GraphQLFileTestBase;
+use Drupal\Tests\graphql\Kernel\GraphQLFileTestBase;
 use Drupal\user\Entity\Role;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Psr7\Response;
@@ -23,6 +23,7 @@ class JsonEntityTest extends GraphQLFileTestBase {
    */
   public static $modules = [
     'node',
+    'graphql_core',
     'graphql_content',
     'graphql_json',
   ];

tests/src/Kernel/JsonFieldTest.php

@@ -14,7 +14,7 @@
 use Drupal\node\Entity\NodeType;
 use Drupal\simpletest\ContentTypeCreationTrait;
 use Drupal\simpletest\NodeCreationTrait;
-use Drupal\Tests\graphql_core\Traits\GraphQLFileTestTrait;
+use Drupal\Tests\graphql\Traits\GraphQLFileTestTrait;
 use Drupal\user\Entity\Role;
 
 /**
@@ -37,6 +37,7 @@ class JsonFieldTest extends KernelTestBase {
     'node',
     'user',
     'graphql',
+    'graphql_test',
     'graphql_core',
     'graphql_content',
     'graphql_file',

tests/src/Kernel/JsonStructureTest.php

@@ -3,7 +3,7 @@
 namespace Drupal\Tests\graphql_json\Kernel;
 
 
-use Drupal\Tests\graphql_core\Kernel\GraphQLFileTestBase;
+use Drupal\Tests\graphql\Kernel\GraphQLFileTestBase;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Psr7\Response;
 
@@ -18,6 +18,7 @@ class JsonStructureTest extends GraphQLFileTestBase {
    * {@inheritdoc}
    */
   public static $modules = [
+    'graphql_core',
     'graphql_content',
     'graphql_json',
   ];

tests/src/Kernel/JsonUrlTest.php

@@ -3,7 +3,7 @@
 namespace Drupal\Tests\graphql_json\Kernel;
 
 
-use Drupal\Tests\graphql_core\Kernel\GraphQLFileTestBase;
+use Drupal\Tests\graphql\Kernel\GraphQLFileTestBase;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Psr7\Response;
 
@@ -18,6 +18,7 @@ class JsonUrlTest extends GraphQLFileTestBase {
    * {@inheritdoc}
    */
   public static $modules = [
+    'graphql_core',
     'graphql_content',
     'graphql_json',
   ];