Merge branch 'google_tag' into lee5151

composer.json

@@ -121,7 +121,7 @@
         "drupal/field_permissions": "1.2",
         "drupal/focal_point": "2.0.1",
         "drupal/google_analytics": "^4.0",
-        "drupal/google_tag": "1.5",
+        "drupal/google_tag": "1.6",
         "drupal/honeypot": "2.1.2",
         "drupal/inline_entity_form": "1.0-rc15",
         "drupal/libraries": "4.0",

composer.lock

@@ -4305,26 +4305,26 @@
         },
         {
             "name": "drupal/google_tag",
-            "version": "1.5.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/google_tag.git",
-                "reference": "8.x-1.5"
+                "reference": "8.x-1.6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.5.zip",
-                "reference": "8.x-1.5",
-                "shasum": "b2929a517cc86bb3e54dded127556f18236a8628"
+                "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.6.zip",
+                "reference": "8.x-1.6",
+                "shasum": "d084315e54c2e561b8b64eef86081c2634d054cd"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9"
+                "drupal/core": "^8.8 || ^9 || ^10"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.5",
-                    "datestamp": "1648569365",
+                    "version": "8.x-1.6",
+                    "datestamp": "1671145853",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

vendor/composer/installed.json

@@ -4455,27 +4455,27 @@
         },
         {
             "name": "drupal/google_tag",
-            "version": "1.5.0",
-            "version_normalized": "1.5.0.0",
+            "version": "1.6.0",
+            "version_normalized": "1.6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/google_tag.git",
-                "reference": "8.x-1.5"
+                "reference": "8.x-1.6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.5.zip",
-                "reference": "8.x-1.5",
-                "shasum": "b2929a517cc86bb3e54dded127556f18236a8628"
+                "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.6.zip",
+                "reference": "8.x-1.6",
+                "shasum": "d084315e54c2e561b8b64eef86081c2634d054cd"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9"
+                "drupal/core": "^8.8 || ^9 || ^10"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.5",
-                    "datestamp": "1648569365",
+                    "version": "8.x-1.6",
+                    "datestamp": "1671145853",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4488,6 +4488,22 @@
                 "GPL-2.0-or-later"
             ],
             "authors": [
+                {
+                    "name": "acquia",
+                    "homepage": "https://www.drupal.org/user/1231722"
+                },
+                {
+                    "name": "japerry",
+                    "homepage": "https://www.drupal.org/user/45640"
+                },
+                {
+                    "name": "kaynen",
+                    "homepage": "https://www.drupal.org/user/733308"
+                },
+                {
+                    "name": "mglaman",
+                    "homepage": "https://www.drupal.org/user/2416470"
+                },
                 {
                     "name": "solotandem",
                     "homepage": "https://www.drupal.org/user/240748"

vendor/composer/installed.php

@@ -779,9 +779,9 @@
             'dev_requirement' => false,
         ),
         'drupal/google_tag' => array(
-            'pretty_version' => '1.5.0',
-            'version' => '1.5.0.0',
-            'reference' => '8.x-1.5',
+            'pretty_version' => '1.6.0',
+            'version' => '1.6.0.0',
+            'reference' => '8.x-1.6',
             'type' => 'drupal-module',
             'install_path' => __DIR__ . '/../../web/modules/google_tag',
             'aliases' => array(),

web/modules/google_tag/README.md

@@ -95,6 +95,11 @@ code on the script tag. It does not load the snippet file and inspect the code
 therein. Instead of relying on this bot, check whether the GTM snippets are
 loaded as a result of the snippet added by this project.
 
+If you run Drush as other than the web user, then do not enable the 'Recreate
+snippets on cache rebuild' module setting. Otherwise snippet files will be
+created and owned by the user running Drush. On the next cache rebuild the web
+user may not be able to delete the files (resulting in a fatal error).
+
 ## MAINTAINERS
 
 Current maintainer:

web/modules/google_tag/composer.json

@@ -2,8 +2,5 @@
     "name": "drupal/google_tag",
     "description": "Allows your website analytics to be managed using Google Tag Manager.",
     "type": "drupal-module",
-    "license": "GPL-2.0-or-later",
-    "require": {
-        "drupal/core": "^8.8 || ^9"
-    }
+    "license": "GPL-2.0-or-later"
 }

web/modules/google_tag/config/install/google_tag.settings.yml

 uri: 'public:/'
 compact_snippet: true
 include_file: true
-rebuild_snippets: true
+rebuild_snippets: false
 flush_snippets: false
 debug_output: false
 _default_container:
   container_id: ''
   path_toggle: 'exclude listed'
-  path_list: "/admin*\n/batch*\n/node/add*\n/node/*/edit\n/node/*/delete\n/user/*/edit*\n/user/*/cancel*"
+  path_list: "/admin*\n/batch*\n/node/add*\n/node/*/edit\n/node/*/delete\n/node/*/layout\n/taxonomy/term/*/edit\n/taxonomy/term/*/layout\n/user/*/edit*\n/user/*/cancel*\n/user/*/layout"
   role_toggle: 'exclude listed'
   role_list: {}
   status_toggle: 'exclude listed'

web/modules/google_tag/google_tag.info.yml

@@ -2,10 +2,10 @@ name: 'Google Tag Manager'
 type: module
 description: 'Allows your website analytics to be managed using Google Tag Manager.'
 package: 'Statistics'
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^8.8 || ^9 || ^10
 configure: google_tag.settings_form
 
-# Information added by Drupal.org packaging script on 2022-03-29
-version: '8.x-1.5'
+# Information added by Drupal.org packaging script on 2022-12-15
+version: '8.x-1.6'
 project: 'google_tag'
-datestamp: 1648569368
+datestamp: 1671145855

web/modules/google_tag/js/google_tag.admin.js

@@ -22,28 +22,18 @@
           var str = '';
           var toggle = $('input[type="radio"]:checked', context).val();
           var values;
-          if (element == 'checkbox') {
-            values = $('input[type="checkbox"]:checked + label', context).length;
-          }
-          else {
-            var values = $('textarea', context).val();
-          }
-          if (toggle == 'exclude listed') {
-            if (!values) {
-              str = 'All !plural';
-            }
-            else {
-              str = 'All !plural except !adjective !plural';
-            }
+
+          values = element === 'checkbox' ?
+            $('input[type="checkbox"]:checked + label', context).length :
+            $('textarea', context).val();
+
+          if (toggle === 'exclude listed') {
+            str = !values ? 'All !plural' : 'All !plural except !adjective !plural';
           }
           else {
-            if (!values) {
-              str = 'No !plural';
-            }
-            else {
-              str = 'Only !adjective !plural';
-            }
+            str = !values ? 'No !plural' : 'Only !adjective !plural';
           }
+
           const args = {'!plural': plural, '!adjective': adjective};
           return Drupal.t(Drupal.formatString(str, args));
         }

web/modules/google_tag/src/Entity/Container.php

@@ -244,7 +244,7 @@ public function snippets() {
       'data_layer' => $this->dataLayerSnippet(),
     ];
     // Allow other modules to alter the snippets.
-    \Drupal::moduleHandler()->alter('google_tag_snippets', $snippets, $this);
+    $this->moduleHandler()->alter('google_tag_snippets', $snippets, $this);
     return $snippets;
   }
 
@@ -289,7 +289,7 @@ protected function noscriptSnippet() {
 
     // Build noscript snippet.
     $noscript = <<<EOS
-<noscript aria-hidden="true"><iframe src="https://www.googletagmanager.com/ns.html?id=$container_id$query"
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=$container_id$query"
  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 EOS;
     return $this->compactSnippet($noscript, ["\n"]);
@@ -407,7 +407,7 @@ public function insertSnippet() {
       }
 
       // Allow other modules to alter the insertion criteria.
-      \Drupal::moduleHandler()->alter('google_tag_insert', $satisfied[$this->id], $this);
+      $this->moduleHandler()->alter('google_tag_insert', $satisfied[$this->id], $this);
       $this->displayMessage('after alter @satisfied', ['@satisfied' => $satisfied[$this->id]]);
     }
     return $satisfied[$this->id];
@@ -557,8 +557,7 @@ public function fileTag($type, $weight) {
     $uri = $this->snippetURI($type);
     // Remove the if-else when core_version_requirement >= 9.3 for this module.
     if (\Drupal::hasService('file_url_generator')) {
-      $generator = \Drupal::service('file_url_generator');
-      $url = $generator->transformRelative($generator->generateAbsoluteString($uri));
+      $url = \Drupal::service('file_url_generator')->generateString($uri);
     }
     else {
       $url = file_url_transform_relative(file_create_url($uri));

web/modules/google_tag/src/Form/SettingsForm.php

@@ -110,7 +110,7 @@ public function moduleFieldset(FormStateInterface $form_state) {
     $fieldset['rebuild_snippets'] = [
       '#type' => 'checkbox',
       '#title' => $this->t('Recreate snippets on cache rebuild'),
-      '#description' => $this->t('If checked, then the JavaScript snippet files will be created during a cache rebuild. This is <strong>recommended on production sites</strong>. If not checked, any missing snippet files will be created during a page response.'),
+      '#description' => $this->t('If checked, then the JavaScript snippet files will be created during a cache rebuild. If not checked, any missing snippet files will be created during a page response. NOTE: If Drush commands are run as a user other than the web user, then do NOT enable this setting unless the web user has permission to delete files created by the Drush user.'),
       '#default_value' => $config->get('rebuild_snippets'),
     ];
 

web/modules/google_tag/src/Plugin/Condition/Language.php

@@ -87,7 +87,7 @@ public function summary() {
     $languages = $this->languageManager->getLanguages(LanguageInterface::STATE_ALL);
     $selected = $this->configuration['language_list'];
     // Reduce the language object list to a language name list.
-    $this->values = array_reduce($languages, function (&$names, $language) use ($selected) {
+    $this->values = array_reduce($languages, function ($names, $language) use ($selected) {
       if (!empty($selected[$language->getId()])) {
         $names[$language->getId()] = $language->getName();
       }

web/modules/google_tag/tests/src/Functional/GTMMultipleTest.php

@@ -84,8 +84,7 @@ protected function checkPageResponseFile() {
         $uri = "$this->basePath/google_tag/{$key}/google_tag.$type.js";
         // Remove the if-else when core_version_requirement >= 9.3 for this module.
         if (\Drupal::hasService('file_url_generator')) {
-          $generator = \Drupal::service('file_url_generator');
-          $url = $generator->transformRelative($generator->generateAbsoluteString($uri));
+          $url = \Drupal::service('file_url_generator')->generateString($uri);
         }
         else {
           $url = file_url_transform_relative(file_create_url($uri));

web/modules/google_tag/tests/src/Functional/GTMTestBase.php

@@ -62,7 +62,7 @@ abstract class GTMTestBase extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     $this->defaultTheme = 'stark';
     parent::setUp();
     $this->basePath = $this->config('google_tag.settings')->get('uri');
@@ -190,7 +190,8 @@ protected function deleteContainers() {
 
     // Confirm no snippet files.
     $message = 'No snippet files found after delete';
-    parent::assertDirectoryNotExists($directory . '/google_tag', $message);
+    $method = method_exists($parent, $a = 'assertDirectoryDoesNotExist') ? $a : 'assertDirectoryNotExists';
+    parent::$method($directory . '/google_tag', $message);
   }
 
   /**