chore: update from upstream

README.md

@@ -15,6 +15,16 @@ $config['gtm_barebones.settings']['environment_id'] = 'env-123456';
 $config['gtm_barebones.settings']['environment_token'] = 'iBN8NANliiuqnAAi81LapqkkdUIjak';
 ```
 
+# CSP (Content Security Policy)
+
+If your site enforces CSP, you must add configure CSP directives.
+
+Consider using the [CSP module](https://www.drupal.org/project/csp)
+
+Then add the directives in https://developers.google.com/tag-platform/security/guides/csp
+
+Note the extra directives required for things like Preview mode, and Google Analytics integration.
+
 ## License
 
 This program is free software; you can redistribute it and/or modify

composer.json

@@ -3,7 +3,7 @@
     "description": "OCHA fork of GTM Barebones.",
     "type": "drupal-module",
     "require": {
-        "php": ">=8.1",
-        "drupal/core": "^9.5 || ^10"
+        "php": ">=8.2",
+        "drupal/core": "^10.2 || ^11"
     }
 }

gtm_barebones.info.yml

@@ -1,8 +1,6 @@
 name: Barebones GTM (OCHA)
 type: module
 description: Just the essentials.
-core_version_requirement: ^9.5 || ^10
-php: 8.1
+core_version_requirement: ^10.2 || ^11
+php: 8.2
 package: SEO
-dependencies:
-  - drupal:system (>=8.6)

gtm_barebones.module

@@ -9,7 +9,7 @@ use Drupal\gtm_barebones\Hooks\GtmBarebonesHooks;
  */
 function gtm_barebones_page_attachments(array &$attachments): void {
   /** @var \Drupal\gtm_barebones\Hooks\GtmBarebonesHooks $hooks */
-  $hooks = \Drupal::classResolver(GtmBarebonesHooks::class);
+  $hooks = \Drupal::service(GtmBarebonesHooks::class);
   $hooks->pageAttachments($attachments);
 }
 
@@ -18,6 +18,6 @@ function gtm_barebones_page_attachments(array &$attachments): void {
  */
 function gtm_barebones_page_top(array &$page_top): void {
   /** @var \Drupal\gtm_barebones\Hooks\GtmBarebonesHooks $hooks */
-  $hooks = \Drupal::classResolver(GtmBarebonesHooks::class);
+  $hooks = \Drupal::service(GtmBarebonesHooks::class);
   $hooks->pageTop($page_top);
 }

gtm_barebones.services.yml

@@ -1,3 +1,9 @@
 services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+
+  Drupal\gtm_barebones\Hooks\GtmBarebonesHooks: ~
+
   gtm_barebones.gtm_controller:
     class: \Drupal\gtm_barebones\Controller\GtmBarebonesController

src/Hooks/GtmBarebonesHooks.php

@@ -6,35 +6,23 @@
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Routing\AdminContext;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Hooks.
  */
-final class GtmBarebonesHooks implements ContainerInjectionInterface {
+final class GtmBarebonesHooks {
 
   /**
    * Constructor.
    */
-  private function __construct(
+  public function __construct(
     private readonly ConfigFactoryInterface $configFactory,
     protected AdminContext $adminContext,
   ) {
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  final public static function create(ContainerInterface $container): static {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('router.admin_context'),
-    );
-  }
-
   /**
    * Implements hook_page_attachments().
    *