diff --git a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php index fcbfca4..4066b16 100644 --- a/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php +++ b/core/lib/Drupal/Core/Theme/AjaxBasePageNegotiator.php @@ -77,10 +77,10 @@ public function determineActiveTheme(Request $request) { $token = $ajax_page_state['theme_token']; // Prevent a request forgery from giving a person access to a theme they - // shouldn't be otherwise allowed to see. However, since everyone is allowed - // to see the default theme, token validation isn't required for that, and - // bypassing it allows most use-cases to work even when accessed from the - // page cache. + // shouldn't be otherwise allowed to see. However, since everyone is + // allowed to see the default theme, token validation isn't required for + // that, and bypassing it allows most use-cases to work even when accessed + // from the page cache. if ($theme === $this->configFactory->get('system.theme')->get('default') || $this->csrfGenerator->validate($token, $theme)) { return $theme; } diff --git a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php index 6d8e1c9..51f3e67 100644 --- a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php +++ b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php @@ -76,7 +76,7 @@ public function setRequest(Request $request) { * @param \Drupal\Core\Theme\ThemeNegotiatorInterface $negotiator * The theme negotiator to add. * @param int $priority - * Priority of the breadcrumb builder. + * Priority of the theme negotiator. */ public function addNegotiator(ThemeNegotiatorInterface $negotiator, $priority) { $this->negotiators[$priority][] = $negotiator; @@ -88,7 +88,7 @@ public function addNegotiator(ThemeNegotiatorInterface $negotiator, $priority) { * Returns the sorted array of theme negotiators. * * @return array|\Drupal\Core\Theme\ThemeNegotiatorInterface[] - * An array of breadcrumb builder objects. + * An array of theme negotiator objects. */ protected function getSortedNegotiators() { if (!isset($this->sortedNegotiators)) { diff --git a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php index 620022d..e8bb2fe 100644 --- a/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php +++ b/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php @@ -14,6 +14,8 @@ /** * Tests the theme negotiator. * + * @group Drupal + * * @see \Drupal\Core\Theme\ThemeNegotiator */ class ThemeNegotiatorTest extends UnitTestCase {