TypeHintMissing and ReturnTypeSpaces Rules removed (#1063)

Dylan203 · web-flow · commit 557a925dee46 · 2020-08-11T13:26:45.000+02:00
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -45,8 +45,6 @@
     <exclude name="Drupal.Commenting.FunctionComment.ParamMissingDefinition"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
     <exclude name="Drupal.Commenting.FunctionComment.ReturnCommentIndentation"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ReturnTypeSpaces"/>
-    <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
 
 </ruleset>
diff --git a/src/Controller/ExplorerController.php b/src/Controller/ExplorerController.php
@@ -79,7 +79,7 @@ public function __construct(UrlGeneratorInterface $urlGenerator, Introspection $
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request.
    *
-   * @return array The render array.
+   * @return array
    *   The render array.
    */
   public function viewExplorer(ServerInterface $graphql_server, Request $request) {
diff --git a/src/Controller/VoyagerController.php b/src/Controller/VoyagerController.php
@@ -47,7 +47,7 @@ public function __construct(Introspection $introspection) {
    * @param \Drupal\graphql\Entity\ServerInterface $graphql_server
    *   The server.
    *
-   * @return array The render array.
+   * @return array
    *   The render array.
    */
   public function viewVoyager(ServerInterface $graphql_server) {
diff --git a/src/Entity/ServerInterface.php b/src/Entity/ServerInterface.php
@@ -20,7 +20,7 @@ public function executeOperation(OperationParams $operation);
    *
    * @return \Drupal\graphql\GraphQL\Execution\ExecutionResult[]
    */
-  public function executeBatch($operations);
+  public function executeBatch(array $operations);
 
   /**
    * Retrieves the server configuration
diff --git a/src/GraphQL/Resolver/Context.php b/src/GraphQL/Resolver/Context.php
@@ -27,7 +27,7 @@ class Context implements ResolverInterface {
    * Context constructor.
    *
    * @param $name
-   * @param null $default
+   * @param NULL $default
    */
   public function __construct($name, $default = NULL) {
     $this->name = $name;
diff --git a/src/GraphQL/Utility/Introspection.php b/src/GraphQL/Utility/Introspection.php
@@ -14,7 +14,7 @@ class Introspection {
    * @param \Drupal\graphql\Entity\ServerInterface $server
    *   The server instance.
    *
-   * @return array The introspection result as an array.
+   * @return array
    *   The introspection result as an array.
    *
    */
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityAccess.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityAccess.php
@@ -32,8 +32,8 @@ class EntityAccess extends DataProducerPluginBase {
 
   /**
    * @param \Drupal\Core\Entity\EntityInterface $entity
-   * @param null $operation
-   * @param null $user
+   * @param NULL $operation
+   * @param NULL $user
    *
    * @return bool|\Drupal\Core\Access\AccessResultInterface
    */
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php
@@ -114,9 +114,9 @@ public static function create(ContainerInterface $container, array $configuratio
    * @codeCoverageIgnore
    */
   public function __construct(
-    $configuration,
+    array $configuration,
     $pluginId,
-    $pluginDefinition,
+    array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
     EntityBuffer $entityBuffer
@@ -130,7 +130,7 @@ public function __construct(
   /**
    * @param $type
    * @param $id
-   * @param null $language
+   * @param NULL $language
    * @param array|null $bundles
    * @param bool $access
    * @param \Drupal\Core\Session\AccountInterface|NULL $accessUser
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php
@@ -114,9 +114,9 @@ public static function create(ContainerInterface $container, array $configuratio
    * @codeCoverageIgnore
    */
   public function __construct(
-    $configuration,
+    array $configuration,
     $pluginId,
-    $pluginDefinition,
+    array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
     EntityUuidBuffer $entityBuffer
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php
@@ -115,9 +115,9 @@ public static function create(ContainerInterface $container, array $configuratio
    * @codeCoverageIgnore
    */
   public function __construct(
-    $configuration,
+    array $configuration,
     $pluginId,
-    $pluginDefinition,
+    array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
     EntityBuffer $entityBuffer
@@ -131,7 +131,7 @@ public function __construct(
   /**
    * @param $type
    * @param array $ids
-   * @param null $language
+   * @param NULL $language
    * @param array|null $bundles
    * @param bool $access
    * @param \Drupal\Core\Session\AccountInterface|NULL $accessUser
diff --git a/src/Plugin/GraphQL/DataProducer/Field/EntityReference.php b/src/Plugin/GraphQL/DataProducer/Field/EntityReference.php
@@ -116,9 +116,9 @@ public static function create(ContainerInterface $container, array $configuratio
    * @codeCoverageIgnore
    */
   public function __construct(
-    $configuration,
+    array $configuration,
     $pluginId,
-    $pluginDefinition,
+    array $pluginDefinition,
     EntityTypeManagerInterface $entityTypeManager,
     EntityRepositoryInterface $entityRepository,
     EntityBuffer $entityBuffer
@@ -132,7 +132,7 @@ public function __construct(
   /**
    * @param \Drupal\Core\Entity\EntityInterface $entity
    * @param $field
-   * @param null $language
+   * @param NULL $language
    * @param array|null $bundles
    * @param bool $access
    * @param \Drupal\Core\Session\AccountInterface|NULL $accessUser
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLXpath.php b/src/Plugin/GraphQL/DataProducer/XML/XMLXpath.php
@@ -33,7 +33,7 @@ class XMLXpath extends DataProducerPluginBase {
    *  The xpath query.
    * @return \DOMElement
    */
-  public function resolve($dom, $query) {
+  public function resolve(\DOMElement $dom, $query) {
     $xpath = new \DOMXPath($dom->ownerDocument);
     return iterator_to_array($xpath->query($query, $dom));
   }
diff --git a/src/Plugin/GraphQL/Schema/SdlSchemaPluginBase.php b/src/Plugin/GraphQL/Schema/SdlSchemaPluginBase.php
@@ -90,9 +90,9 @@ public static function create(ContainerInterface $container, array $configuratio
    * @codeCoverageIgnore
    */
   public function __construct(
-    $configuration,
+    array $configuration,
     $pluginId,
-    $pluginDefinition,
+    array $pluginDefinition,
     CacheBackendInterface $astCache,
     ModuleHandlerInterface $moduleHandler,
     SchemaExtensionPluginManager $extensionManager,
diff --git a/src/Plugin/GraphQL/SchemaExtension/SdlSchemaExtensionPluginBase.php b/src/Plugin/GraphQL/SchemaExtension/SdlSchemaExtensionPluginBase.php
@@ -47,9 +47,9 @@ public static function create(ContainerInterface $container, array $configuratio
    * @codeCoverageIgnore
    */
   public function __construct(
-    $configuration,
+    array $configuration,
     $pluginId,
-    $pluginDefinition,
+    array $pluginDefinition,
     ModuleHandlerInterface $moduleHandler
   ) {
     parent::__construct($configuration, $pluginId, $pluginDefinition);
diff --git a/tests/src/Traits/DataProducerExecutionTrait.php b/tests/src/Traits/DataProducerExecutionTrait.php
@@ -15,7 +15,7 @@ trait DataProducerExecutionTrait {
    *
    * @return mixed
    */
-  protected function executeDataProducer($id, $contexts = []) {
+  protected function executeDataProducer($id, array $contexts = []) {
     /** @var \Drupal\graphql\Plugin\DataProducerPluginManager $manager */
     $manager = $this->container->get('plugin.manager.graphql.data_producer');
 
diff --git a/tests/src/Traits/HttpRequestTrait.php b/tests/src/Traits/HttpRequestTrait.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\graphql\Traits;
 
 use Drupal\graphql\Entity\Server;
+use Drupal\graphql\Entity\ServerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -64,7 +65,7 @@ protected function query($query, $server = NULL, array $variables = [], array $e
    * @return \Symfony\Component\HttpFoundation\Response
    *   The http response object.
    */
-  protected function batchedQueries(array $queries, $server = NULL) {
+  protected function batchedQueries(array $queries, ServerInterface $server = NULL) {
     $server = $server ?: $this->server;
     if (!($server instanceof Server)) {
       throw new \LogicException('Invalid server.');
diff --git a/tests/src/Traits/MockingTrait.php b/tests/src/Traits/MockingTrait.php
@@ -80,7 +80,7 @@ protected function toBoundPromise($value, $scope) {
    *   Schema id.
    * @param array $values
    */
-  protected function setUpSchema($schema, $id = 'test', $values = []) {
+  protected function setUpSchema($schema, $id = 'test', array $values = []) {
     $this->mockSchema($id, $schema);
     $this->mockSchemaPluginManager($id);
     $this->createTestServer($id, '/graphql/' . $id, $values);
@@ -101,7 +101,7 @@ protected function setUpSchema($schema, $id = 'test', $values = []) {
    *
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  protected function createTestServer($schema, $endpoint, $values = []) {
+  protected function createTestServer($schema, $endpoint, array $values = []) {
     $this->server = Server::create([
       'schema' => $schema,
       'name' => $this->randomGenerator->name(),
@@ -121,7 +121,7 @@ protected function createTestServer($schema, $endpoint, $values = []) {
    * @param \Drupal\graphql\Plugin\SchemaExtensionPluginInterface[] $extensions
    *   An array of schema extension plugins.
    */
-  protected function mockSchema($id, $schema, $extensions = []) {
+  protected function mockSchema($id, $schema, array $extensions = []) {
     /** @var \PHPUnit\Framework\MockObject\MockObject $extensionManager */
     $extensionManager = $this->getMockBuilder(SchemaExtensionPluginManager::class)
       ->disableOriginalConstructor()
diff --git a/tests/src/Traits/QueryResultAssertionTrait.php b/tests/src/Traits/QueryResultAssertionTrait.php
@@ -81,7 +81,7 @@ protected function defaultMutationCacheMetaData() {
    * @param \Drupal\Core\Cache\CacheableMetadata|null $metadata
    *   The expected cache metadata object.
    */
-  protected function assertResults($query, $variables, $expected, CacheableMetadata $metadata = NULL) {
+  protected function assertResults($query, array $variables, array $expected, CacheableMetadata $metadata = NULL) {
     $result = $this->server->executeOperation(
       OperationParams::create([
         'query' => $query,
@@ -106,7 +106,7 @@ protected function assertResults($query, $variables, $expected, CacheableMetadat
    * @param \Drupal\Core\Cache\CacheableMetadata $metadata
    *   The expected cache metadata object.
    */
-  protected function assertErrors($query, $variables, $expected, CacheableMetadata $metadata) {
+  protected function assertErrors($query, array $variables, $expected, CacheableMetadata $metadata) {
     $result = $this->server->executeOperation(
       OperationParams::create([
         'query' => $query,
diff --git a/tests/src/Traits/SchemaPrinterTrait.php b/tests/src/Traits/SchemaPrinterTrait.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\graphql\Traits;
 
 use Drupal\graphql\Entity\Server;
+use Drupal\graphql\Entity\ServerInterface;
 use GraphQL\Utils\SchemaPrinter;
 
 /**
@@ -19,7 +20,7 @@ trait SchemaPrinterTrait {
    * @return string
    *   The printed version of the schema.
    */
-  protected function getPrintedSchema($server = NULL) {
+  protected function getPrintedSchema(ServerInterface $server = NULL) {
     $server = $server ?? $this->server;
     /** @var \GraphQL\Server\ServerConfig $config */
     $config = $server->configuration();

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function __construct(UrlGeneratorInterface $urlGenerator, Introspection $`
`79`	`79`	`* @param \Symfony\Component\HttpFoundation\Request $request`
`80`	`80`	`* The request.`
`81`	`81`	`*`
`82`		`- * @return array The render array.`
	`82`	`+ * @return array`
`83`	`83`	`* The render array.`
`84`	`84`	`*/`
`85`	`85`	`public function viewExplorer(ServerInterface $graphql_server, Request $request) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(Introspection $introspection) {`
`47`	`47`	`* @param \Drupal\graphql\Entity\ServerInterface $graphql_server`
`48`	`48`	`* The server.`
`49`	`49`	`*`
`50`		`- * @return array The render array.`
	`50`	`+ * @return array`
`51`	`51`	`* The render array.`
`52`	`52`	`*/`
`53`	`53`	`public function viewVoyager(ServerInterface $graphql_server) {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function executeOperation(OperationParams $operation);`
`20`	`20`	`*`
`21`	`21`	`* @return \Drupal\graphql\GraphQL\Execution\ExecutionResult[]`
`22`	`22`	`*/`
`23`		`- public function executeBatch($operations);`
	`23`	`+ public function executeBatch(array $operations);`
`24`	`24`
`25`	`25`	`/**`
`26`	`26`	`* Retrieves the server configuration`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class Context implements ResolverInterface {`
`27`	`27`	`* Context constructor.`
`28`	`28`	`*`
`29`	`29`	`* @param $name`
`30`		`- * @param null $default`
	`30`	`+ * @param NULL $default`
`31`	`31`	`*/`
`32`	`32`	`public function __construct($name, $default = NULL) {`
`33`	`33`	`$this->name = $name;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class Introspection {`
`14`	`14`	`* @param \Drupal\graphql\Entity\ServerInterface $server`
`15`	`15`	`* The server instance.`
`16`	`16`	`*`
`17`		`- * @return array The introspection result as an array.`
	`17`	`+ * @return array`
`18`	`18`	`* The introspection result as an array.`
`19`	`19`	`*`
`20`	`20`	`*/`