test(logger): Simplify Drupal 9 + 10 compatibility (#1290)

Author: klausi

phpstan.neon

@@ -16,8 +16,6 @@ parameters:
     # Exclude the RouteLoad producer because the redirect module is not D10
     # compatible so we are not downloading it.
     - src/Plugin/GraphQL/DataProducer/Routing/RouteLoad.php
-    # This file only exists for Drupal 10 compatibility, ignore it for now.
-    - tests/src/Traits/CompatibleLoggerTrait10.php
   ignoreErrors:
     # @todo Ignore phpstan-drupal extension's rules for now, activate later.
     - '#\Drupal calls should be avoided in classes, use dependency injection instead#'

tests/src/Kernel/Framework/LoggerTest.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\graphql\Kernel\Framework;
 
+use Drupal\Core\Logger\RfcLoggerTrait;
 use Drupal\Tests\graphql\Kernel\GraphQLTestBase;
-use Drupal\Tests\graphql\Traits\CompatibleLoggerTrait;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -13,7 +13,14 @@
  */
 class LoggerTest extends GraphQLTestBase implements LoggerInterface {
 
-  use CompatibleLoggerTrait;
+  use RfcLoggerTrait;
+
+  /**
+   * Loggers calls.
+   *
+   * @var array
+   */
+  protected $loggerCalls = [];
 
   /**
    * {@inheritdoc}
@@ -43,6 +50,17 @@ protected function setUp(): void {
     $this->container->get('logger.factory')->addLogger($this);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function log($level, $message, array $context = []): void {
+    $this->loggerCalls[] = [
+      'level' => $level,
+      'message' => $message,
+      'context' => $context,
+    ];
+  }
+
   /**
    * Test if invariant violation errors are logged.
    */