From 39e4a96e6fce1ac6de681107c74c084f98c2a743 Mon Sep 17 00:00:00 2001
From: bcweaver <brianweaver@gmail.com>
Date: Wed, 24 Jul 2019 15:40:34 -0400
Subject: [PATCH] Update 'metatag' module: 1.8 --> 1.9
---
composer.json | 2 +-
composer.lock | 16 ++---
web/modules/metatag/CHANGELOG.txt | 5 ++
web/modules/metatag/metatag.info.yml | 6 +-
web/modules/metatag/metatag.module | 6 ++
.../metatag_app_links.info.yml | 6 +-
.../metatag/metatag_dc/metatag_dc.info.yml | 6 +-
.../metatag_dc_advanced.info.yml | 6 +-
.../metatag_facebook.info.yml | 6 +-
.../metatag_favicons.info.yml | 6 +-
.../metatag_google_cse.info.yml | 6 +-
.../metatag_google_plus.info.yml | 6 +-
.../metatag_hreflang.info.yml | 6 +-
.../metatag_mobile/metatag_mobile.info.yml | 6 +-
.../metatag_open_graph.info.yml | 6 +-
.../metatag_open_graph_products.info.yml | 6 +-
.../metatag_page_manager.info.yml | 6 +-
.../metatag_pinterest.info.yml | 6 +-
.../metatag_twitter_cards.info.yml | 6 +-
.../metatag_verification.info.yml | 6 +-
.../metatag_views/metatag_views.info.yml | 6 +-
.../metatag_test_custom_route.info.yml | 6 +-
.../metatag_test_tag.info.yml | 6 +-
.../tests/src/Functional/MaintenanceMode.php | 59 +++++++++++++++++++
24 files changed, 136 insertions(+), 66 deletions(-)
create mode 100644 web/modules/metatag/tests/src/Functional/MaintenanceMode.php
diff --git a/composer.json b/composer.json
index 1cf6e8b9a4..5d2e44182e 100644
--- a/composer.json
+++ b/composer.json
@@ -143,7 +143,7 @@
"drupal/menu_block": "1.4",
"drupal/menu_block_title": "^1.1",
"drupal/menu_breadcrumb": "^1.7",
- "drupal/metatag": "1.8",
+ "drupal/metatag": "1.9",
"drupal/migrate_devel": "1.x-dev",
"drupal/migrate_plus": "4.0",
"drupal/migrate_tools": "4.0",
diff --git a/composer.lock b/composer.lock
index b2e677c7df..4716f95d4e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "3caed5dbd094aa4540ec32282a537ca5",
+ "content-hash": "7604230aa9adf47dda5866685c99ae24",
"packages": [
{
"name": "alchemy/zippy",
@@ -5851,17 +5851,17 @@
},
{
"name": "drupal/metatag",
- "version": "1.8.0",
+ "version": "1.9.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/metatag.git",
- "reference": "8.x-1.8"
+ "reference": "8.x-1.9"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.8.zip",
- "reference": "8.x-1.8",
- "shasum": "fb5d31aa08c8c2e175f096f9917e9741db152ea8"
+ "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.9.zip",
+ "reference": "8.x-1.9",
+ "shasum": "230960752c5afa17337fb69bae853bccb1a26ecd"
},
"require": {
"drupal/core": "*",
@@ -5883,8 +5883,8 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
- "version": "8.x-1.8",
- "datestamp": "1550692511",
+ "version": "8.x-1.9",
+ "datestamp": "1563995941",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/web/modules/metatag/CHANGELOG.txt b/web/modules/metatag/CHANGELOG.txt
index 8955618d35..89a4da1f90 100644
--- a/web/modules/metatag/CHANGELOG.txt
+++ b/web/modules/metatag/CHANGELOG.txt
@@ -1,3 +1,8 @@
+Metatag 8.x-1.9, 2019-07-24
+---------------------------
+By DamienMcKenna, anton.shloma: Improved maintenance mode identification.
+
+
Metatag 8.x-1.8, 2019-02-20
---------------------------
By samuel.mortenson, Berdir, DamienMcKenna: Fix data property definition.
diff --git a/web/modules/metatag/metatag.info.yml b/web/modules/metatag/metatag.info.yml
index e92edaa593..9c27fed798 100644
--- a/web/modules/metatag/metatag.info.yml
+++ b/web/modules/metatag/metatag.info.yml
@@ -13,8 +13,8 @@ test_dependencies:
- restui:restui
- schema_metatag:schema_web_page
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag.module b/web/modules/metatag/metatag.module
index b9fad84a6d..e0bd16f986 100644
--- a/web/modules/metatag/metatag.module
+++ b/web/modules/metatag/metatag.module
@@ -278,6 +278,12 @@ function metatag_is_current_route_supported() {
return FALSE;
}
+ // Skip everything if the site is in maintenance mode.
+ $route_match = \Drupal::routeMatch();
+ if (\Drupal::service('maintenance_mode')->applies($route_match)) {
+ return FALSE;
+ }
+
return TRUE;
}
diff --git a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml
index 1f79a53f00..ce3b788811 100644
--- a/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml
+++ b/web/modules/metatag/metatag_app_links/metatag_app_links.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_dc/metatag_dc.info.yml b/web/modules/metatag/metatag_dc/metatag_dc.info.yml
index 33eaa6e0a3..094000249d 100644
--- a/web/modules/metatag/metatag_dc/metatag_dc.info.yml
+++ b/web/modules/metatag/metatag_dc/metatag_dc.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml
index 45c1213421..e0f2dd6c08 100644
--- a/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml
+++ b/web/modules/metatag/metatag_dc_advanced/metatag_dc_advanced.info.yml
@@ -7,8 +7,8 @@ dependencies:
- metatag:metatag
- metatag:metatag_dc
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml
index 859e96f3dd..8ac8a30630 100644
--- a/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml
+++ b/web/modules/metatag/metatag_facebook/metatag_facebook.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml
index 5ebb9ac313..b6465555fc 100644
--- a/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml
+++ b/web/modules/metatag/metatag_favicons/metatag_favicons.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml
index 4246003b49..e3f22b1467 100644
--- a/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml
+++ b/web/modules/metatag/metatag_google_cse/metatag_google_cse.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml
index da67659b7c..dae167cf2a 100644
--- a/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml
+++ b/web/modules/metatag/metatag_google_plus/metatag_google_plus.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml
index 1901aaed42..18ed32bd14 100644
--- a/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml
+++ b/web/modules/metatag/metatag_hreflang/metatag_hreflang.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml
index da52a0823f..4363a9de18 100644
--- a/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml
+++ b/web/modules/metatag/metatag_mobile/metatag_mobile.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml
index 16ef28d0b9..fd06c860d7 100644
--- a/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml
+++ b/web/modules/metatag/metatag_open_graph/metatag_open_graph.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml
index 2e7721e51d..b5064d711d 100644
--- a/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml
+++ b/web/modules/metatag/metatag_open_graph_products/metatag_open_graph_products.info.yml
@@ -7,8 +7,8 @@ dependencies:
- metatag:metatag
- metatag:metatag_open_graph
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml
index 4da08b5678..c69aa713ca 100644
--- a/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml
+++ b/web/modules/metatag/metatag_page_manager/metatag_page_manager.info.yml
@@ -7,8 +7,8 @@ dependencies:
- page_manager:page_manager
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml
index 3f91423255..f2b0f23688 100644
--- a/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml
+++ b/web/modules/metatag/metatag_pinterest/metatag_pinterest.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml
index ba3461f194..003681c720 100644
--- a/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml
+++ b/web/modules/metatag/metatag_twitter_cards/metatag_twitter_cards.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_verification/metatag_verification.info.yml b/web/modules/metatag/metatag_verification/metatag_verification.info.yml
index 7d4b7e4c17..8689610b42 100644
--- a/web/modules/metatag/metatag_verification/metatag_verification.info.yml
+++ b/web/modules/metatag/metatag_verification/metatag_verification.info.yml
@@ -6,8 +6,8 @@ package: SEO
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/metatag_views/metatag_views.info.yml b/web/modules/metatag/metatag_views/metatag_views.info.yml
index 20bbe66bf7..c5c8ac4fb9 100644
--- a/web/modules/metatag/metatag_views/metatag_views.info.yml
+++ b/web/modules/metatag/metatag_views/metatag_views.info.yml
@@ -7,8 +7,8 @@ dependencies:
- metatag:metatag
- drupal:views
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml
index 23c33ace19..8e3da7fa0f 100644
--- a/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml
+++ b/web/modules/metatag/tests/modules/metatag_test_custom_route/metatag_test_custom_route.info.yml
@@ -6,8 +6,8 @@ package: Testing
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml
index ab69327c18..0777ef71a6 100644
--- a/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml
+++ b/web/modules/metatag/tests/modules/metatag_test_tag/metatag_test_tag.info.yml
@@ -6,8 +6,8 @@ package: Testing
dependencies:
- metatag:metatag
-# Information added by Drupal.org packaging script on 2019-02-20
-version: '8.x-1.8'
+# Information added by Drupal.org packaging script on 2019-07-24
+version: '8.x-1.9'
core: '8.x'
project: 'metatag'
-datestamp: 1550683387
+datestamp: 1563986001
diff --git a/web/modules/metatag/tests/src/Functional/MaintenanceMode.php b/web/modules/metatag/tests/src/Functional/MaintenanceMode.php
new file mode 100644
index 0000000000..45f280e24a
--- /dev/null
+++ b/web/modules/metatag/tests/src/Functional/MaintenanceMode.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\Tests\metatag\Functional;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\rest\RestResourceConfigInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Verify handling of maintenance mode pages.
+ *
+ * @group metatag
+ */
+class MaintenanceMode extends BrowserTestBase {
+
+ // Contains helper methods.
+ use MetatagHelperTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ // Modules for core functionality.
+ 'node',
+ 'field',
+ 'field_ui',
+ 'user',
+
+ // Contrib dependencies.
+ 'token',
+
+ // This module.
+ 'metatag',
+ ];
+
+ /**
+ * Put the site into maintenance mode, see what the meta tags are.
+ */
+ public function testUser1() {
+ // Load the user 1 profile page.
+ $this->drupalGet('/user/1');
+ // Confirm the page title is correct.
+ $this->assertRaw('<title>Access denied | ');
+ $this->assertNoRaw('<title>admin | ');
+ $this->assertNoRaw('<title>Site under maintenance | ');
+
+ // Put the site into maintenance mode.
+ \Drupal::state()->set('system.maintenance_mode', TRUE);
+ Cache::invalidateTags(['rendered']);
+
+ // Load the user 1 profile page again.
+ $this->drupalGet('/user/1');
+ // Confirm the page title has changed.
+ $this->assertNoRaw('<title>Access denied | ');
+ $this->assertNoRaw('<title>admin | ');
+ $this->assertRaw('<title>Site under maintenance | ');
+ }
+
+}
--
GitLab