style(phpcs): Fix unused use statements and array coding standards (#1070)

Dylan203 · web-flow · commit efecfb1e3a47 · 2020-08-17T14:23:13.000+02:00
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -7,13 +7,6 @@
 
   <rule ref="Drupal">
     <!-- TODO: those rules are disabled for now until we fix the coding standards for them. -->
-    <exclude name="Drupal.Arrays.Array.CommaLastItem"/>
-    <exclude name="Drupal.Arrays.Array.LongLineDeclaration"/>
-    <exclude name="Drupal.Arrays.DisallowLongArraySyntax.Found"/>
-    <exclude name="Drupal.Classes.ClassDeclaration.CloseBraceAfterBody"/>
-    <exclude name="Drupal.Classes.FullyQualifiedNamespace.UseStatementMissing"/>
-    <exclude name="Drupal.Classes.PropertyDeclaration.ScopeMissing"/>
-    <exclude name="Drupal.Classes.UnusedUseStatement.UnusedUse"/>
     <exclude name="Drupal.Commenting.ClassComment.Missing"/>
     <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
     <exclude name="Drupal.Commenting.FunctionComment.MissingParamComment"/>
diff --git a/src/Config/LanguageConfigOverride.php b/src/Config/LanguageConfigOverride.php
@@ -5,7 +5,6 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryOverrideInterface;
 use Drupal\Core\Config\StorageInterface;
-use Drupal\graphql\Plugin\LanguageNegotiation\OperationLanguageNegotiation;
 use Drupal\language\LanguageNegotiationMethodManager;
 
 /**
diff --git a/src/Form/PersistedQueriesForm.php b/src/Form/PersistedQueriesForm.php
@@ -7,7 +7,6 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Form\SubformState;
 use Drupal\Core\Plugin\PluginFormInterface;
-use Drupal\graphql\Plugin\PersistedQueryPluginInterface;
 use Drupal\graphql\Plugin\PersistedQueryPluginManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -90,7 +89,7 @@ public function form(array $form, FormStateInterface $form_state) {
     $form['weights']['order']['#tabledrag'][] = [
       'action' => 'order',
       'relationship' => 'sibling',
-      'group' => 'persisted-query-plugin-weight'
+      'group' => 'persisted-query-plugin-weight',
     ];
     $plugins_weight = [];
     foreach ($all_plugins as $plugin_id => $plugin) {
diff --git a/src/GraphQL/Execution/ExecutionResult.php b/src/GraphQL/Execution/ExecutionResult.php
@@ -2,10 +2,11 @@
 
 namespace Drupal\graphql\GraphQL\Execution;
 
+use GraphQL\Executor\ExecutionResult as LibraryExecutionResult;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\RefinableCacheableDependencyTrait;
 
-class ExecutionResult extends \GraphQL\Executor\ExecutionResult implements CacheableDependencyInterface {
+class ExecutionResult extends LibraryExecutionResult implements CacheableDependencyInterface {
   use RefinableCacheableDependencyTrait;
 
 }
diff --git a/src/GraphQL/Execution/Executor.php b/src/GraphQL/Execution/Executor.php
@@ -331,8 +331,16 @@ 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],
+      "contexts:$prefix"       => [
+        'data' => $contexts,
+        'expire' => $expire,
+        'tags' => $tags,
+      ],
+      "result:$prefix:$suffix" => [
+        'data' => $cache,
+        'expire' => $expire,
+        'tags' => $tags,
+      ],
     ]);
 
     return $this;
diff --git a/src/GraphQL/Utility/DeferredUtility.php b/src/GraphQL/Utility/DeferredUtility.php
@@ -12,7 +12,7 @@ class DeferredUtility {
    *
    * @var \GraphQL\Executor\Promise\Adapter\SyncPromiseAdapter
    */
-  static $promiseAdapter;
+  public static $promiseAdapter;
 
   /**
    * Return the singleton promise adapter.
diff --git a/src/Plugin/DataProducerPluginInterface.php b/src/Plugin/DataProducerPluginInterface.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin;
 
-use Drupal\Component\Plugin\ConfigurableInterface;
 use Drupal\Component\Plugin\DerivativeInspectionInterface;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLabel.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLabel.php
@@ -3,10 +3,8 @@
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Entity;
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\graphql\GraphQL\Execution\ResolveContext;
 use Drupal\graphql\Plugin\DataProducerPluginCachingInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
-use GraphQL\Type\Definition\ResolveInfo;
 
 /**
  * @DataProducer(
diff --git a/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceLayoutRevisions.php b/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceLayoutRevisions.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Field;
 
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\FieldableEntityInterface;
diff --git a/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceRevisions.php b/src/Plugin/GraphQL/DataProducer/Field/EntityReferenceRevisions.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Field;
 
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\FieldableEntityInterface;
diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Routing;
 
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\TranslatableInterface;
diff --git a/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php b/src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php
@@ -3,7 +3,6 @@
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Routing;
 
 use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Path\PathValidatorInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLAttribute.php b/src/Plugin/GraphQL/DataProducer/XML/XMLAttribute.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\XML;
 
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLContent.php b/src/Plugin/GraphQL/DataProducer/XML/XMLContent.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\XML;
 
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLParse.php b/src/Plugin/GraphQL/DataProducer/XML/XMLParse.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\XML;
 
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
diff --git a/src/Plugin/GraphQL/DataProducer/XML/XMLXpath.php b/src/Plugin/GraphQL/DataProducer/XML/XMLXpath.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\XML;
 
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
diff --git a/src/Plugin/GraphQL/Schema/ComposableSchema.php b/src/Plugin/GraphQL/Schema/ComposableSchema.php
@@ -73,13 +73,13 @@ public function defaultConfiguration() {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $extensions = $this->extensionManager->getDefinitions();
 
-    $form['extensions'] = array(
+    $form['extensions'] = [
       '#type' => 'checkboxes',
       '#required' => FALSE,
       '#title' => t('Enabled extensions'),
       '#options' => [],
       '#default_value' => $this->configuration['extensions'] ?? [],
-    );
+    ];
 
     foreach ($extensions as $key => $extension) {
       $form['extensions']['#options'][$key] = $extension['name'] ?? $extension['id'];
diff --git a/src/Plugin/PersistedQueryPluginInterface.php b/src/Plugin/PersistedQueryPluginInterface.php
@@ -4,7 +4,6 @@
 
 use Drupal\Component\Plugin\ConfigurableInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\search_api\Processor\ProcessorInterface;
 use GraphQL\Server\OperationParams;
 
 interface PersistedQueryPluginInterface extends ConfigurableInterface, PluginInspectionInterface {
diff --git a/src/RouteProvider.php b/src/RouteProvider.php
@@ -65,7 +65,7 @@ public function routes() {
           '_auth' => $auth,
           'no_cache' => TRUE,
           'default_url_options' => ['path_processing' => FALSE],
-          'parameters' => ['graphql_server' => ['type' => 'entity:graphql_server']]
+          'parameters' => ['graphql_server' => ['type' => 'entity:graphql_server']],
         ]);
     }
 
diff --git a/tests/src/Kernel/DataProducer/EntityTest.php b/tests/src/Kernel/DataProducer/EntityTest.php
@@ -10,7 +10,6 @@
 use Drupal\node\Entity\NodeType;
 use Drupal\node\Entity\Node;
 use Drupal\Core\Url;
-use GraphQL\Executor\Promise\Adapter\SyncPromiseAdapter;
 use Drupal\entity_test\Entity\EntityTestBundle;
 
 /**
diff --git a/tests/src/Kernel/DataProducer/FieldTest.php b/tests/src/Kernel/DataProducer/FieldTest.php
@@ -62,7 +62,7 @@ public function setUp() {
     $this->node = Node::create([
       'title' => 'Dolor',
       'type' => 'test1',
-      'field_test1_to_test2' => $this->referenced_node->id()
+      'field_test1_to_test2' => $this->referenced_node->id(),
     ]);
     $this->node->save();
   }
diff --git a/tests/src/Kernel/DataProducer/Images/ImageResourceUrlTest.php b/tests/src/Kernel/DataProducer/Images/ImageResourceUrlTest.php
@@ -31,12 +31,12 @@ public function testImageResourceUrlProvider() {
     return [
       [
         ['url' => 'http://localhost/test_image.jpg'],
-        'http://localhost/test_image.jpg'
+        'http://localhost/test_image.jpg',
       ],
       [
         [],
-        ''
-      ]
+        '',
+      ],
     ];
   }
 
diff --git a/tests/src/Kernel/DataProducer/MenuTest.php b/tests/src/Kernel/DataProducer/MenuTest.php
@@ -3,12 +3,7 @@
 namespace Drupal\Tests\graphql\Kernel\DataProducer;
 
 use Drupal\Tests\graphql\Kernel\GraphQLTestBase;
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\system\Entity\Menu;
-use Drupal\Tests\Core\Menu\MenuLinkMock;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\Core\Menu\MenuLinkTreeElement;
@@ -54,10 +49,10 @@ public function setUp() {
         'options' => [
           'attributes' => [
             'target' => '_blank',
-          ]
+          ],
         ],
       ],
-      'description' => 'Test description'
+      'description' => 'Test description',
     ];
     $link = MenuLinkContent::create($parent);
     $link->save();
diff --git a/tests/src/Kernel/DataProducer/RoutingTest.php b/tests/src/Kernel/DataProducer/RoutingTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\graphql\Kernel\DataProducer;
 
 use Drupal\Tests\graphql\Kernel\GraphQLTestBase;
-use Drupal\Core\Cache\CacheableMetadata;
 
 /**
  * Data producers Routing test class.
diff --git a/tests/src/Kernel/DataProducer/SeekTest.php b/tests/src/Kernel/DataProducer/SeekTest.php
@@ -57,7 +57,7 @@ public function testSeekProvider() {
         [1, 2, 3],
         -1,
         NULL,
-      ]
+      ],
     ];
   }
 
diff --git a/tests/src/Kernel/DataProducer/StringTest.php b/tests/src/Kernel/DataProducer/StringTest.php
@@ -31,7 +31,7 @@ public function testUppercaseProvider() {
     return [
       ['test', 'TEST'],
       ['123 ..!!', '123 ..!!'],
-      ['test123', 'TEST123']
+      ['test123', 'TEST123'],
     ];
   }
 
diff --git a/tests/src/Kernel/DataProducer/XML/XMLAttributeTest.php b/tests/src/Kernel/DataProducer/XML/XMLAttributeTest.php
@@ -20,17 +20,17 @@ public function testXmlAttribute() {
 
     $this->assertEquals('some_header', $this->executeDataProducer('xml_attribute', [
       'dom' => $h1[0],
-      'name' => 'data-tag-type'
+      'name' => 'data-tag-type',
     ]));
 
     $this->assertEquals('', $this->executeDataProducer('xml_attribute', [
       'dom' => $h1[0],
-      'name' => 'no-attribute'
+      'name' => 'no-attribute',
     ]));
 
     $this->assertEquals('content', $this->executeDataProducer('xml_attribute', [
       'dom' => $div[0],
-      'name' => 'class'
+      'name' => 'class',
     ]));
   }
 
diff --git a/tests/src/Kernel/Framework/PermissionsTest.php b/tests/src/Kernel/Framework/PermissionsTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\graphql\Kernel\Framework;
 
 use Drupal\Tests\graphql\Kernel\GraphQLTestBase;
-use Prophecy\Argument;
 
 /**
  * Test if query handling respects permissions properly.
diff --git a/tests/src/Kernel/Framework/PersistedQueriesTest.php b/tests/src/Kernel/Framework/PersistedQueriesTest.php
@@ -87,7 +87,7 @@ public function persistedQueriesDataProvider() {
           'data' => [
             'field_one' => 'this is the field one',
           ],
-        ]
+        ],
       ],
       // Same as previous, but with a different order.
       [
@@ -97,7 +97,7 @@ public function persistedQueriesDataProvider() {
           'data' => [
             'field_two' => 'this is the field two',
           ],
-        ]
+        ],
       ],
       // Execute a query that actually exists only in the last plugin.
       [
@@ -110,8 +110,8 @@ public function persistedQueriesDataProvider() {
               'title' => 'Ecosia',
             ],
           ],
-        ]
-      ]
+        ],
+      ],
     ];
   }
 
diff --git a/tests/src/Kernel/Framework/UserPermissionsContextTest.php b/tests/src/Kernel/Framework/UserPermissionsContextTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\graphql\Kernel\Framework;
 
-use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Tests\graphql\Kernel\GraphQLTestBase;
 
 /**
diff --git a/tests/src/Kernel/ResolverBuilderTest.php b/tests/src/Kernel/ResolverBuilderTest.php
@@ -273,11 +273,13 @@ 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.')],
     ]));
@@ -343,7 +345,7 @@ public function testSimpleDefaultValue() {
       'tree' => [
         'name' => 'bar',
         'uri' => 'baz',
-      ]
+      ],
     ]);
   }
 
@@ -382,7 +384,7 @@ public function testCompositeDefaultValue() {
       'tree' => [
         'name' => 'bar',
         'uri' => 'baz',
-      ]
+      ],
     ]);
   }
 
@@ -430,7 +432,7 @@ public function testDeferredDefaultValue() {
       'tree' => [
         'name' => 'bar',
         'uri' => 'baz',
-      ]
+      ],
     ]);
   }
 
diff --git a/tests/src/Traits/MockingTrait.php b/tests/src/Traits/MockingTrait.php
diff --git a/tests/src/Traits/SchemaPrinterTrait.php b/tests/src/Traits/SchemaPrinterTrait.php

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace Drupal\graphql\GraphQL\Execution;`
`4`	`4`
	`5`	`+use GraphQL\Executor\ExecutionResult as LibraryExecutionResult;`
`5`	`6`	`use Drupal\Core\Cache\CacheableDependencyInterface;`
`6`	`7`	`use Drupal\Core\Cache\RefinableCacheableDependencyTrait;`
`7`	`8`
`8`		`-class ExecutionResult extends \GraphQL\Executor\ExecutionResult implements CacheableDependencyInterface {`
	`9`	`+class ExecutionResult extends LibraryExecutionResult implements CacheableDependencyInterface {`
`9`	`10`	`use RefinableCacheableDependencyTrait;`
`10`	`11`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class DeferredUtility {`
`12`	`12`	`*`
`13`	`13`	`* @var \GraphQL\Executor\Promise\Adapter\SyncPromiseAdapter`
`14`	`14`	`*/`
`15`		`- static $promiseAdapter;`
	`15`	`+ public static $promiseAdapter;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* Return the singleton promise adapter.`