diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index cf2248b..d8df0cb 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -142,15 +142,6 @@ public function getId() { /** * {@inheritdoc} */ - public function setId($id) { - $this->id = $id; - - return $this; - } - - /** - * {@inheritdoc} - */ public function getDirection() { return $this->direction; } diff --git a/core/lib/Drupal/Core/Language/LanguageInterface.php b/core/lib/Drupal/Core/Language/LanguageInterface.php index e718749..04ad426 100644 --- a/core/lib/Drupal/Core/Language/LanguageInterface.php +++ b/core/lib/Drupal/Core/Language/LanguageInterface.php @@ -123,16 +123,6 @@ public function setName($name); public function getId(); /** - * Sets the ID (language code). - * - * @param string $id - * The language code. - * - * @return $this - */ - public function setId($id); - - /** * Gets the text direction (left-to-right or right-to-left). * * @return int diff --git a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php index 7308d07..84ee5fc 100644 --- a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php @@ -51,7 +51,8 @@ public function testGetName() { */ public function testGetLangcode() { $language_code = $this->randomMachineName(2); - $this->assertSame($this->language, $this->language->setId($language_code)); + $language = new Language(array(id=>$language_code)); + $this->assertSame($this->language, $language); $this->assertSame($language_code, $this->language->getId()); } @@ -115,20 +116,17 @@ public function testSortArrayOfLanguages(array $languages, array $expected) { * An array of test data. */ public function providerTestSortArrayOfLanguages() { - $language9A = new Language(); + $language9A = new Language(array(id=>'dd')); $language9A->setName('A'); $language9A->setWeight(9); - $language9A->setId('dd'); - $language10A = new Language(); + $language10A = new Language(array(id=>'ee')); $language10A->setName('A'); $language10A->setWeight(10); - $language10A->setId('ee'); - $language10B = new Language(); + $language10B = new Language(array(id=>'ff')); $language10B->setName('B'); $language10B->setWeight(10); - $language10B->setId('ff'); return array( // Set up data set #0, already ordered by weight.