Skip to content
Snippets Groups Projects
Verified Commit c7bde643 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3375276 by DieterHolvoet: 4xx HTTP code theme suggestions are not... 

Issue #3375276 by DieterHolvoet: 4xx HTTP code theme suggestions are not applied if a node is set as 4xx path
parent 5ac5a2b6
No related branches found
No related tags found
43 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4594Applying patch for Views Global Text area field to allow extra HTML tags. As video, source and iframe tag is not rendering. Due to which Media embedded video and remote-video not rendering in Views Global Text area field.,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3546refactored dialog.pcss file,!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3502Issue #3335308: Confusing behavior with FormState::setFormState and FormState::setMethod,!3452Issue #3332701: Refactor Claro's tablesort-indicator stylesheet,!3451Issue #2410579: Allows setting the current language programmatically.,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3147Issue #3328457: Replace most substr($a, $i) where $i is negative with str_ends_with(),!3146Issue #3328456: Replace substr($a, 0, $i) with str_starts_with(),!3133core/modules/system/css/components/hidden.module.css,!31312878513-10.1.x,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2614Issue #2981326: Replace non-test usages of \Drupal::logger() with IoC injection,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!844Resolve #3036010 "Updaters",!673Issue #3214208: FinishResponseSubscriber could create duplicate headers,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
core/modules/system/system.module
+ 5
− 8
View file @ c7bde643
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
use Drupal\Core\Url; use Drupal\Core\Url;
use GuzzleHttp\Exception\TransferException; use GuzzleHttp\Exception\TransferException;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
/** /**
* Disabled option on forms and settings. * Disabled option on forms and settings.
...@@ -306,15 +307,11 @@ function system_theme_suggestions_page(array $variables) { ...@@ -306,15 +307,11 @@ function system_theme_suggestions_page(array $variables) {
$path_args = explode('/', trim(\Drupal::service('path.current')->getPath(), '/')); $path_args = explode('/', trim(\Drupal::service('path.current')->getPath(), '/'));
$suggestions = theme_get_suggestions($path_args, 'page'); $suggestions = theme_get_suggestions($path_args, 'page');
$http_error_suggestions = [ $supported_http_error_codes = [401, 403, 404];
'system.401' => 'page__401', $exception = \Drupal::requestStack()->getCurrentRequest()->attributes->get('exception');
'system.403' => 'page__403', if ($exception instanceof HttpExceptionInterface && in_array($exception->getStatusCode(), $supported_http_error_codes, TRUE)) {
'system.404' => 'page__404',
];
$route_name = \Drupal::routeMatch()->getRouteName();
if (isset($http_error_suggestions[$route_name])) {
$suggestions[] = 'page__4xx'; $suggestions[] = 'page__4xx';
$suggestions[] = $http_error_suggestions[$route_name]; $suggestions[] = 'page__' . $exception->getStatusCode();
} }
return $suggestions; return $suggestions;
......
core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+ 30
− 11
View file @ c7bde643
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
use Drupal\Core\Extension\ModuleExtensionList; use Drupal\Core\Extension\ModuleExtensionList;
use Drupal\Core\Path\CurrentPathStack; use Drupal\Core\Path\CurrentPathStack;
use Drupal\Core\Path\PathMatcherInterface; use Drupal\Core\Path\PathMatcherInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Theme\Registry; use Drupal\Core\Theme\Registry;
use Drupal\Core\Utility\ThemeRegistry; use Drupal\Core\Utility\ThemeRegistry;
use Drupal\KernelTests\KernelTestBase; use Drupal\KernelTests\KernelTestBase;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
/** /**
* Tests the behavior of the ThemeRegistry class. * Tests the behavior of the ThemeRegistry class.
...@@ -192,6 +192,26 @@ public function testThemeSuggestions() { ...@@ -192,6 +192,26 @@ public function testThemeSuggestions() {
], $suggestions, 'Found expected page node suggestions.'); ], $suggestions, 'Found expected page node suggestions.');
} }
/**
* Tests page theme suggestions for 200 responses.
*/
public function test200ThemeSuggestions() {
$path_matcher = $this->prophesize(PathMatcherInterface::class);
$path_matcher->isFrontPage()->willReturn(FALSE);
\Drupal::getContainer()->set('path.matcher', $path_matcher->reveal());
$path_current = $this->prophesize(CurrentPathStack::class);
$path_current->getPath()->willReturn('/node/123');
\Drupal::getContainer()->set('path.current', $path_current->reveal());
$suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_page', [[]]);
$this->assertSame([
'page__node',
'page__node__%',
'page__node__123',
], $suggestions);
}
/** /**
* Data provider for test40xThemeSuggestions(). * Data provider for test40xThemeSuggestions().
* *
...@@ -200,9 +220,9 @@ public function testThemeSuggestions() { ...@@ -200,9 +220,9 @@ public function testThemeSuggestions() {
*/ */
public function provider40xThemeSuggestions() { public function provider40xThemeSuggestions() {
return [ return [
['system.401', 'page__401'], [401, 'page__401'],
['system.403', 'page__403'], [403, 'page__403'],
['system.404', 'page__404'], [404, 'page__404'],
]; ];
} }
...@@ -211,19 +231,18 @@ public function provider40xThemeSuggestions() { ...@@ -211,19 +231,18 @@ public function provider40xThemeSuggestions() {
* *
* @dataProvider provider40xThemeSuggestions * @dataProvider provider40xThemeSuggestions
*/ */
public function test40xThemeSuggestions($route, $suggestion) { public function test40xThemeSuggestions(int $httpCode, string $suggestion): void {
/** @var \Drupal\Core\Path\PathMatcherInterface $path_matcher */
$path_matcher = $this->prophesize(PathMatcherInterface::class); $path_matcher = $this->prophesize(PathMatcherInterface::class);
$path_matcher->isFrontPage()->willReturn(FALSE); $path_matcher->isFrontPage()->willReturn(FALSE);
\Drupal::getContainer()->set('path.matcher', $path_matcher->reveal()); \Drupal::getContainer()->set('path.matcher', $path_matcher->reveal());
/** @var \Drupal\Core\Path\CurrentPathStack $path_current */
$path_current = $this->prophesize(CurrentPathStack::class); $path_current = $this->prophesize(CurrentPathStack::class);
$path_current->getPath()->willReturn('/node/123'); $path_current->getPath()->willReturn('/node/123');
\Drupal::getContainer()->set('path.current', $path_current->reveal()); \Drupal::getContainer()->set('path.current', $path_current->reveal());
/** @var \Drupal\Core\Routing\RouteMatchInterface $route_matcher */
$route_matcher = $this->prophesize(RouteMatchInterface::class); $exception = $this->prophesize(HttpExceptionInterface::class);
$route_matcher->getRouteName()->willReturn($route); $exception->getStatusCode()->willReturn($httpCode);
\Drupal::getContainer()->set('current_route_match', $route_matcher->reveal()); \Drupal::requestStack()->getCurrentRequest()->attributes->set('exception', $exception->reveal());
$suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_page', [[]]); $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_page', [[]]);
$this->assertSame([ $this->assertSame([
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment