test(phpstan): Increase PHPStan level to 4 (#1104)

Author: klausi

phpstan.neon

@@ -8,7 +8,7 @@ parameters:
 	# PHPStan cannot find files in this test directory automatically.
 	scanDirectories:
 		- ../../core/tests/Drupal/Tests
-	level: 3
+	level: 4
 	customRulesetUsed: true
 	paths:
 		- .

src/Access/QueryAccessCheck.php

@@ -50,7 +50,6 @@ public function access(AccountInterface $account, ServerInterface $graphql_serve
     }
 
     $request = $this->requestStack->getCurrentRequest();
-    /** @var \GraphQL\Server\OperationParams[] $operations */
     $operations = $request->attributes->get('operations', []);
     if (!$operations) {
       return AccessResult::forbidden();
@@ -61,6 +60,7 @@ public function access(AccountInterface $account, ServerInterface $graphql_serve
       // If a query was provided by the user, this is an arbitrary query (it's
       // not a persisted query). Hence, we only grant access if the user has the
       // permission to execute any query.
+      /** @var \GraphQL\Server\OperationParams $operation */
       if ($operation->getOriginalInput('query')) {
         return AccessResult::allowedIfHasPermission($account, "execute $id arbitrary graphql requests");
       }

src/GraphQL/Resolver/Condition.php

@@ -53,7 +53,7 @@ public function resolve($value, $args, ResolveContext $context, ResolveInfo $inf
       }
 
       if ((bool) $condition) {
-        /** @var \Drupal\graphql\GraphQL\Resolver\ResolverInterface $resolver */
+        /** @var \Drupal\graphql\GraphQL\Resolver\ResolverInterface|null $resolver */
         return $resolver ? $resolver->resolve($value, $args, $context, $info, $field) : $condition;
       }
     }

src/GraphQL/Resolver/Path.php

@@ -23,7 +23,7 @@ class Path implements ResolverInterface {
   /**
    * Name of the context.
    *
-   * @var string
+   * @var string|\Drupal\Core\TypedData\DataDefinitionInterface
    */
   protected $type;
 

src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/DefaultValue.php

@@ -34,21 +34,15 @@ class DefaultValue extends DataProducerPluginBase {
    *   The default value.
    */
   public function resolve(FieldDefinitionInterface $entity_definition_field) {
-    /** @var \Drupal\field\Entity\FieldConfig $entity_definition_field */
     $default_value = $entity_definition_field->getDefaultValueLiteral();
-    if (is_array($default_value)) {
-      switch ($entity_definition_field->getType()) {
-        case 'list_integer':
-        case 'list_string':
-        case 'text_long':
-          return $default_value ? $default_value[0]['value'] : NULL;
+    switch ($entity_definition_field->getType()) {
+      case 'list_integer':
+      case 'list_string':
+      case 'text_long':
+        return $default_value[0]['value'] ?? NULL;
 
-        case 'boolean':
-          return (bool) $default_value ? $default_value[0]['value'] : FALSE;
-      }
-    }
-    else {
-      return $default_value;
+      case 'boolean':
+        return (bool) ($default_value[0]['value'] ?? FALSE);
     }
     return NULL;
   }

src/Plugin/GraphQL/DataProducer/EntityDefinition/Fields/Description.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\EntityDefinition\Fields;
 
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
@@ -35,9 +35,10 @@ class Description extends DataProducerPluginBase {
    *   The description.
    */
   public function resolve(FieldDefinitionInterface $entity_definition_field): ?string {
+    /** @var \Drupal\Component\Render\MarkupInterface|string|null $description */
     $description = $entity_definition_field->getDescription();
     // Convert translation object to string.
-    if ($description instanceof TranslatableMarkup) {
+    if ($description instanceof MarkupInterface) {
       return (string) $description;
     }
     return $description;

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

@@ -149,7 +149,8 @@ public function resolve(EntityInterface $entity, $field, ?string $language, ?arr
 
     $definition = $entity->getFieldDefinition($field);
     $type = $definition->getSetting('target_type');
-    if (($values = $entity->get($field)) && $values instanceof EntityReferenceFieldItemListInterface) {
+    $values = $entity->get($field);
+    if ($values instanceof EntityReferenceFieldItemListInterface) {
       $ids = array_map(function ($value) {
         return $value['target_id'];
       }, $values->getValue());

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

@@ -158,7 +158,8 @@ public function resolve(EntityInterface $entity, string $field, ?string $languag
 
     $definition = $entity->getFieldDefinition($field);
     $type = $definition->getSetting('target_type');
-    if (($values = $entity->get($field)) && $values instanceof EntityReferenceFieldItemListInterface) {
+    $values = $entity->get($field);
+    if ($values instanceof EntityReferenceFieldItemListInterface) {
       $vids = array_map(function ($value) {
         return $value['target_revision_id'];
       }, $values->getValue());

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

@@ -158,7 +158,8 @@ public function resolve(EntityInterface $entity, string $field, ?string $languag
 
     $definition = $entity->getFieldDefinition($field);
     $type = $definition->getSetting('target_type');
-    if (($values = $entity->get($field)) && $values instanceof EntityReferenceFieldItemListInterface) {
+    $values = $entity->get($field);
+    if ($values instanceof EntityReferenceFieldItemListInterface) {
       $vids = array_map(function ($value) {
         return $value['target_revision_id'];
       }, $values->getValue());

src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeSubtree.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\graphql\Plugin\GraphQL\DataProducer\Menu\MenuTree;
 
-use Drupal\Core\Menu\MenuLinkInterface;
 use Drupal\Core\Menu\MenuLinkTreeElement;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
@@ -33,11 +32,7 @@ class MenuTreeSubtree extends DataProducerPluginBase {
    */
   public function resolve(MenuLinkTreeElement $element) {
     return array_filter($element->subtree, function (MenuLinkTreeElement $item) {
-      if ($item->link instanceof MenuLinkInterface) {
-        return $item->link->isEnabled();
-      }
-
-      return TRUE;
+      return $item->link->isEnabled();
     });
   }