tests(phpcs): Fix unused variables reported by PHPCS (#1077)

Author: klausi

.travis.yml

@@ -89,17 +89,17 @@ install:
   # require also triggers a full 'composer install'.
   - composer --no-interaction --working-dir=$DRUPAL_BUILD_DIR require webonyx/graphql-php:^0.13.1 drupal/typed_data:^1.0
   - composer --no-interaction --working-dir=$DRUPAL_BUILD_DIR run-script drupal-phpunit-upgrade
-  
+
   # Install PHPCS to check for Drupal coding standards.
-  - travis_retry composer global require drupal/coder
+  - travis_retry composer global require drupal/coder:8.3.9
   - $HOME/.composer/vendor/bin/phpcs --config-set installed_paths $HOME/.composer/vendor/drupal/coder/coder_sniffer
 
 script:
   # Run the unit tests using phpdbg if the environment variable is 'true'.
   - if [[ "$WITH_PHPDBG_COVERAGE" == "true" ]];
       then phpdbg -qrr $DRUPAL_BUILD_DIR/vendor/bin/phpunit --configuration $DRUPAL_BUILD_DIR/core/phpunit.xml --coverage-clover $TRAVIS_BUILD_DIR/coverage.xml $TRAVIS_BUILD_DIR;
     fi
-    
+
   # Check for coding standards violations.
   - cd $DRUPAL_BUILD_DIR/modules/graphql && $HOME/.composer/vendor/bin/phpcs
 

phpcs.xml.dist

@@ -8,20 +8,6 @@
   <rule ref="Drupal"></rule>
   <rule ref="DrupalPractice"></rule>
 
-  <!-- TODO: check if we can fix those reported errors in code-->
-  <rule ref="DrupalPractice.CodeAnalysis.VariableAnalysis.UnusedVariable">
-    <exclude-pattern>src/Plugin/GraphQL/DataProducer/DataProducerProxy.php</exclude-pattern>
-    <exclude-pattern>src/Plugin/GraphQL/DataProducer/Field/EntityReference.php</exclude-pattern>
-    <exclude-pattern>src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php</exclude-pattern>
-    <exclude-pattern>src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php</exclude-pattern>
-    <exclude-pattern>src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php</exclude-pattern>
-    <exclude-pattern>tests/src/Kernel/DataProducer/MenuTest.php</exclude-pattern>
-  </rule>
-
-  <rule ref="DrupalPractice.CodeAnalysis.VariableAnalysis.UndefinedVariable">
-    <exclude-pattern>src/Plugin/GraphQL/DataProducer/Field/EntityReference.php</exclude-pattern>
-  </rule>
-
   <!-- TODO: those rules are disabled for now until we fix the coding standards for them. -->
   <rule ref="Drupal.Commenting.ClassComment.Missing">
     <exclude-pattern>src/PermissionProvider.php</exclude-pattern>

src/Plugin/GraphQL/DataProducer/DataProducerProxy.php

@@ -149,7 +149,7 @@ public function resolve($value, $args, ResolveContext $context, ResolveInfo $inf
     $plugin = $this->prepare($value, $args, $context, $info, $field);
 
     return DeferredUtility::returnFinally($plugin, function (DataProducerPluginInterface $plugin) use ($context, $field) {
-      foreach ($plugin->getContexts() as $id => $item) {
+      foreach ($plugin->getContexts() as $item) {
         /** @var \Drupal\Core\Plugin\Context\Context $item */
         if ($item->getContextDefinition()->isRequired() && !$item->hasContextValue()) {
           return NULL;
@@ -198,7 +198,7 @@ protected function prepare($value, $args, ResolveContext $context, ResolveInfo $
     }
 
     $values = DeferredUtility::waitAll($values);
-    return DeferredUtility::returnFinally($values, function ($values) use ($contexts, $plugin) {
+    return DeferredUtility::returnFinally($values, function ($values) use ($plugin) {
       foreach ($values as $name => $value) {
         $plugin->setContextValue($name, $value);
       }
@@ -216,7 +216,7 @@ protected function prepare($value, $args, ResolveContext $context, ResolveInfo $
    */
   protected function resolveUncached(DataProducerPluginInterface $plugin, ResolveContext $context, FieldContext $field) {
     $output = $plugin->resolveField($field);
-    return DeferredUtility::applyFinally($output, function () use ($context, $plugin, $field) {
+    return DeferredUtility::applyFinally($output, function () use ($plugin, $field) {
       $field->addCacheableDependency($plugin);
     });
   }
@@ -237,7 +237,7 @@ protected function resolveCached(DataProducerPluginCachingInterface $plugin, Res
     }
 
     $output = $this->resolveUncached($plugin, $context, $field);
-    return DeferredUtility::applyFinally($output, function ($value) use ($context, $field, $prefix) {
+    return DeferredUtility::applyFinally($output, function ($value) use ($field, $prefix) {
       $this->cacheWrite($prefix, $value, $field);
     });
   }

src/Plugin/GraphQL/DataProducer/Entity/EntityLoad.php

@@ -142,7 +142,7 @@ public function __construct(
   public function resolve($type, $id, $language, ?array $bundles, ?bool $access, ?AccountInterface $accessUser, ?string $accessOperation, FieldContext $context) {
     $resolver = $this->entityBuffer->add($type, $id);
 
-    return new Deferred(function () use ($type, $id, $language, $bundles, $resolver, $context, $access, $accessUser, $accessOperation) {
+    return new Deferred(function () use ($type, $language, $bundles, $resolver, $context, $access, $accessUser, $accessOperation) {
       if (!$entity = $resolver()) {
         // If there is no entity with this id, add the list cache tags so that
         // the cache entry is purged whenever a new entity of this type is

src/Plugin/GraphQL/DataProducer/Entity/EntityLoadMultiple.php

@@ -142,7 +142,7 @@ public function __construct(
   public function resolve($type, array $ids, $language, ?array $bundles, bool $access, ?AccountInterface $accessUser, string $accessOperation, FieldContext $context) {
     $resolver = $this->entityBuffer->add($type, $ids);
 
-    return new Deferred(function () use ($type, $ids, $language, $bundles, $resolver, $context, $access, $accessUser, $accessOperation) {
+    return new Deferred(function () use ($type, $language, $bundles, $resolver, $context, $access, $accessUser, $accessOperation) {
       /** @var \Drupal\Core\Entity\EntityInterface[] $entities */
       if (!$entities = $resolver()) {
         // If there is no entity with this id, add the list cache tags so that

src/Plugin/GraphQL/DataProducer/Field/EntityReference.php

@@ -156,7 +156,7 @@ public function resolve(EntityInterface $entity, $field, $language, ?array $bund
       $resolver = $this->entityBuffer->add($type, $ids);
       return new Deferred(function () use ($type, $language, $bundles, $access, $accessUser, $accessOperation, $resolver, $context) {
         $entities = $resolver() ?: [];
-        $entities = array_filter($entities, function (EntityInterface $entity) use ($bundles, $access, $accessOperation, $accessUser, $context) {
+        $entities = array_filter($entities, function (EntityInterface $entity) use ($language, $bundles, $access, $accessOperation, $accessUser, $context) {
           if (isset($bundles) && !in_array($entity->bundle(), $bundles)) {
             return FALSE;
           }

src/Plugin/GraphQL/DataProducer/Routing/RouteEntity.php

@@ -103,7 +103,7 @@ public function resolve($url, $language, FieldContext $context) {
       $id = $parameters[$type];
       $resolver = $this->entityBuffer->add($type, $id);
 
-      return new Deferred(function () use ($type, $id, $resolver, $context, $language) {
+      return new Deferred(function () use ($type, $resolver, $context, $language) {
         if (!$entity = $resolver()) {
           // If there is no entity with this id, add the list cache tags so that
           // the cache entry is purged whenever a new entity of this type is