From ad5a6a695d5e8eae32596698706abf38377ca143 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Thu, 22 Aug 2019 11:17:06 +1000
Subject: [PATCH] =?UTF-8?q?Issue=20#2363987=20by=20Joseph=20Zhao,=20mr.bai?=
=?UTF-8?q?leys,=20Krzysztof=20Doma=C5=84ski,=20acrosman,=20andypost,=20ca?=
=?UTF-8?q?tch,=20lauriii:=20Add=20theme=20support=20for=20content=20of=20?=
=?UTF-8?q?401/403/404=20responses?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/modules/system/system.module | 15 ++++++-
.../KernelTests/Core/Theme/RegistryTest.php | 44 +++++++++++++++++++
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 1371ea07217d..c7b2937684da 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -316,7 +316,20 @@ function system_theme_suggestions_html(array $variables) {
*/
function system_theme_suggestions_page(array $variables) {
$path_args = explode('/', trim(\Drupal::service('path.current')->getPath(), '/'));
- return theme_get_suggestions($path_args, 'page');
+ $suggestions = theme_get_suggestions($path_args, 'page');
+
+ $http_error_suggestions = [
+ 'system.401' => 'page__401',
+ 'system.403' => 'page__403',
+ 'system.404' => 'page__404',
+ ];
+ $route_name = \Drupal::routeMatch()->getRouteName();
+ if (isset($http_error_suggestions[$route_name])) {
+ $suggestions[] = 'page__4xx';
+ $suggestions[] = $http_error_suggestions[$route_name];
+ }
+
+ return $suggestions;
}
/**
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
index ffbe543db7fd..d0649ba11077 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
@@ -4,6 +4,7 @@
use Drupal\Core\Path\CurrentPathStack;
use Drupal\Core\Path\PathMatcherInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Theme\Registry;
use Drupal\Core\Utility\ThemeRegistry;
use Drupal\KernelTests\KernelTestBase;
@@ -192,6 +193,49 @@ public function testThemeSuggestions() {
], $suggestions, 'Found expected page node suggestions.');
}
+ /**
+ * Data provider for test40xThemeSuggestions().
+ *
+ * @return array
+ * An associative array of 40x theme suggestions.
+ */
+ public function provider40xThemeSuggestions() {
+ return [
+ ['system.401', 'page__401'],
+ ['system.403', 'page__403'],
+ ['system.404', 'page__404'],
+ ];
+ }
+
+ /**
+ * Tests page theme suggestions for 40x responses.
+ *
+ * @dataProvider provider40xThemeSuggestions
+ */
+ public function test40xThemeSuggestions($route, $suggestion) {
+ /** @var \Drupal\Core\Path\PathMatcherInterface $path_matcher */
+ $path_matcher = $this->prophesize(PathMatcherInterface::class);
+ $path_matcher->isFrontPage()->willReturn(FALSE);
+ \Drupal::getContainer()->set('path.matcher', $path_matcher->reveal());
+ /** @var \Drupal\Core\Path\CurrentPathStack $path_current */
+ $path_current = $this->prophesize(CurrentPathStack::class);
+ $path_current->getPath()->willReturn('/node/123');
+ \Drupal::getContainer()->set('path.current', $path_current->reveal());
+ /** @var \Drupal\Core\Routing\RouteMatchInterface $route_matcher */
+ $route_matcher = $this->prophesize(RouteMatchInterface::class);
+ $route_matcher->getRouteName()->willReturn($route);
+ \Drupal::getContainer()->set('current_route_match', $route_matcher->reveal());
+
+ $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_page', [[]]);
+ $this->assertSame([
+ 'page__node',
+ 'page__node__%',
+ 'page__node__123',
+ 'page__4xx',
+ $suggestion,
+ ], $suggestions);
+ }
+
/**
* Tests theme-provided templates that are registered by modules.
*/
--
GitLab