diff --git a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php index c101968..11a9d40 100644 --- a/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/AccountPermissionsCacheContext.php @@ -36,13 +36,6 @@ public function __construct(AccountInterface $user, PermissionsHashGeneratorInte /** * {@inheritdoc} */ - public static function getLabel() { - return t("Account's permissions"); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->permissionsHashGenerator->generate($this->user); } diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php b/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php index b7538fa..d487d2d 100644 --- a/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php +++ b/core/lib/Drupal/Core/Cache/Context/CacheContextInterface.php @@ -8,14 +8,6 @@ interface CacheContextInterface { /** - * Returns the label of the cache context. - * - * @return string - * The label of the cache context. - */ - public static function getLabel(); - - /** * Returns the string representation of the cache context. * * A cache context service's name is used as a token (placeholder) cache key, diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php index 0e89fb9..6ba9014 100644 --- a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php +++ b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php @@ -60,29 +60,6 @@ public function getAll() { } /** - * Provides an array of available cache context labels. - * - * To be used in cache configuration forms. - * - * @param bool $include_calculated_cache_contexts - * Whether to also return calculated cache contexts. Default to FALSE. - * - * @return array - * An array of available cache contexts and corresponding labels. - */ - public function getLabels($include_calculated_cache_contexts = FALSE) { - $with_labels = array(); - foreach ($this->contexts as $context) { - $service = $this->getService($context); - if (!$include_calculated_cache_contexts && $service instanceof CalculatedCacheContextInterface) { - continue; - } - $with_labels[$context] = $service->getLabel(); - } - return $with_labels; - } - - /** * Converts cache context tokens to cache keys. * * A cache context token is either: diff --git a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php index 74be670..b434b5b 100644 --- a/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php +++ b/core/lib/Drupal/Core/Cache/Context/CalculatedCacheContextInterface.php @@ -8,16 +8,6 @@ interface CalculatedCacheContextInterface { /** - * Returns the label of the cache context. - * - * @return string - * The label of the cache context. - * - * @see Cache - */ - public static function getLabel(); - - /** * Returns the string representation of the cache context. * * A cache context service's name is used as a token (placeholder) cache key, diff --git a/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php index fe7f4f5..552a265 100644 --- a/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/CookiesCacheContext.php @@ -16,13 +16,6 @@ class CookiesCacheContext extends RequestStackCacheContextBase implements Calcul /** * {@inheritdoc} */ - public static function getLabel() { - return t('HTTP cookies'); - } - - /** - * {@inheritdoc} - */ public function getContext($cookie = NULL) { if ($cookie === NULL) { return $this->requestStack->getCurrentRequest()->cookies->all(); diff --git a/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php b/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php index 0a9ac0a..b2ed61a 100644 --- a/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/HeadersCacheContext.php @@ -16,13 +16,6 @@ class HeadersCacheContext extends RequestStackCacheContextBase implements Calcul /** * {@inheritdoc} */ - public static function getLabel() { - return t('HTTP headers'); - } - - /** - * {@inheritdoc} - */ public function getContext($header = NULL) { if ($header === NULL) { return $this->requestStack->getCurrentRequest()->headers->all(); diff --git a/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php b/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php index 9285cb5..0762dcb 100644 --- a/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/IpCacheContext.php @@ -14,13 +14,6 @@ class IpCacheContext extends RequestStackCacheContextBase implements CacheContex /** * {@inheritdoc} */ - public static function getLabel() { - return t('IP address'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->requestStack->getCurrentRequest()->getClientIp(); } diff --git a/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php b/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php index c6c4894..7734ba5 100644 --- a/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/IsSuperUserCacheContext.php @@ -14,13 +14,6 @@ class IsSuperUserCacheContext extends UserCacheContextBase implements CacheConte /** * {@inheritdoc} */ - public static function getLabel() { - return t('Is super user'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return ((int) $this->user->id()) === 1 ? '1' : '0'; } diff --git a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php index a13b763..647bce9 100644 --- a/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/LanguagesCacheContext.php @@ -29,13 +29,6 @@ public function __construct(LanguageManagerInterface $language_manager) { /** * {@inheritdoc} - */ - public static function getLabel() { - return t('Language'); - } - - /** - * {@inheritdoc} * * $type can be NULL, or one of the language types supported by the language * manager, typically: diff --git a/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php index db31384..fb0dbf8 100644 --- a/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/MenuActiveTrailsCacheContext.php @@ -19,13 +19,6 @@ class MenuActiveTrailsCacheContext implements CalculatedCacheContextInterface, C /** * {@inheritdoc} */ - public static function getLabel() { - return t("Active menu trail"); - } - - /** - * {@inheritdoc} - */ public function getContext($menu_name = NULL) { if (!$menu_name) { throw new \LogicException('No menu name provided for menu.active_trails cache context.'); diff --git a/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php b/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php index cb34256..6f620a4 100644 --- a/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/PagersCacheContext.php @@ -15,13 +15,6 @@ class PagersCacheContext extends RequestStackCacheContextBase implements Calcula /** * {@inheritdoc} - */ - public static function getLabel() { - return t('Pager'); - } - - /** - * {@inheritdoc} * * @see pager_find_page() */ diff --git a/core/lib/Drupal/Core/Cache/Context/PathCacheContext.php b/core/lib/Drupal/Core/Cache/Context/PathCacheContext.php index 36ac45d..75fdd31 100644 --- a/core/lib/Drupal/Core/Cache/Context/PathCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/PathCacheContext.php @@ -19,13 +19,6 @@ class PathCacheContext extends RequestStackCacheContextBase implements CacheCont /** * {@inheritdoc} */ - public static function getLabel() { - return t('Path'); - } - - /** - * {@inheritdoc} - */ public function getContext() { $request = $this->requestStack->getCurrentRequest(); return $request->getBasePath() . $request->getPathInfo(); diff --git a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php index a486644..c816433 100644 --- a/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/QueryArgsCacheContext.php @@ -16,13 +16,6 @@ class QueryArgsCacheContext extends RequestStackCacheContextBase implements Calc /** * {@inheritdoc} */ - public static function getLabel() { - return t('Query arguments'); - } - - /** - * {@inheritdoc} - */ public function getContext($query_arg = NULL) { if ($query_arg === NULL) { // All arguments requested. Use normalized query string to minimize diff --git a/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php b/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php index 7df737d..796c3ef 100644 --- a/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/RequestFormatCacheContext.php @@ -14,13 +14,6 @@ class RequestFormatCacheContext extends RequestStackCacheContextBase { /** * {@inheritdoc} */ - public static function getLabel() { - return t('Request format'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->requestStack->getCurrentRequest()->getRequestFormat(); } diff --git a/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php b/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php index 0438925..236af75 100644 --- a/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/RouteCacheContext.php @@ -32,13 +32,6 @@ public function __construct(RouteMatchInterface $route_match) { /** * {@inheritdoc} */ - public static function getLabel() { - return t('Route'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->routeMatch->getRouteName() . hash('sha256', serialize($this->routeMatch->getRawParameters()->all())); } diff --git a/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php b/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php index 22f9310..743e517 100644 --- a/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/RouteNameCacheContext.php @@ -12,13 +12,6 @@ class RouteNameCacheContext extends RouteCacheContext { /** * {@inheritdoc} */ - public static function getLabel() { - return t('Route name'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->routeMatch->getRouteName(); } diff --git a/core/lib/Drupal/Core/Cache/Context/SessionCacheContext.php b/core/lib/Drupal/Core/Cache/Context/SessionCacheContext.php index c8b1027..cc27d2d 100644 --- a/core/lib/Drupal/Core/Cache/Context/SessionCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/SessionCacheContext.php @@ -14,13 +14,6 @@ class SessionCacheContext extends RequestStackCacheContextBase { /** * {@inheritdoc} */ - public static function getLabel() { - return t('Session'); - } - - /** - * {@inheritdoc} - */ public function getContext() { $sid = $this->requestStack->getCurrentRequest()->getSession()->getId(); return Crypt::hashBase64($sid); diff --git a/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php b/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php index 5c9a937..31af070 100644 --- a/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/SiteCacheContext.php @@ -22,13 +22,6 @@ class SiteCacheContext extends RequestStackCacheContextBase implements CacheCont /** * {@inheritdoc} */ - public static function getLabel() { - return t('Site'); - } - - /** - * {@inheritdoc} - */ public function getContext() { $request = $this->requestStack->getCurrentRequest(); return $request->getSchemeAndHttpHost() . $request->getBaseUrl(); diff --git a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php index e7aeb89..4ba1d05 100644 --- a/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/ThemeCacheContext.php @@ -32,13 +32,6 @@ public function __construct(ThemeManagerInterface $theme_manager) { /** * {@inheritdoc} */ - public static function getLabel() { - return t('Theme'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->themeManager->getActiveTheme()->getName() ?: 'stark'; } diff --git a/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php b/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php index 3188172..011276d 100644 --- a/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/TimeZoneCacheContext.php @@ -16,13 +16,6 @@ class TimeZoneCacheContext implements CacheContextInterface { /** * {@inheritdoc} */ - public static function getLabel() { - return t("Time zone"); - } - - /** - * {@inheritdoc} - */ public function getContext() { // date_default_timezone_set() is called in AccountProxy::setAccount(), so // we can safely retrieve the timezone. diff --git a/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php b/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php index 2830330..78cb529 100644 --- a/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/UrlCacheContext.php @@ -14,13 +14,6 @@ class UrlCacheContext extends RequestStackCacheContextBase implements CacheConte /** * {@inheritdoc} */ - public static function getLabel() { - return t('URL'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->requestStack->getCurrentRequest()->getUri(); } diff --git a/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php b/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php index 868e5fe..81e42b0 100644 --- a/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/UserCacheContext.php @@ -14,13 +14,6 @@ class UserCacheContext extends UserCacheContextBase implements CacheContextInter /** * {@inheritdoc} */ - public static function getLabel() { - return t('User'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return $this->user->id(); } diff --git a/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php b/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php index 0cd0fbe..e01ee6c 100644 --- a/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php +++ b/core/lib/Drupal/Core/Cache/Context/UserRolesCacheContext.php @@ -19,13 +19,6 @@ class UserRolesCacheContext extends UserCacheContextBase implements CalculatedCa /** * {@inheritdoc} */ - public static function getLabel() { - return t("User's roles"); - } - - /** - * {@inheritdoc} - */ public function getContext($role = NULL) { // User 1 does not actually have any special behavior for roles; this is // added as additional security and backwards compatibility protection for diff --git a/core/modules/book/src/Cache/BookNavigationCacheContext.php b/core/modules/book/src/Cache/BookNavigationCacheContext.php index 521d50b..c55afa8 100644 --- a/core/modules/book/src/Cache/BookNavigationCacheContext.php +++ b/core/modules/book/src/Cache/BookNavigationCacheContext.php @@ -44,13 +44,6 @@ public function __construct(RequestStack $request_stack) { /** * {@inheritdoc} */ - public static function getLabel() { - return t("Book navigation"); - } - - /** - * {@inheritdoc} - */ public function getContext() { // Find the current book's ID. $current_bid = 0; diff --git a/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php b/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php index de9fefc..71aa819 100644 --- a/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php +++ b/core/modules/config/tests/config_override_integration_test/src/Cache/ConfigOverrideIntegrationTestCacheContext.php @@ -15,13 +15,6 @@ class ConfigOverrideIntegrationTestCacheContext implements CacheContextInterface /** * {@inheritdoc} */ - public static function getLabel() { - return t('Config override integration test'); - } - - /** - * {@inheritdoc} - */ public function getContext() { // Default to the 'disabled' state. $state = \Drupal::state()->get('config_override_integration_test.enabled', FALSE) ? 'yes' : 'no'; diff --git a/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php b/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php index b9e2490..fe187ea 100644 --- a/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php +++ b/core/modules/config/tests/config_override_test/src/Cache/PirateDayCacheContext.php @@ -26,13 +26,6 @@ class PirateDayCacheContext implements CacheContextInterface { /** * {@inheritdoc} */ - public static function getLabel() { - return t('Pirate day'); - } - - /** - * {@inheritdoc} - */ public function getContext() { $is_pirate_day = static::isPirateDay() ? 'yarr' : 'nay'; return "pirate_day." . $is_pirate_day; diff --git a/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php b/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php index d70dea7..fd266cd 100644 --- a/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php +++ b/core/modules/system/tests/modules/entity_test/src/Cache/EntityTestViewGrantsCacheContext.php @@ -17,13 +17,6 @@ class EntityTestViewGrantsCacheContext implements CacheContextInterface { /** * {@inheritdoc} */ - public static function getLabel() { - return t("Entity test view grants"); - } - - /** - * {@inheritdoc} - */ public function getContext() { // Return a constant value, so we can fetch render cache both in actual // requests and test code itself. diff --git a/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php b/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php index 8fb2d1b..c1b07daa 100644 --- a/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php +++ b/core/modules/views/tests/modules/views_test_data/src/Cache/ViewsTestCacheContext.php @@ -15,13 +15,6 @@ class ViewsTestCacheContext implements CacheContextInterface { /** * {@inheritdoc} */ - public static function getLabel() { - return t('Views test cache context'); - } - - /** - * {@inheritdoc} - */ public function getContext() { return \Drupal::state()->get('views_test_cache_context', 'George'); } diff --git a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php index 0bc9d7f..3db5fcd 100644 --- a/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php +++ b/core/tests/Drupal/Tests/Core/Cache/Context/CacheContextsManagerTest.php @@ -145,14 +145,6 @@ public function testAvailableContextStrings() { $this->assertEquals(array("foo", "baz"), $contexts); } - public function testAvailableContextLabels() { - $container = $this->getMockContainer(); - $cache_contexts_manager = new CacheContextsManager($container, $this->getContextsFixture()); - $labels = $cache_contexts_manager->getLabels(); - $expected = array("foo" => "Foo"); - $this->assertEquals($expected, $labels); - } - protected function getContextsFixture() { return array('foo', 'baz'); } @@ -227,13 +219,6 @@ class FooCacheContext implements CacheContextInterface { /** * {@inheritdoc} */ - public static function getLabel() { - return 'Foo'; - } - - /** - * {@inheritdoc} - */ public function getContext() { return 'bar'; } @@ -255,13 +240,6 @@ class BazCacheContext implements CalculatedCacheContextInterface { /** * {@inheritdoc} */ - public static function getLabel() { - return 'Baz'; - } - - /** - * {@inheritdoc} - */ public function getContext($parameter = NULL) { if (!is_string($parameter) || strlen($parameter) === 0) { throw new \Exception(); @@ -286,13 +264,6 @@ class NoOptimizeCacheContext implements CacheContextInterface { /** * {@inheritdoc} */ - public static function getLabel() { - return 'Foo'; - } - - /** - * {@inheritdoc} - */ public function getContext() { return 'bar'; }