From 4d86f97385b805d89a7c1c2a96e7a61edba9cf82 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Thu, 23 Oct 2014 12:32:15 +0100 Subject: [PATCH] Issue #2316561 by jmolivas | YesCT: Type hint hooks with interface: ConfigurableLanguageInterface instead of LanguageEntity/ConfigurableLanguage. --- core/modules/block/block.module | 4 ++-- core/modules/language/language.module | 6 +++--- core/modules/locale/locale.module | 8 ++++---- core/modules/node/node.module | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/modules/block/block.module b/core/modules/block/block.module index 39e15ea99c1..95e1bd6c908 100644 --- a/core/modules/block/block.module +++ b/core/modules/block/block.module @@ -8,7 +8,7 @@ use Drupal\block\BlockInterface; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Url; -use Drupal\language\Entity\ConfigurableLanguage; +use Drupal\language\ConfigurableLanguageInterface; use Drupal\system\Entity\Menu; use Drupal\block\Entity\Block; @@ -315,7 +315,7 @@ function block_menu_delete(Menu $menu) { * * Delete the potential block visibility settings of the deleted language. */ -function block_configurable_language_delete(ConfigurableLanguage $language) { +function block_configurable_language_delete(ConfigurableLanguageInterface $language) { // Remove the block visibility settings for the deleted language. foreach (Block::loadMultiple() as $block) { /** @var $block \Drupal\block\BlockInterface */ diff --git a/core/modules/language/language.module b/core/modules/language/language.module index a6053607d0a..68126f6ce13 100644 --- a/core/modules/language/language.module +++ b/core/modules/language/language.module @@ -8,7 +8,7 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Routing\RouteMatchInterface; -use Drupal\language\Entity\ConfigurableLanguage; +use Drupal\language\ConfigurableLanguageInterface; use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI; use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl; use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrlFallback; @@ -418,7 +418,7 @@ function language_modules_uninstalled($modules) { /** * Implements hook_ENTITY_TYPE_insert() for 'configurable_language'. */ -function language_configurable_language_insert(ConfigurableLanguage $language) { +function language_configurable_language_insert(ConfigurableLanguageInterface $language) { if ($language->isLocked()) { return; } @@ -432,7 +432,7 @@ function language_configurable_language_insert(ConfigurableLanguage $language) { /** * Implements hook_ENTITY_TYPE_delete() for 'configurable_language'. */ -function language_configurable_language_delete(ConfigurableLanguage $language) { +function language_configurable_language_delete(ConfigurableLanguageInterface $language) { // Remove language from language prefix list. $prefixes = language_negotiation_url_prefixes(); unset($prefixes[$language->id()]); diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 04dfb802a84..846ee88a272 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -20,7 +20,7 @@ use Drupal\Core\Language\Language; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\StringTranslation\TranslationWrapper; use Drupal\Core\Language\LanguageInterface; -use Drupal\language\Entity\ConfigurableLanguage; +use Drupal\language\ConfigurableLanguageInterface; use Drupal\Component\Utility\Crypt; /** @@ -198,7 +198,7 @@ function locale_theme() { /** * Implements hook_ENTITY_TYPE_insert() for 'configurable_language'. */ -function locale_configurable_language_insert(ConfigurableLanguage $language) { +function locale_configurable_language_insert(ConfigurableLanguageInterface $language) { // @todo move these two cache clears out. See http://drupal.org/node/1293252 // Changing the language settings impacts the interface: clear render cache. \Drupal::cache('render')->deleteAll(); @@ -209,7 +209,7 @@ function locale_configurable_language_insert(ConfigurableLanguage $language) { /** * Implements hook_ENTITY_TYPE_update() for 'configurable_language'. */ -function locale_configurable_language_update(ConfigurableLanguage $language) { +function locale_configurable_language_update(ConfigurableLanguageInterface $language) { // @todo move these two cache clears out. See http://drupal.org/node/1293252 // Changing the language settings impacts the interface: clear render cache. \Drupal::cache('render')->deleteAll(); @@ -220,7 +220,7 @@ function locale_configurable_language_update(ConfigurableLanguage $language) { /** * Implements hook_ENTITY_TYPE_delete() for 'configurable_language'. */ -function locale_configurable_language_delete(ConfigurableLanguage $language) { +function locale_configurable_language_delete(ConfigurableLanguageInterface $language) { // Remove translations. \Drupal::service('locale.storage')->deleteTranslations(array('language' => $language->id())); diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 11f2092d087..bb4e2b23cfa 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -30,7 +30,7 @@ use Drupal\Core\Entity\Display\EntityViewDisplayInterface; use Drupal\Core\Entity\Display\EntityFormDisplayInterface; use Drupal\Core\Template\Attribute; use Drupal\file\Entity\File; -use Drupal\language\Entity\ConfigurableLanguage; +use Drupal\language\ConfigurableLanguageInterface; use Drupal\block\Entity\Block; use Drupal\Core\Session\AccountInterface; @@ -1400,7 +1400,7 @@ function node_modules_uninstalled($modules) { /** * Implements hook_ENTITY_TYPE_delete() for 'configurable_language'. */ -function node_configurable_language_delete(ConfigurableLanguage $language) { +function node_configurable_language_delete(ConfigurableLanguageInterface $language) { // On nodes with this language, unset the language. \Drupal::entityManager()->getStorage('node')->clearRevisionsLanguage($language); }