tests(phpcs): Fix Drupal WhiteSpace Rules coding standards (#1059)

Dylan203 · web-flow · commit 73e93beafe80 · 2020-08-10T15:34:46.000+02:00
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -67,13 +67,6 @@
     <exclude name="Drupal.Files.EndFileNewline.TooMany"/>
     <exclude name="Drupal.Files.LineLength.TooLong"/>
     <exclude name="Drupal.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/>
-    <exclude name="Drupal.WhiteSpace.CloseBracketSpacing.ClosingWhitespace"/>
-    <exclude name="Drupal.WhiteSpace.Comma.NoSpace"/>
-    <exclude name="Drupal.WhiteSpace.Comma.TooManySpaces"/>
-    <exclude name="Drupal.WhiteSpace.OpenBracketSpacing.OpeningWhitespace"/>
-    <exclude name="Drupal.WhiteSpace.OpenTagNewline.BlankLine"/>
-    <exclude name="Drupal.WhiteSpace.ScopeClosingBrace.Line"/>
-    <exclude name="Drupal.WhiteSpace.ScopeIndent.IncorrectExact"/>
   </rule>
 
 </ruleset>
diff --git a/src/Annotation/PersistedQuery.php b/src/Annotation/PersistedQuery.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Drupal\graphql\Annotation;
 
 
diff --git a/src/GraphQL/Execution/Executor.php b/src/GraphQL/Execution/Executor.php
@@ -331,7 +331,7 @@ protected function cacheWrite($prefix, CacheableExecutionResult $result) {
 
     $this->cacheBackend->setMultiple([
       "contexts:$prefix"       => ['data' => $contexts, 'expire' => $expire, 'tags' => $tags],
-      "result:$prefix:$suffix" => ['data' => $cache,   'expire' => $expire, 'tags' => $tags],
+      "result:$prefix:$suffix" => ['data' => $cache, 'expire' => $expire, 'tags' => $tags],
     ]);
 
     return $this;
diff --git a/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php b/src/Plugin/GraphQL/DataProducer/Taxonomy/TaxonomyLoadTree.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Taxonomy;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
diff --git a/src/Plugin/PersistedQueryPluginInterface.php b/src/Plugin/PersistedQueryPluginInterface.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Drupal\graphql\Plugin;
 
 use Drupal\Component\Plugin\ConfigurableInterface;
diff --git a/tests/modules/graphql_persisted_queries_test/src/Plugin/GraphQL/PersistedQuery/PersistedQueryPluginOne.php b/tests/modules/graphql_persisted_queries_test/src/Plugin/GraphQL/PersistedQuery/PersistedQueryPluginOne.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Drupal\graphql_persisted_queries_test\Plugin\GraphQL\PersistedQuery;
 
 use Drupal\graphql\PersistedQuery\PersistedQueryPluginBase;
diff --git a/tests/modules/graphql_persisted_queries_test/src/Plugin/GraphQL/PersistedQuery/PersistedQueryPluginThree.php b/tests/modules/graphql_persisted_queries_test/src/Plugin/GraphQL/PersistedQuery/PersistedQueryPluginThree.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Drupal\graphql_persisted_queries_test\Plugin\GraphQL\PersistedQuery;
 
 use Drupal\graphql\PersistedQuery\PersistedQueryPluginBase;
diff --git a/tests/modules/graphql_persisted_queries_test/src/Plugin/GraphQL/PersistedQuery/PersistedQueryPluginTwo.php b/tests/modules/graphql_persisted_queries_test/src/Plugin/GraphQL/PersistedQuery/PersistedQueryPluginTwo.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Drupal\graphql_persisted_queries_test\Plugin\GraphQL\PersistedQuery;
 
 use Drupal\graphql\PersistedQuery\PersistedQueryPluginBase;
diff --git a/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php b/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php
@@ -77,8 +77,8 @@ public function testImageDerivative() {
     );
 
     // TODO: Add cache checks.
-//    $this->assertContains('config:image.style.test_style', $metadata->getCacheTags());
-//    $this->assertContains('test_tag', $metadata->getCacheTags());
+    //    $this->assertContains('config:image.style.test_style', $metadata->getCacheTags());
+    //    $this->assertContains('test_tag', $metadata->getCacheTags());
 
     // Test that we don't get the derivative if we don't have access to the
     // original file, but we still get the access result cache tags.
@@ -90,7 +90,7 @@ public function testImageDerivative() {
     $this->assertNull($result);
 
     // TODO: Add cache checks.
-//    $this->assertContains('test_tag_forbidden', $metadata->getCacheTags());
+    //    $this->assertContains('test_tag_forbidden', $metadata->getCacheTags());
   }
 
 }
diff --git a/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageUrlTest.php b/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageUrlTest.php
@@ -50,7 +50,7 @@ public function testImageUrl() {
     $this->assertEquals($this->file_url, $result);
 
     // TODO: Add cache checks.
-//    $this->assertContains('test_tag', $metadata->getCacheTags());
+    //    $this->assertContains('test_tag', $metadata->getCacheTags());
 
     // Test that we do not get a file we don't have access to, but the cache
     // tags are still added.
@@ -61,7 +61,7 @@ public function testImageUrl() {
     $this->assertNull($result);
 
     // TODO: Add cache checks.
-//    $this->assertContains('test_tag_forbidden', $metadata->getCacheTags());
+    //    $this->assertContains('test_tag_forbidden', $metadata->getCacheTags());
   }
 
 }
diff --git a/tests/src/Kernel/DataProducer/Routing/RouteEntityTest.php b/tests/src/Kernel/DataProducer/Routing/RouteEntityTest.php
@@ -207,8 +207,8 @@ public function testRouteEntity() {
     $this->assertNull($result);
 
     // TODO: Add cache checks.
-//    $this->assertContains('node_list', $metadata->getCacheTags());
-//    $this->assertContains('4xx-response', $metadata->getCacheTags());
+    //    $this->assertContains('node_list', $metadata->getCacheTags());
+    //    $this->assertContains('4xx-response', $metadata->getCacheTags());
   }
 
 }
diff --git a/tests/src/Kernel/DataProducer/RoutingTest.php b/tests/src/Kernel/DataProducer/RoutingTest.php
@@ -46,7 +46,7 @@ public function testUrlNotFound() {
       'path' => '/idontexist',
     ]);
 
-//    $this->assertContains('4xx-response', $metadata->getCacheTags());
+    //    $this->assertContains('4xx-response', $metadata->getCacheTags());
     $this->assertNull($result);
   }
 
diff --git a/tests/src/Kernel/DataProducer/SeekTest.php b/tests/src/Kernel/DataProducer/SeekTest.php
@@ -33,28 +33,28 @@ public function testSeek($input, $position, $expected) {
   public function testSeekProvider() {
     return [
       [
-        [1,2,3],
+        [1, 2, 3],
         0,
         1,
       ],
       [
-        [1,2,3],
+        [1, 2, 3],
         1,
         2,
       ],
       [
-        [1,2,3],
+        [1, 2, 3],
         3,
         NULL,
       ],
       [
-        [1,[2],3],
+        [1, [2], 3],
         1,
         [2],
       ],
       // For now, we do not support negative indices.
       [
-        [1,2,3],
+        [1, 2, 3],
         -1,
         NULL,
       ]
diff --git a/tests/src/Kernel/DataProducer/XML/XMLAttributeTest.php b/tests/src/Kernel/DataProducer/XML/XMLAttributeTest.php
@@ -9,7 +9,7 @@
  */
 class XMLAttributeTest extends XMLTestBase {
 
- /**
+  /**
    * @covers \Drupal\graphql\Plugin\GraphQL\DataProducer\XML\XMLAttribute::resolve
    */
   public function testXMLAttribute() {
diff --git a/tests/src/Kernel/ResolverBuilderTest.php b/tests/src/Kernel/ResolverBuilderTest.php
@@ -93,7 +93,7 @@ public function testFromValue() {
    * @covers ::fromParent
    */
   public function testFromParent() {
-    $this->mockResolver('Query', 'tree',$this->builder->fromValue('Some string value'));
+    $this->mockResolver('Query', 'tree', $this->builder->fromValue('Some string value'));
     $this->mockResolver('Tree', 'name', $this->builder->fromParent());
 
     $query = <<<GQL
@@ -273,7 +273,12 @@ public function testDeferredCond() {
     $this->mockResolver('Query', 'tree', $this->builder->fromValue(['name' => 'some tree', 'id' => 5]));
     $this->mockResolver('Tree', 'name', $this->builder->cond([
       [$this->builder->fromValue(FALSE), $this->builder->fromValue('This should not be in the result.')],
-      [function () { return new Deferred(function () { return TRUE; }); }, $this->builder->fromValue('But this should.')],
+      [function () {
+        return new Deferred(function () {
+          return TRUE;
+        });
+      }, $this->builder->fromValue('But this should.')
+      ],
       [$this->builder->fromValue(TRUE), $this->builder->fromValue('And this not, event though its true.')],
     ]));
 
@@ -384,13 +389,29 @@ public function testCompositeDefaultValue() {
   public function testDeferredDefaultValue() {
     $this->mockResolver('Query', 'tree', ['name' => 'some tree', 'id' => 5]);
     $this->mockResolver('Tree', 'name', $this->builder->defaultValue(
-      $this->builder->callback(function () { return new Deferred(function () { return NULL; }); }),
-      $this->builder->callback(function () { return new Deferred(function () { return 'bar'; }); })
+      $this->builder->callback(function () {
+        return new Deferred(function () {
+          return NULL;
+        });
+      }),
+      $this->builder->callback(function () {
+        return new Deferred(function () {
+          return 'bar';
+        });
+      })
     ));
 
     $this->mockResolver('Tree', 'uri', $this->builder->defaultValue(
-      $this->builder->callback(function () { return new Deferred(function () { return 'baz'; }); }),
-      $this->builder->callback(function () { return new Deferred(function () { return 'bar'; }); })
+      $this->builder->callback(function () {
+        return new Deferred(function () {
+          return 'baz';
+        });
+      }),
+      $this->builder->callback(function () {
+        return new Deferred(function () {
+          return 'bar';
+        });
+      })
     ));
 
     $query = <<<GQL

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-`
`4`	`3`	`namespace Drupal\graphql\Annotation;`
`5`	`4`
`6`	`5`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 <?php
+-
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Taxonomy;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function testImageUrl() {`
`50`	`50`	`$this->assertEquals($this->file_url, $result);`
`51`	`51`
`52`	`52`	`// TODO: Add cache checks.`
`53`		`-// $this->assertContains('test_tag', $metadata->getCacheTags());`
	`53`	`+ // $this->assertContains('test_tag', $metadata->getCacheTags());`
`54`	`54`
`55`	`55`	`// Test that we do not get a file we don't have access to, but the cache`
`56`	`56`	`// tags are still added.`
`@@ -61,7 +61,7 @@ public function testImageUrl() {`
`61`	`61`	`$this->assertNull($result);`
`62`	`62`
`63`	`63`	`// TODO: Add cache checks.`
`64`		`-// $this->assertContains('test_tag_forbidden', $metadata->getCacheTags());`
	`64`	`+ // $this->assertContains('test_tag_forbidden', $metadata->getCacheTags());`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`}`