Issue #3287708: Drupal 10 support

composer.json

@@ -8,7 +8,7 @@
     "minimum-stability": "dev",
     "support": {
         "issues": "http://drupal.org/project/issues/ga",
-        "source": "http://cgit.drupalcode.org/ga"
+        "source": "https://git.drupalcode.org/project/ga"
     },
     "require": {},
     "require-dev": {

ga.info.yml

@@ -3,5 +3,4 @@ type: module
 description: Google Analytics Support
 configure: ga.settings
 
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10

ga.module

@@ -20,7 +20,7 @@ function ga_page_attachments(array &$attachments) {
 
   /** @var \Drupal\ga\Event\CollectEvent $event */
   $event = \Drupal::service('event_dispatcher')
-    ->dispatch(AnalyticsEvents::COLLECT, new CollectEvent());
+    ->dispatch(new CollectEvent(), AnalyticsEvents::COLLECT);
 
   $commands = $event->getDrupalSettingCommands();
   if (!empty($commands)) {

src/Event/CollectEvent.php

@@ -2,8 +2,8 @@
 
 namespace Drupal\ga\Event;
 
+use Symfony\Contracts\EventDispatcher\Event;
 use Drupal\ga\AnalyticsCommand\DrupalSettingCommandsInterface;
-use Symfony\Component\EventDispatcher\Event;
 
 /**
  * Class CollectEvent.

tests/src/Unit/AnalyticsCommand/DimensionTest.php

@@ -31,28 +31,25 @@ class DimensionTest extends UnitTestCase {
 
   /**
    * Test an invalid index of type string.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testStringIndex() {
+    $this->expectException(\InvalidArgumentException::class);
     new Dimension('index', 'value');
   }
 
   /**
    * Test an invalid index of type float.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testFloatIndex() {
+    $this->expectException(\InvalidArgumentException::class);
     new Dimension(4.2, 'value');
   }
 
   /**
    * Test an index greater than the valid range.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testOutOfBoundsIndex() {
+    $this->expectException(\InvalidArgumentException::class);
     new Dimension(420, 'value');
   }
 

tests/src/Unit/AnalyticsCommand/EventTest.php

@@ -83,33 +83,33 @@ class EventTest extends UnitTestCase {
   /**
    * Test with a float event value.
    *
-   * @expectedException \InvalidArgumentException
    *
-   * @expectedExceptionMessage Event value must be a positive integer
    */
   public function testWithFloatValue() {
+    $this->expectException(\InvalidArgumentException::class);
+    $this->expectExceptionMessage('Event value must be a positive integer');
     $command = new Event('category', 'action', NULL, 1.5);
   }
 
   /**
    * Test with a negative integer event value.
    *
-   * @expectedException \InvalidArgumentException
    *
-   * @expectedExceptionMessage Event value must be a positive integer
    */
   public function testWithNegativeIntegerValue() {
+    $this->expectException(\InvalidArgumentException::class);
+    $this->expectExceptionMessage('Event value must be a positive integer');
     $command = new Event('category', 'action', NULL, -1);
   }
 
   /**
    * Test with a string event value.
    *
-   * @expectedException \InvalidArgumentException
    *
-   * @expectedExceptionMessage Event value must be a positive integer
    */
   public function testWithStringValue() {
+    $this->expectException(\InvalidArgumentException::class);
+    $this->expectExceptionMessage('Event value must be a positive integer');
     $command = new Event('category', 'action', NULL, '1');
   }
 

tests/src/Unit/AnalyticsCommand/MetricTest.php

@@ -44,37 +44,33 @@ class MetricTest extends UnitTestCase {
 
   /**
    * Test an invalid index of type string.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testStringIndex() {
+    $this->expectException(\InvalidArgumentException::class);
     new Metric('index', 123);
   }
 
   /**
    * Test an invalid index of type float.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testFloatIndex() {
+    $this->expectException(\InvalidArgumentException::class);
     new Metric(4.2, 123);
   }
 
   /**
    * Test an index greater than the valid range.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testOutOfBoundsIndex() {
+    $this->expectException(\InvalidArgumentException::class);
     new Metric(420, 123);
   }
 
   /**
    * Test a string value.
-   *
-   * @expectedException \InvalidArgumentException
    */
   public function testStringValue() {
+    $this->expectException(\InvalidArgumentException::class);
     new Metric(42, 'value');
   }
 

tests/src/Unit/AnalyticsCommand/SendTest.php

@@ -32,11 +32,11 @@ class SendTest extends UnitTestCase {
   /**
    * Test specifying an invalid hit type.
    *
-   * @expectedException \InvalidArgumentException
    *
-   * @expectedExceptionMessage Invalid hit type specified.
    */
   public function testInvalidHitType() {
+    $this->expectException(\InvalidArgumentException::class);
+    $this->expectExceptionMessage('Invalid hit type specified.');
     $command = new Send('badtype');
   }
 

tests/src/Unit/EventSubscriber/CspSubscriberTest.php

@@ -28,16 +28,14 @@ class CspSubscriberTest extends UnitTestCase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  public function setUp(): void {
     parent::setUp();
 
     if (!class_exists(Csp::class)) {
       $this->markTestSkipped('Content Security Policy module is not available.');
     }
 
-    $this->response = $this->getMockBuilder(HtmlResponse::class)
-      ->disableOriginalConstructor()
-      ->getMock();
+    $this->response = $this->createMock(HtmlResponse::class);
   }
 
   /**
@@ -82,15 +80,15 @@ class CspSubscriberTest extends UnitTestCase {
     $subscriber = new CspSubscriber();
     $subscriber->onCspPolicyAlter($alterEvent);
 
-    $this->assertArrayEquals(
+    $this->assertEquals(
       [Csp::POLICY_ANY],
       $alterEvent->getPolicy()->getDirective('default-src')
     );
-    $this->assertArrayEquals(
+    $this->assertEquals(
       [Csp::POLICY_SELF, CspSubscriber::TRACKING_DOMAIN],
       $alterEvent->getPolicy()->getDirective('img-src')
     );
-    $this->assertArrayEquals(
+    $this->assertEquals(
       [Csp::POLICY_SELF, CspSubscriber::TRACKING_DOMAIN],
       $alterEvent->getPolicy()->getDirective('connect-src')
     );
@@ -111,11 +109,11 @@ class CspSubscriberTest extends UnitTestCase {
     $subscriber = new CspSubscriber();
     $subscriber->onCspPolicyAlter($alterEvent);
 
-    $this->assertArrayEquals(
+    $this->assertEquals(
       [Csp::POLICY_SELF],
       $alterEvent->getPolicy()->getDirective('default-src')
     );
-    $this->assertArrayEquals(
+    $this->assertEquals(
       [Csp::POLICY_SELF, CspSubscriber::TRACKING_DOMAIN],
       $alterEvent->getPolicy()->getDirective('img-src')
     );
@@ -136,11 +134,11 @@ class CspSubscriberTest extends UnitTestCase {
     $subscriber = new CspSubscriber();
     $subscriber->onCspPolicyAlter($alterEvent);
 
-    $this->assertArrayEquals(
+    $this->assertEquals(
       [Csp::POLICY_SELF],
       $alterEvent->getPolicy()->getDirective('default-src')
     );
-    $this->assertArrayEquals(
+    $this->assertEquals(
       [Csp::POLICY_SELF, CspSubscriber::TRACKING_DOMAIN],
       $alterEvent->getPolicy()->getDirective('connect-src')
     );