diff --git a/core/core.services.yml b/core/core.services.yml index 4009467..101df70 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -200,8 +200,8 @@ services: language_manager: class: Drupal\Core\Language\LanguageManager arguments: ['@state'] - language_fallback_manager: - class: Drupal\Core\Language\NoFallbackManager + language_fallback_mapper: + class: Drupal\Core\Language\NoLanguageFallbackMapper arguments: ['@language_manager'] string_translator.custom_strings: class: Drupal\Core\StringTranslation\Translator\CustomStrings diff --git a/core/includes/language.inc b/core/includes/language.inc index 76a9512..db43cf8 100644 --- a/core/includes/language.inc +++ b/core/includes/language.inc @@ -545,13 +545,13 @@ function language_url_split_prefix($path, $languages) { * @return * An array of language codes. * - * @see \Drupal\Core\Language\FallbackManagerInterface::getCandidates() + * @see \Drupal\Core\Language\LanguageFallbackMapperInterface::getCandidateLangcodes() * * @deprecated This has been deprecated in favor of the language fallback - * manager. + * mapper. */ function language_fallback_get_candidates($type = Language::TYPE_CONTENT) { - return Drupal::service('language_fallback_manager')->getCandidates(array('type' => $type)); + return Drupal::service('language_fallback_mapper')->getCandidateLangcodes(array('type' => $type)); } /** diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php index 3658161..4bd89ae 100644 --- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php +++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php @@ -10,11 +10,9 @@ use Drupal\Component\Uuid\UuidInterface; use Drupal\Core\Database\Connection; use Drupal\Core\Entity\Query\QueryInterface; +use Drupal\Core\Language\Language; use Drupal\Component\Utility\NestedArray; use Drupal\Component\Uuid\Uuid; -use Drupal\Core\Language\FallbackManagerInterface; -use Drupal\Core\Language\Language; -use Drupal\Core\Language\LanguageManager; use Drupal\field\FieldInfo; use Drupal\field\FieldUpdateForbiddenException; use Drupal\field\FieldInterface; @@ -79,20 +77,6 @@ class DatabaseStorageController extends FieldableEntityStorageControllerBase { protected $fieldInfo; /** - * The language manager service. - * - * @var \Drupal\Core\Language\LanguageManager - */ - protected $languageManager; - - /** - * The language fallback manager service. - * - * @var \Drupal\Core\Language\FallbackManagerInterface; - */ - protected $languageFallbackManager; - - /** * {@inheritdoc} */ public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) { @@ -101,9 +85,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ $entity_info, $container->get('database'), $container->get('field.info'), - $container->get('uuid'), - $container->get('language_manager'), - $container->get('language_fallback_manager') + $container->get('uuid') ); } @@ -120,19 +102,13 @@ public static function createInstance(ContainerInterface $container, $entity_typ * The field info service. * @param \Drupal\Component\Uuid\UuidInterface $uuid_service * The UUID service. - * @param \Drupal\Core\Language\LanguageManager - * The language manager. - * @param \Drupal\Core\Language\FallbackManagerInterface - * The language fallback manager. */ - public function __construct($entity_type, array $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service, LanguageManager $language_manager, FallbackManagerInterface $fallback_manager) { + public function __construct($entity_type, array $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service) { parent::__construct($entity_type, $entity_info); $this->database = $database; $this->fieldInfo = $field_info; $this->uuidService = $uuid_service; - $this->languageManager = $language_manager; - $this->languageFallbackManager = $fallback_manager; // Check if the entity type supports IDs. if (isset($this->entityInfo['entity_keys']['id'])) { @@ -413,8 +389,6 @@ public function create(array $values) { $entity_class::preCreate($this, $values); $entity = new $entity_class($values, $this->entityType); - $entity->setLanguageManager($this->languageManager); - $entity->setLanguageFallbackManager($this->languageFallbackManager); // Assign a new UUID if there is none yet. if ($this->uuidKey && !isset($entity->{$this->uuidKey})) { @@ -917,8 +891,8 @@ public function onBundleRename($bundle, $bundle_new) { ->fields(array('bundle' => $bundle_new)) ->condition('bundle', $bundle) ->execute(); - } } + } /** * {@inheritdoc} diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php index f41baab..02b9978 100644 --- a/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php +++ b/core/lib/Drupal/Core/Entity/DatabaseStorageControllerNG.php @@ -7,9 +7,7 @@ namespace Drupal\Core\Entity; -use Drupal\Core\Language\FallbackManagerInterface; use Drupal\Core\Language\Language; -use Drupal\Core\Language\LanguageManager; use Drupal\field\FieldInfo; use Drupal\Core\Entity\Query\QueryInterface; use Drupal\Core\Entity\EntityInterface; @@ -54,9 +52,8 @@ class DatabaseStorageControllerNG extends DatabaseStorageController { /** * Overrides DatabaseStorageController::__construct(). */ - public function __construct($entity_type, array $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service, LanguageManager $languageManager, FallbackManagerInterface $fallback_manager) { - parent::__construct($entity_type, $entity_info, $database, $field_info, $uuid_service, $languageManager, $fallback_manager); - + public function __construct($entity_type, array $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service) { + parent::__construct($entity_type,$entity_info, $database, $field_info, $uuid_service); $this->bundleKey = !empty($this->entityInfo['entity_keys']['bundle']) ? $this->entityInfo['entity_keys']['bundle'] : FALSE; $this->entityClass = $this->entityInfo['class']; @@ -111,8 +108,6 @@ public function create(array $values) { $bundle = $values[$this->bundleKey]; } $entity = new $this->entityClass(array(), $this->entityType, $bundle); - $entity->setLanguageManager($this->languageManager); - $entity->setLanguageFallbackManager($this->languageFallbackManager); foreach ($entity as $name => $field) { if (isset($values[$name])) { @@ -252,8 +247,6 @@ protected function mapFromStorageRecords(array $records, $load_revision = FALSE) $bundle = $this->bundleKey ? $record->{$this->bundleKey} : FALSE; // Turn the record into an entity class. $entities[$id] = new $this->entityClass($entities[$id], $this->entityType, $bundle); - $entities[$id]->setLanguageManager($this->languageManager); - $entities[$id]->setLanguageFallbackManager($this->languageFallbackManager); } } $this->attachPropertyData($entities, $load_revision); @@ -325,8 +318,6 @@ protected function attachPropertyData(array &$entities, $revision_id = FALSE) { $bundle = $this->bundleKey ? $values[$this->bundleKey][Language::LANGCODE_DEFAULT] : FALSE; // Turn the record into an entity class. $entities[$id] = new $this->entityClass($values, $this->entityType, $bundle, array_keys($translations[$id])); - $entities[$id]->setLanguageManager($this->languageManager); - $entities[$id]->setLanguageFallbackManager($this->languageFallbackManager); } } } diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php index 1bbc6a4..1c5e23e 100644 --- a/core/lib/Drupal/Core/Entity/Entity.php +++ b/core/lib/Drupal/Core/Entity/Entity.php @@ -8,7 +8,7 @@ namespace Drupal\Core\Entity; use Drupal\Core\Entity\Plugin\DataType\EntityReferenceItem; -use Drupal\Core\Language\FallbackManagerInterface; +use Drupal\Core\Language\LanguageFallbackMapperInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; use Drupal\Core\TypedData\TranslatableInterface; @@ -72,9 +72,9 @@ class Entity implements \IteratorAggregate, EntityInterface { * The language fallback manager to be used to find an existing translation or * existing field values when the desired ones are not available. * - * @var \Drupal\Core\Language\FallbackManagerInterface + * @var \Drupal\Core\Language\LanguageFallbackMapperInterface */ - protected $languageFallbackManager; + protected $languageFallbackMapper; /** * Constructs an Entity object. @@ -86,7 +86,10 @@ class Entity implements \IteratorAggregate, EntityInterface { * The type of the entity to create. */ public function __construct(array $values, $entity_type) { + $this->languageManager = \Drupal::languageManager(); + $this->languageFallbackMapper = \Drupal::service('language_fallback_mapper'); $this->entityType = $entity_type; + // Set initial values. foreach ($values as $key => $value) { $this->$key = $value; @@ -146,8 +149,8 @@ public function setLanguageManager(LanguageManager $language_manager) { /** * {@inheritdoc} */ - public function setLanguageFallbackManager(FallbackManagerInterface $fallback_manager) { - $this->languageFallbackManager = $fallback_manager; + public function setLanguageLanguageFallbackMapper(LanguageFallbackMapperInterface $language_fallback_mapper) { + $this->languageFallbackMapper = $language_fallback_mapper; } /** @@ -411,9 +414,7 @@ public function getTranslation($langcode) { } /** - * Implements \Drupal\Core\TypedData\TranslatableInterface::getExistingTranslation(). - * - * @return \Drupal\Core\Entity\EntityInterface + * {@inheritdoc} */ public function getExistingTranslation($langcode, $context = array()) { return $this; diff --git a/core/lib/Drupal/Core/Entity/EntityNG.php b/core/lib/Drupal/Core/Entity/EntityNG.php index 1af9616..eac9eaa 100644 --- a/core/lib/Drupal/Core/Entity/EntityNG.php +++ b/core/lib/Drupal/Core/Entity/EntityNG.php @@ -130,6 +130,8 @@ class EntityNG extends Entity { * Overrides Entity::__construct(). */ public function __construct(array $values, $entity_type, $bundle = FALSE, $translations = array()) { + $this->languageManager = \Drupal::languageManager(); + $this->languageFallbackMapper = \Drupal::service('language_fallback_mapper'); $this->entityType = $entity_type; $this->bundle = $bundle ? $bundle : $this->entityType; $this->languages = language_list(Language::STATE_ALL); @@ -516,7 +518,7 @@ public function getExistingTranslation($langcode, $context = array()) { $context['langcode'] = $langcode; $context['data'] = $this; $context += array('operation' => 'entity_view'); - $candidates = $this->languageFallbackManager->getCandidates($context); + $candidates = $this->languageFallbackMapper->getCandidateLangcodes($context); // Ensure the default language has the proper language code. $default_language = $this->language ?: $this->getDefaultLanguage(); diff --git a/core/lib/Drupal/Core/Language/FallbackManagerInterface.php b/core/lib/Drupal/Core/Language/LanguageFallbackMapperInterface.php similarity index 83% rename from core/lib/Drupal/Core/Language/FallbackManagerInterface.php rename to core/lib/Drupal/Core/Language/LanguageFallbackMapperInterface.php index bad51b6..707000d 100644 --- a/core/lib/Drupal/Core/Language/FallbackManagerInterface.php +++ b/core/lib/Drupal/Core/Language/LanguageFallbackMapperInterface.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Core\Language\FallbackManagerInterface. + * Contains \Drupal\Core\Language\LanguageFallbackMapperInterface. */ namespace Drupal\Core\Language; @@ -12,7 +12,7 @@ * * Implement this interface to provide the language fallback manager service. */ -interface FallbackManagerInterface { +interface LanguageFallbackMapperInterface { /** * Returns the possible language fallback candidates. @@ -31,6 +31,6 @@ * An array of language codes sorted by priority: first values should be * tried first. */ - public function getCandidates(array $context = array()); + public function getCandidateLangcodes(array $context = array()); } diff --git a/core/lib/Drupal/Core/Language/NoFallbackManager.php b/core/lib/Drupal/Core/Language/NoLanguageFallbackMapper.php similarity index 76% rename from core/lib/Drupal/Core/Language/NoFallbackManager.php rename to core/lib/Drupal/Core/Language/NoLanguageFallbackMapper.php index 0f0d4d9..47fe677 100644 --- a/core/lib/Drupal/Core/Language/NoFallbackManager.php +++ b/core/lib/Drupal/Core/Language/NoLanguageFallbackMapper.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\Core\Language\NoFallbackManager. + * Contains \Drupal\Core\Language\NoLanguageFallbackMapper. */ namespace Drupal\Core\Language; @@ -10,7 +10,7 @@ /** * A mock language fallback manager to be used in monolingual environments. */ -class NoFallbackManager implements FallbackManagerInterface { +class NoLanguageFallbackMapper implements LanguageFallbackMapperInterface { /** * The language manager. @@ -32,7 +32,7 @@ public function __construct(LanguageManager $language_manager) { /** * {@inheritdoc} */ - public function getCandidates(array $context = array()) { + public function getCandidateLangcodes(array $context = array()) { return array(Language::LANGCODE_NOT_SPECIFIED); } diff --git a/core/lib/Drupal/Core/TypedData/TranslatableInterface.php b/core/lib/Drupal/Core/TypedData/TranslatableInterface.php index 5a83658..4d3abf9 100644 --- a/core/lib/Drupal/Core/TypedData/TranslatableInterface.php +++ b/core/lib/Drupal/Core/TypedData/TranslatableInterface.php @@ -8,7 +8,7 @@ namespace Drupal\Core\TypedData; use Drupal\Core\Language\LanguageManager; -use Drupal\Core\Language\FallbackManagerInterface; +use Drupal\Core\Language\LanguageFallbackMapperInterface; /** * Interface for translatable data. @@ -34,10 +34,10 @@ public function setLanguageManager(LanguageManager $language_manager); /** * Sets the language fallback manager. * - * @param \Drupal\Core\Language\FallbackManagerInterface + * @param \Drupal\Core\Language\LanguageFallbackMapperInterface * The language fallback manager. */ - public function setLanguageFallbackManager(FallbackManagerInterface $fallback_manager); + public function setLanguageLanguageFallbackMapper(LanguageFallbackMapperInterface $language_fallback_mapper); /** * Returns the languages the data is translated to. @@ -83,7 +83,7 @@ public function getTranslation($langcode); * @return \Drupal\Core\TypedData\TypedDataInterface * A typed data object for the translated data. * - * @see \Drupal\Core\Language\FallbackManagerInterface + * @see \Drupal\Core\Language\LanguageFallbackMapperInterface */ public function getExistingTranslation($langcode, $context = array()); diff --git a/core/modules/field/field.deprecated.inc b/core/modules/field/field.deprecated.inc index 5325be7..4b28f8a 100644 --- a/core/modules/field/field.deprecated.inc +++ b/core/modules/field/field.deprecated.inc @@ -833,13 +833,13 @@ function field_get_default_value(EntityInterface $entity, $field, $instance, $la /** * Checks whether field language fallback is enabled. * - * @see \Drupal\Core\Language\FallbackManagerInterface + * @see \Drupal\Core\Language\LanguageFallbackMapperInterface * * @deprecated Use the language fallback manager service instead of directly * checking whether language fallback is enabled. */ function field_language_fallback_enabled() { - return language_multilingual() && Drupal::service('language_fallback_manager')->isEnabled(); + return language_multilingual() && Drupal::service('language_fallback_mapper')->isEnabled(); } /** @@ -876,8 +876,8 @@ function field_valid_language($langcode, $default = TRUE) { * requested language code and the actual data available in the fields * themselves. * If there is no registered translation handler for the given entity type, the - * display language code to be used is just Language::LANGCODE_NOT_SPECIFIED, as no other - * language code is allowed by field_available_languages(). + * display language code to be used is just Language::LANGCODE_NOT_SPECIFIED, as + * no other language code is allowed by field_available_languages(). * * If translation handlers are found, we let modules provide alternative display * language codes for fields not having the requested language code available. @@ -896,7 +896,7 @@ function field_valid_language($langcode, $default = TRUE) { * A language code if a field name is specified, an array of language codes * keyed by field name otherwise. * - * @see \Drupal\Core\Language\FallbackManagerInterface::getValuesMap() + * @see \Drupal\Core\Language\LanguageFallbackMapperInterface::getValuesMap() * @see \Drupal\Core\Entity\EntityInterface::getFieldLangcode() * * @deprecated This has been deprecated in favor of the Entity Field API. diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php index b570ff3..d91988d 100644 --- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php +++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Language\Language; -use Drupal\Core\Language\FallbackManagerInterface; +use Drupal\Core\Language\LanguageFallbackMapperInterface; use Drupal\field\Plugin\Type\Formatter\FormatterPluginManager; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\display\DisplayPluginBase; @@ -81,9 +81,9 @@ class Field extends FieldPluginBase { /** * The language fallback manager. * - * @var \Drupal\Core\Language\FallbackManagerInterface; + * @var \Drupal\Core\Language\LanguageFallbackMapperInterface; */ - protected $languageFallbackManager; + protected $languageFallbackMapper; /** * Constructs a \Drupal\field\Plugin\views\field\Field object. @@ -97,11 +97,11 @@ class Field extends FieldPluginBase { * @param \Drupal\field\Plugin\Type\Formatter\FormatterPluginManager $formatter_plugin_manager * The field formatter plugin manager. */ - public function __construct(array $configuration, $plugin_id, array $plugin_definition, FormatterPluginManager $formatter_plugin_manager, FallbackManagerInterface $fallback_manager) { + public function __construct(array $configuration, $plugin_id, array $plugin_definition, FormatterPluginManager $formatter_plugin_manager, LanguageFallbackMapperInterface $language_fallback_mapper) { parent::__construct($configuration, $plugin_id, $plugin_definition); $this->formatterPluginManager = $formatter_plugin_manager; - $this->languageFallbackManager = $fallback_manager; + $this->languageFallbackMapper = $language_fallback_mapper; } /** @@ -113,7 +113,7 @@ public static function create(ContainerInterface $container, array $configuratio $plugin_id, $plugin_definition, $container->get('plugin.manager.field.formatter'), - $container->get('language_fallback_manager') + $container->get('language_fallback_mapper') ); } @@ -243,7 +243,7 @@ public function query($use_groupby = FALSE) { array(drupal_container()->get(Language::TYPE_CONTENT)->id, $default_langcode), $this->view->display_handler->options['field_langcode']); $placeholder = $this->placeholder(); - $langcode_fallback_candidates = $this->languageFallbackManager->getCandidates(array('operation' => 'views_query', 'langcode' => $langcode, 'data' => $this)); + $langcode_fallback_candidates = $this->languageFallbackMapper->getCandidateLangcodes(array('operation' => 'views_query', 'langcode' => $langcode, 'data' => $this)); $this->query->addWhereExpression(0, "$column IN($placeholder) OR $column IS NULL", array($placeholder => $langcode_fallback_candidates)); } } diff --git a/core/modules/language/language.api.php b/core/modules/language/language.api.php index 8a8add8..9ca2684 100644 --- a/core/modules/language/language.api.php +++ b/core/modules/language/language.api.php @@ -66,7 +66,7 @@ function hook_language_delete($language) { * @param array $context * A language fallback context. * - * @see \Drupal\Core\Language\FallbackHandlerInterface::getCandidates() + * @see \Drupal\Core\Language\LanguageFallbackMapperInterface::getCandidateLangcodes() */ function hook_language_fallback_candidates_alter(array &$candidates, array $context) { $fallback_candidates = array_reverse($fallback_candidates); @@ -81,7 +81,7 @@ function hook_language_fallback_candidates_alter(array &$candidates, array $cont * @param array $context * A language fallback context. * - * @see \Drupal\Core\Language\FallbackHandlerInterface::getCandidates() + * @see \Drupal\Core\Language\LanguageFallbackMapperInterface::getCandidateLangcodes() */ function hook_language_fallback_candidates_OPERATION_alter(array &$candidates, array $context) { // We know that the current OPERATION deals with entities so no need to check @@ -92,43 +92,5 @@ function hook_language_fallback_candidates_OPERATION_alter(array &$candidates, a } /** - * Allow modules to alter the language fallback map. - * - * @param array $map - * A reference to an associative array keyed by the values keys and having the - * language codes to be used as values. - * @param array $context - * A language fallback context. The specified values are available in the - * 'values' key. - * - * @see \Drupal\Core\Language\FallbackHandlerInterface::getValuesMap() - */ -function hook_language_fallback_map_alter(&$map, $context) { - if ($context['data'] instanceof \Drupal\Core\Entity\EntityInterface && $context['data']->hasTranslation('it')) { - $map['field_foo'] = 'it'; - } -} - -/** - * Allow modules to alter the language fallback map for specific operations. - * - * @param array $map - * A reference to an associative array keyed by the values keys and having the - * language codes to be used as values. - * @param array $context - * A language fallback context. The specified values are available in the - * 'values' key. - * - * @see \Drupal\Core\Language\FallbackHandlerInterface::getValuesMap() - */ -function hook_language_fallback_map_OPERATION_alter(&$map, $context) { - // We know that the current OPERATION deals with entities so no need to check - // here. - if ($context['data']->hasTranslation('it')) { - $map['field_foo'] = 'it'; - } -} - -/** * @} End of "addtogroup hooks". */ diff --git a/core/modules/language/lib/Drupal/language/FallbackManager.php b/core/modules/language/lib/Drupal/language/LanguageFallbackMapper.php similarity index 87% rename from core/modules/language/lib/Drupal/language/FallbackManager.php rename to core/modules/language/lib/Drupal/language/LanguageFallbackMapper.php index 05d44f3..d46c71e 100644 --- a/core/modules/language/lib/Drupal/language/FallbackManager.php +++ b/core/modules/language/lib/Drupal/language/LanguageFallbackMapper.php @@ -2,7 +2,7 @@ /** * @file - * Contains \Drupal\language\FallbackManager. + * Contains \Drupal\language\LanguageFallbackMapper. */ namespace Drupal\language; @@ -11,12 +11,12 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; -use Drupal\Core\Language\NoFallbackManager; +use Drupal\Core\Language\NoLanguageFallbackMapper; /** * A language fallback manager service implementation. */ -class FallbackManager extends NoFallbackManager { +class LanguageFallbackMapper extends NoLanguageFallbackMapper { /** * The module handler service. @@ -41,7 +41,7 @@ public function __construct(LanguageManager $language_manager, ModuleHandlerInte /** * {@inheritdoc} */ - public function getCandidates(array $context = array()) { + public function getCandidateLangcodes(array $context = array()) { // Get languages ordered by weight, add Language::LANGCODE_NOT_SPECIFIED at // the end. $candidates = array_keys(language_list()); @@ -70,7 +70,7 @@ public function getCandidates(array $context = array()) { * @param array $context * A language fallback context data structure. * - * @see \Drupal\Core\Language\FallbackHandlerInterface::getCandidates() + * @see \Drupal\Core\Language\LanguageFallbackMapperInterface::getCandidateLangcodes() */ protected function alter($type, array &$data, array $context) { $types = array(); diff --git a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php index 9e34c57..980cab5 100644 --- a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php +++ b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php @@ -28,8 +28,8 @@ public function register(ContainerBuilder $container) { */ public function alter(ContainerBuilder $container) { // Override the base language fallback manager class with ours. - $definition = $container->getDefinition('language_fallback_manager'); - $definition->setClass('Drupal\language\FallbackManager'); + $definition = $container->getDefinition('language_fallback_mapper'); + $definition->setClass('Drupal\language\LanguageFallbackMapper'); $definition->addArgument(new Reference('module_handler')); } diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageFallbackTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageFallbackTest.php index cfec07b..9a1612c 100644 --- a/core/modules/language/lib/Drupal/language/Tests/LanguageFallbackTest.php +++ b/core/modules/language/lib/Drupal/language/Tests/LanguageFallbackTest.php @@ -58,13 +58,13 @@ public function testCandidates() { // Check that language fallback candidates by default are all the available // languages sorted by weight. - $candidates = $manager->getCandidates(); + $candidates = $manager->getCandidateLangcodes(); $this->assertEqual(array_values($candidates), $expected, 'Language fallback candidates are properly returned.'); // Check that candidates are alterable. $this->state->set('language_test.fallback_alter.candidates', TRUE); $expected = array_slice($expected, 0, count($expected) - 1); - $candidates = $manager->getCandidates(); + $candidates = $manager->getCandidateLangcodes(); $this->assertEqual(array_values($candidates), $expected, 'Language fallback candidates are alterable.'); // Check that candidates are alterable for specific operations. @@ -72,24 +72,24 @@ public function testCandidates() { $this->state->set('language_test.fallback_operation_alter.candidates', TRUE); $expected[] = Language::LANGCODE_NOT_SPECIFIED; $expected[] = Language::LANGCODE_NOT_APPLICABLE; - $candidates = $manager->getCandidates(array('operation' => 'test')); + $candidates = $manager->getCandidateLangcodes(array('operation' => 'test')); $this->assertEqual(array_values($candidates), $expected, 'Language fallback candidates are alterable for specific operations.'); // Check that when the Language module is disabled no language fallback is // applied. $this->disableModules(array('language', 'language_test')); - $candidates = $this->getManager()->getCandidates(); + $candidates = $this->getManager()->getCandidateLangcodes(); $this->assertEqual(array_values($candidates), array(Language::LANGCODE_DEFAULT), 'Language fallback is not applied when the Language module is not enabled.'); } /** * Returns the language fallback manager service. * - * @return \Drupal\Core\Language\FallbackManagerInterface + * @return \Drupal\Core\Language\LanguageFallbackMapperInterface * The language fallback manager. */ protected function getManager() { - return $this->container->get('language_fallback_manager'); + return $this->container->get('language_fallback_mapper'); } } diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php index f2b9441..2beb4c3 100644 --- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php +++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php @@ -12,7 +12,7 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityStorageException; use Drupal\Core\Database\Connection; -use Drupal\Core\Language\FallbackManagerInterface; +use Drupal\Core\Language\LanguageFallbackMapperInterface; use Drupal\Core\Language\LanguageManager; use Drupal\field\FieldInfo; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -63,8 +63,8 @@ class MenuLinkStorageController extends DatabaseStorageController implements Men * @param \Symfony\Cmf\Component\Routing\RouteProviderInterface $route_provider * The route provider service. */ - public function __construct($entity_type, array $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service, LanguageManager $language_manager, FallbackManagerInterface $fallback_manager, RouteProviderInterface $route_provider) { - parent::__construct($entity_type, $entity_info, $database, $field_info, $uuid_service, $language_manager, $fallback_manager); + public function __construct($entity_type, array $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service, LanguageManager $language_manager, LanguageFallbackMapperInterface $language_fallback_mapper, RouteProviderInterface $route_provider) { + parent::__construct($entity_type, $entity_info, $database, $field_info, $uuid_service, $language_manager, $language_fallback_mapper); $this->routeProvider = $route_provider; @@ -96,7 +96,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ $container->get('field.info'), $container->get('uuid'), $container->get('language_manager'), - $container->get('language_fallback_manager'), + $container->get('language_fallback_mapper'), $container->get('router.route_provider') ); } diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php index 9dad72e..d994b13 100644 --- a/core/modules/user/lib/Drupal/user/UserStorageController.php +++ b/core/modules/user/lib/Drupal/user/UserStorageController.php @@ -8,7 +8,7 @@ namespace Drupal\user; use Drupal\Component\Uuid\UuidInterface; -use Drupal\Core\Language\FallbackManagerInterface; +use Drupal\Core\Language\LanguageFallbackMapperInterface; use Drupal\Core\Language\LanguageManager; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Password\PasswordInterface; @@ -58,8 +58,8 @@ class UserStorageController extends DatabaseStorageControllerNG implements UserS * @param \Drupal\user\UserDataInterface $user_data * The user data service. */ - public function __construct($entity_type, $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service, LanguageManager $languageManager, FallbackManagerInterface $fallback_manager, PasswordInterface $password, UserDataInterface $user_data) { - parent::__construct($entity_type, $entity_info, $database, $field_info, $uuid_service, $languageManager, $fallback_manager); + public function __construct($entity_type, $entity_info, Connection $database, FieldInfo $field_info, UuidInterface $uuid_service, LanguageManager $languageManager, LanguageFallbackMapperInterface $language_fallback_mapper, PasswordInterface $password, UserDataInterface $user_data) { + parent::__construct($entity_type, $entity_info, $database, $field_info, $uuid_service, $languageManager, $language_fallback_mapper); $this->password = $password; $this->userData = $user_data; @@ -76,7 +76,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ $container->get('field.info'), $container->get('uuid'), $container->get('language_manager'), - $container->get('language_fallback_manager'), + $container->get('language_fallback_mapper'), $container->get('password'), $container->get('user.data') ); diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php index 75dd90c..d69c1b6 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php @@ -11,7 +11,7 @@ use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\views\ViewExecutable; use Drupal\Core\Database\Database; -use Drupal\Core\Language\FallbackManagerInterface; +use Drupal\Core\Language\LanguageFallbackMapperInterface; use Drupal\Core\Language\LanguageManager; use Drupal\Core\TypedData\TypedDataInterface; use Drupal\Core\Session\AccountInterface; @@ -916,8 +916,8 @@ public function setLanguageManager(LanguageManager $language_manager) { /** * {@inheritdoc} */ - public function setLanguageFallbackManager(FallbackManagerInterface $fallback_manager) { - $this->storage->setLanguageFallbackManager($fallback_manager); + public function setLanguageLanguageFallbackMapper(LanguageFallbackMapperInterface $language_fallback_mapper) { + $this->storage->setLanguageLanguageFallbackMapper($language_fallback_mapper); } /**