style(phpcs): Fix Whitespace coding standard rules from Squiz (#1060)

Dylan203 · web-flow · commit 766b8f818ab1 · 2020-08-10T15:53:03.000+02:00
diff --git a/examples/graphql_composable/src/Plugin/GraphQL/SchemaExtension/ComposableSchemaExampleExtension.php b/examples/graphql_composable/src/Plugin/GraphQL/SchemaExtension/ComposableSchemaExampleExtension.php
@@ -96,4 +96,5 @@ public static function resolveResponse(ResponseInterface $response): string {
     }
     throw new \Exception('Invalid response type.');
   }
+
 }
diff --git a/examples/graphql_example/src/Plugin/GraphQL/Schema/ExampleSchema.php b/examples/graphql_example/src/Plugin/GraphQL/Schema/ExampleSchema.php
@@ -97,4 +97,5 @@ protected function addConnectionFields($type, ResolverRegistry $registry, Resolv
       })
     );
   }
+
 }
diff --git a/examples/graphql_example/src/Plugin/GraphQL/SchemaExtension/ExampleSchemaExtension.php b/examples/graphql_example/src/Plugin/GraphQL/SchemaExtension/ExampleSchemaExtension.php
@@ -58,4 +58,5 @@ protected function addQueryFields(ResolverRegistryInterface $registry, ResolverB
         ->map('id', $builder->fromArgument('id'))
     );
   }
+
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -15,14 +15,6 @@
     <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpaceBeforeComma"/>
     <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.SpaceAfterFunction"/>
     <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.SpaceBeforeBrace"/>
-    <exclude name="Squiz.WhiteSpace.FunctionSpacing.After"/>
-    <exclude name="Squiz.WhiteSpace.FunctionSpacing.AfterLast"/>
-    <exclude name="Squiz.WhiteSpace.FunctionSpacing.Before"/>
-    <exclude name="Squiz.WhiteSpace.FunctionSpacing.BeforeFirst"/>
-    <exclude name="Squiz.WhiteSpace.LanguageConstructSpacing.Incorrect"/>
-    <exclude name="Squiz.WhiteSpace.OperatorSpacing.NoSpaceBefore"/>
-    <exclude name="Squiz.WhiteSpace.OperatorSpacing.SpacingAfter"/>
-    <exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EndLine"/>
     <exclude name="Drupal.Arrays.Array.CommaLastItem"/>
     <exclude name="Drupal.Arrays.Array.LongLineDeclaration"/>
     <exclude name="Drupal.Arrays.DisallowLongArraySyntax.Found"/>
diff --git a/src/Annotation/PersistedQuery.php b/src/Annotation/PersistedQuery.php
@@ -51,4 +51,5 @@ public function __construct($values) {
 
     parent::__construct($values);
   }
+
 }
diff --git a/src/Controller/ExplorerController.php b/src/Controller/ExplorerController.php
@@ -100,4 +100,5 @@ public function viewExplorer(ServerInterface $graphql_server, Request $request)
       ],
     ];
   }
+
 }
diff --git a/src/Entity/Server.php b/src/Entity/Server.php
@@ -530,4 +530,5 @@ public static function postDelete(EntityStorageInterface $storage, array $entiti
     parent::postDelete($storage, $entities);
     \Drupal::service('router.builder')->setRebuildNeeded();
   }
+
 }
diff --git a/src/Entity/ServerInterface.php b/src/Entity/ServerInterface.php
@@ -63,4 +63,5 @@ public function getPersistedQueryInstances();
    * @return \Drupal\graphql\Plugin\PersistedQueryPluginInterface[]
    */
   public function getSortedPersistedQueryInstances();
+
 }
diff --git a/src/EventSubscriber/OperationSubscriber.php b/src/EventSubscriber/OperationSubscriber.php
@@ -73,7 +73,7 @@ public function onAfterOperation(OperationEvent $event) {
   public static function getSubscribedEvents() {
     return [
       OperationEvent::GRAPHQL_OPERATION_BEFORE => 'onBeforeOperation',
-      OperationEvent::GRAPHQL_OPERATION_AFTER=> 'onAfterOperation',
+      OperationEvent::GRAPHQL_OPERATION_AFTER => 'onAfterOperation',
     ];
   }
 
diff --git a/src/Form/PersistedQueriesForm.php b/src/Form/PersistedQueriesForm.php
@@ -33,7 +33,6 @@ public static function create(ContainerInterface $container) {
     );
   }
 
-
   /**
    * {@inheritDoc}
    */
diff --git a/src/Form/ServerForm.php b/src/Form/ServerForm.php
@@ -89,7 +89,7 @@ public function form(array $form, FormStateInterface $formState) {
     $schemas = array_map(function ($definition) {
       return $definition['name'] ?? $definition['id'];
     }, $this->schemaManager->getDefinitions());
-    
+
     $input = $formState->getUserInput();
     $inputSchema = array_key_exists('schema', $input) ? $input['schema'] : NULL;
     $schema = ($inputSchema ?? $server->get('schema')) ?: reset(array_keys($schemas));
@@ -233,7 +233,7 @@ public function submitForm(array &$form, FormStateInterface $formState) {
     /* @var \Drupal\graphql\Plugin\SchemaPluginInterface $instance */
     $schema = $formState->getValue('schema');
     $instance = $this->schemaManager->createInstance($schema);
-    if ($instance instanceof PluginFormInterface && $instance instanceof  ConfigurableInterface) {
+    if ($instance instanceof PluginFormInterface && $instance instanceof ConfigurableInterface) {
       $state = SubformState::createForSubform($form['schema_configuration'][$schema], $form, $formState);
       $instance->submitConfigurationForm($form['schema_configuration'][$schema], $state);
     }
diff --git a/src/GraphQL/Execution/FieldContext.php b/src/GraphQL/Execution/FieldContext.php
@@ -103,4 +103,5 @@ public function getContextValue($name) {
   public function hasContextValue($name) {
     return $this->context->hasContextValue($this->info, $name);
   }
+
 }
diff --git a/src/GraphQL/Execution/ResolveContext.php b/src/GraphQL/Execution/ResolveContext.php
@@ -194,4 +194,5 @@ public function hasContextValue(ResolveInfo $info, $name) {
 
     return FALSE;
   }
+
 }
diff --git a/src/GraphQL/Resolver/DefaultValue.php b/src/GraphQL/Resolver/DefaultValue.php
@@ -29,7 +29,6 @@ class DefaultValue implements ResolverInterface {
    */
   protected $default;
 
-
   /**
    * DefaultValue constructor.
    *
@@ -43,7 +42,6 @@ public function __construct(ResolverInterface $value, ResolverInterface $default
     $this->default = $default;
   }
 
-
   /**
    * {@inheritDoc}
    */
@@ -69,4 +67,5 @@ public function resolve(
     }
     return $result;
   }
+
 }
diff --git a/src/GraphQL/ResolverRegistry.php b/src/GraphQL/ResolverRegistry.php
@@ -169,4 +169,5 @@ protected function getRuntimeTypeResolver($value, ResolveContext $context, Resol
   protected function resolveTypeDefault($value, ResolveContext $context, ResolveInfo $info) {
     return NULL;
   }
+
 }
diff --git a/src/PersistedQuery/PersistedQueryPluginBase.php b/src/PersistedQuery/PersistedQueryPluginBase.php
@@ -61,4 +61,5 @@ public function setWeight($weight) {
     $this->configuration['weight'] = $weight;
     return $this;
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityBundle.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityBundle.php
@@ -30,4 +30,5 @@ class EntityBundle extends DataProducerPluginBase {
   public function resolve(EntityInterface $entity) {
     return $entity->bundle();
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php
@@ -179,4 +179,5 @@ public function resolve($type, $id, $language, ?array $bundles, ?bool $access, ?
       return $entity;
     });
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php
@@ -179,4 +179,5 @@ public function resolve($type, $uuid, $language, $bundles, ?bool $access, ?Accou
       return $entity;
     });
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/Field/EntityReference.php b/src/Plugin/GraphQL/DataProducer/Field/EntityReference.php
@@ -195,4 +195,5 @@ public function resolve(EntityInterface $entity, $field, $language = NULL, ?arra
 
     return NULL;
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php
@@ -132,4 +132,5 @@ public function resolve($url, $language = NULL, FieldContext $context) {
       });
     }
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/Utility/Seek.php b/src/Plugin/GraphQL/DataProducer/Utility/Seek.php
@@ -44,4 +44,5 @@ public function resolve(array $input, $position) {
     }
     return $iterator->current();
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLAttribute.php b/src/Plugin/GraphQL/DataProducer/XML/XMLAttribute.php
@@ -35,4 +35,5 @@ class XMLAttribute extends DataProducerPluginBase {
   public function resolve(\DOMElement $dom, $name) {
     return $dom->getAttribute($name);
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLContent.php b/src/Plugin/GraphQL/DataProducer/XML/XMLContent.php
@@ -37,4 +37,5 @@ public function resolve(\DOMElement $dom) {
       }
     }, iterator_to_array($dom->childNodes)));
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLParse.php b/src/Plugin/GraphQL/DataProducer/XML/XMLParse.php
@@ -33,4 +33,5 @@ public function resolve($input) {
     $document->loadHTML($input);
     return $document->documentElement;
   }
+
 }
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLXpath.php b/src/Plugin/GraphQL/DataProducer/XML/XMLXpath.php
@@ -37,4 +37,5 @@ public function resolve($dom, $query) {
     $xpath = new \DOMXPath($dom->ownerDocument);
     return iterator_to_array($xpath->query($query, $dom));
   }
+
 }
diff --git a/src/Plugin/PersistedQueryPluginInterface.php b/src/Plugin/PersistedQueryPluginInterface.php
@@ -46,4 +46,5 @@ public function getWeight();
    *   The weight.
    */
   public function setWeight($weight);
+
 }
diff --git a/src/Plugin/PersistedQueryPluginManager.php b/src/Plugin/PersistedQueryPluginManager.php
@@ -47,4 +47,5 @@ public function __construct(
     $this->useCaches(empty($config['development']));
     $this->setCacheBackend($definitionCacheBackend, 'persisted_query', ['graphql']);
   }
+
 }
diff --git a/src/Plugin/SchemaExtensionPluginManager.php b/src/Plugin/SchemaExtensionPluginManager.php
@@ -82,4 +82,5 @@ public function getExtensions($id) {
 
     return $this->extensions[$id];
   }
+
 }
diff --git a/src/Plugin/SchemaPluginManager.php b/src/Plugin/SchemaPluginManager.php
@@ -55,4 +55,5 @@ public function __construct(
     $this->useCaches(empty($config['development']));
     $this->setCacheBackend($cacheBackend, 'schemas', ['graphql']);
   }
+
 }
diff --git a/src/Routing/QueryRouteEnhancer.php b/src/Routing/QueryRouteEnhancer.php
@@ -126,5 +126,4 @@ protected function extractMultipart(Request $request, $values) {
     return $values;
   }
 
-
 }
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
@@ -17,7 +17,6 @@
  */
 class PersistedQueryPluginOne extends PersistedQueryPluginBase {
 
-
   /**
    * {@inheritdoc}
    */
@@ -27,8 +26,9 @@ public function getQuery($id, OperationParams $operation) {
   }
 
   protected function queryMap() {
-    return[
+    return [
       'query_1' => 'query { field_one }',
     ];
   }
+
 }
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
@@ -17,7 +17,6 @@
  */
 class PersistedQueryPluginThree extends PersistedQueryPluginBase {
 
-
   /**
    * {@inheritdoc}
    */
@@ -27,9 +26,10 @@ public function getQuery($id, OperationParams $operation) {
   }
 
   protected function queryMap() {
-    return[
+    return [
       'query_1' => "query { field_three { url } }",
       'query_2' => "query { field_three { url\ntitle } }",
     ];
   }
+
 }
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
@@ -17,7 +17,6 @@
  */
 class PersistedQueryPluginTwo extends PersistedQueryPluginBase {
 
-
   /**
    * {@inheritdoc}
    */
@@ -27,8 +26,9 @@ public function getQuery($id, OperationParams $operation) {
   }
 
   protected function queryMap() {
-    return[
+    return [
       'query_1' => 'query { field_two }',
     ];
   }
+
 }
diff --git a/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php b/tests/src/Kernel/DataProducer/Entity/Fields/Image/ImageDerivativeTest.php
@@ -35,7 +35,7 @@ public function setUp() {
     $this->file->method('getFileUri')->willReturn($this->file_uri);
     $this->file->method('access')->willReturn((new AccessResultAllowed())->addCacheTags(['test_tag']));
     $this->file->width = 600;
-    $this->file->height= 400;
+    $this->file->height = 400;
 
     $this->style = ImageStyle::create(['name' => 'test_style']);
     $effect = [
diff --git a/tests/src/Kernel/DataProducer/Images/ImageResourceUrlTest.php b/tests/src/Kernel/DataProducer/Images/ImageResourceUrlTest.php
@@ -39,4 +39,5 @@ public function testImageResourceUrlProvider() {
       ]
     ];
   }
+
 }
diff --git a/tests/src/Kernel/DataProducer/MenuTest.php b/tests/src/Kernel/DataProducer/MenuTest.php
@@ -130,7 +130,6 @@ public function testMenuTreeLink() {
     }
   }
 
-
   /**
    * @covers \Drupal\graphql\Plugin\GraphQL\DataProducer\Menu\MenuTree\MenuTreeSubtree::resolve
    */
diff --git a/tests/src/Kernel/DataProducer/SeekTest.php b/tests/src/Kernel/DataProducer/SeekTest.php
@@ -60,4 +60,5 @@ public function testSeekProvider() {
       ]
     ];
   }
+
 }
diff --git a/tests/src/Kernel/DataProducer/XML/XMLAttributeTest.php b/tests/src/Kernel/DataProducer/XML/XMLAttributeTest.php
@@ -33,4 +33,5 @@ public function testXMLAttribute() {
       'name' => 'class'
     ]));
   }
+
 }
diff --git a/tests/src/Kernel/DataProducer/XML/XMLContentTest.php b/tests/src/Kernel/DataProducer/XML/XMLContentTest.php
@@ -27,4 +27,5 @@ public function testXMLContent() {
       'dom' => $span[0],
     ]));
   }
+
 }
diff --git a/tests/src/Kernel/DataProducer/XML/XMLParseTest.php b/tests/src/Kernel/DataProducer/XML/XMLParseTest.php
@@ -19,4 +19,5 @@ public function testXMLParse() {
 
     $this->assertInstanceOf(\DOMElement::class, $result);
   }
+
 }
diff --git a/tests/src/Kernel/DataProducer/XML/XMLTestBase.php b/tests/src/Kernel/DataProducer/XML/XMLTestBase.php
@@ -28,4 +28,5 @@ public function loadDocument() {
   public function getDocumentSource() {
     return file_get_contents(drupal_get_path('module', 'graphql') . '/tests/files/xml/test.xml');
   }
+
 }
diff --git a/tests/src/Kernel/DataProducer/XML/XMLXpathTest.php b/tests/src/Kernel/DataProducer/XML/XMLXpathTest.php
@@ -57,4 +57,5 @@ public function testXMLXpath() {
 
     $this->assertSame(0, count($result));
   }
+
 }
diff --git a/tests/src/Kernel/Framework/PersistedQueriesTest.php b/tests/src/Kernel/Framework/PersistedQueriesTest.php
@@ -111,4 +111,5 @@ public function persistedQueriesDataProvider() {
       ]
     ];
   }
+
 }
diff --git a/tests/src/Kernel/Framework/UploadMutationTest.php b/tests/src/Kernel/Framework/UploadMutationTest.php
@@ -66,4 +66,5 @@ function ($parent, $args) {
     $result = json_decode($response->getContent());
     $this->assertEquals('test.txt', $result->data->store);
   }
+
 }
diff --git a/tests/src/Kernel/Framework/UserPermissionsContextTest.php b/tests/src/Kernel/Framework/UserPermissionsContextTest.php
@@ -38,4 +38,5 @@ public function testUserPermissionsContext() {
     $this->mockResolver('Query', 'root', 'test');
     $this->assertResults('{ root }', [], ['root' => 'test']);
   }
+
 }
diff --git a/tests/src/Kernel/ResolverBuilderTest.php b/tests/src/Kernel/ResolverBuilderTest.php
@@ -430,5 +430,6 @@ public function testDeferredDefaultValue() {
       ]
     ]);
   }
+
 }
 
diff --git a/tests/src/Traits/QueryResultAssertionTrait.php b/tests/src/Traits/QueryResultAssertionTrait.php
@@ -210,4 +210,5 @@ private function assertResultMetadata(ExecutionResult $result, CacheableMetadata
     $unexpectedTags = array_diff($result->getCacheTags(), $expected->getCacheTags());
     $this->assertEmpty($unexpectedTags, 'Unexpected cache tags: ' . implode(', ', $unexpectedTags));
   }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -96,4 +96,5 @@ public static function resolveResponse(ResponseInterface $response): string {`
`96`	`96`	`}`
`97`	`97`	`throw new \Exception('Invalid response type.');`
`98`	`98`	`}`
	`99`	`+`
`99`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,4 +97,5 @@ protected function addConnectionFields($type, ResolverRegistry $registry, Resolv`
`97`	`97`	`})`
`98`	`98`	`);`
`99`	`99`	`}`
	`100`	`+`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,5 @@ protected function addQueryFields(ResolverRegistryInterface $registry, ResolverB`
`58`	`58`	`->map('id', $builder->fromArgument('id'))`
`59`	`59`	`);`
`60`	`60`	`}`
	`61`	`+`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,5 @@ public function __construct($values) {`
`51`	`51`
`52`	`52`	`parent::__construct($values);`
`53`	`53`	`}`
	`54`	`+`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,5 @@ public function viewExplorer(ServerInterface $graphql_server, Request $request)`
`100`	`100`	`],`
`101`	`101`	`];`
`102`	`102`	`}`
	`103`	`+`
`103`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -530,4 +530,5 @@ public static function postDelete(EntityStorageInterface $storage, array $entiti`
`530`	`530`	`parent::postDelete($storage, $entities);`
`531`	`531`	`\Drupal::service('router.builder')->setRebuildNeeded();`
`532`	`532`	`}`
	`533`	`+`
`533`	`534`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,5 @@ public function getPersistedQueryInstances();`
`63`	`63`	`* @return \Drupal\graphql\Plugin\PersistedQueryPluginInterface[]`
`64`	`64`	`*/`
`65`	`65`	`public function getSortedPersistedQueryInstances();`
	`66`	`+`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function onAfterOperation(OperationEvent $event) {`
`73`	`73`	`public static function getSubscribedEvents() {`
`74`	`74`	`return [`
`75`	`75`	`OperationEvent::GRAPHQL_OPERATION_BEFORE => 'onBeforeOperation',`
`76`		`- OperationEvent::GRAPHQL_OPERATION_AFTER=> 'onAfterOperation',`
	`76`	`+ OperationEvent::GRAPHQL_OPERATION_AFTER => 'onAfterOperation',`
`77`	`77`	`];`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public static function create(ContainerInterface $container) {`
`33`	`33`	`);`
`34`	`34`	`}`
`35`	`35`
`36`		`-`
`37`	`36`	`/**`
`38`	`37`	`* {@inheritDoc}`
`39`	`38`	`*/`