diff --git a/core/modules/language/src/ConfigurableLanguageInterface.php b/core/modules/language/src/ConfigurableLanguageInterface.php index b4a1801..a4b794e 100644 --- a/core/modules/language/src/ConfigurableLanguageInterface.php +++ b/core/modules/language/src/ConfigurableLanguageInterface.php @@ -16,16 +16,4 @@ */ interface ConfigurableLanguageInterface extends ConfigEntityInterface, LanguageInterface { - /** - * Set values from using the provided Language object. - * - * @param \Drupal\Core\Language\Language $language - * The language object to get the values from. - * - * @return $this - * - * @see language_save() - */ - public function setValuesFromLanguage(Language $language); - } diff --git a/core/modules/language/src/Entity/ConfigurableLanguage.php b/core/modules/language/src/Entity/ConfigurableLanguage.php index 395710d..2f95b9e 100644 --- a/core/modules/language/src/Entity/ConfigurableLanguage.php +++ b/core/modules/language/src/Entity/ConfigurableLanguage.php @@ -196,25 +196,6 @@ protected function toLanguageObject() { } /** - * Converts the ConfigurableLanguage entity to a Core Language value object. - * - * @todo fix return type hint after https://drupal.org/node/2246665 and - * https://drupal.org/node/2246679. - * - * @return \Drupal\Core\Language\LanguageInterface - * The language configuration entity expressed as a Language value object. - */ - public function setValuesFromLanguage(Language $language) { - $this->label = $language->getName(); - $this->direction = $language->getDirection(); - $this->default = $language->isDefault(); - $this->weight = $language->getWeight(); - $this->locked = $language->locked; - - return $this; - } - - /** * {@inheritdoc} * * @throws \DeleteDefaultLanguageException diff --git a/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php b/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php index e1db87d..7b72636 100644 --- a/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php +++ b/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php @@ -47,37 +47,4 @@ public function testWeight() { $this->assertEquals($configurableLanguage->getWeight(), $weight); } - /** - * @covers ::setValuesFromLanguage - */ - public function testSetValuesFromLanguage() { - // Mock the entity manager and create an entity type so that - // ConfigurableLanguage::getName() works. - $entityType = new EntityType(array('id' => 'configurable_language', 'entity_keys' => array('id' => 'id', 'label' => 'label'))); - $entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface'); - $entityManager->expects($this->any()) - ->method('getDefinition') - ->with('configurable_language') - ->will($this->returnValue($entityType)); - $container = new ContainerBuilder(); - $container->set('entity.manager', $entityManager); - \Drupal::setContainer($container); - - $language = new Language(array( - 'id' => $this->randomMachineName(2), - 'weight' => 8, - 'name' => $this->randomMachineName(), - 'direction' => Language::DIRECTION_RTL, - 'default' => TRUE, - 'locked' => TRUE, - )); - - $configurableLanguage = new ConfigurableLanguage(array(), 'configurable_language'); - $configurableLanguage->setValuesFromLanguage($language); - $this->assertSame($language->getWeight(), $configurableLanguage->getWeight()); - $this->assertSame($language->getName(), $configurableLanguage->getName()); - $this->assertSame($language->getDirection(), $configurableLanguage->getDirection()); - $this->assertSame($language->isDefault(), $configurableLanguage->isDefault()); - } - }