diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index cf2248bd572d94c1456b511b61f5d6e13eb5b543..d8df0cb96afc59d7be25616c86832ff26b606790 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -139,15 +139,6 @@ public function getId() { return $this->id; } - /** - * {@inheritdoc} - */ - public function setId($id) { - $this->id = $id; - - return $this; - } - /** * {@inheritdoc} */ diff --git a/core/lib/Drupal/Core/Language/LanguageInterface.php b/core/lib/Drupal/Core/Language/LanguageInterface.php index e718749993f2d5b50d6477c14bd48383b5d3ae5d..04ad4267728a511e8793a7959f704c38bcc67ed6 100644 --- a/core/lib/Drupal/Core/Language/LanguageInterface.php +++ b/core/lib/Drupal/Core/Language/LanguageInterface.php @@ -122,16 +122,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). * diff --git a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php index d86452f37c16858f59073983ca2c4977b2c0679d..100e5c04d5fd389a92d96a827aa46485840bb82b 100644 --- a/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php @@ -47,12 +47,11 @@ public function testGetName() { * Tests langcode ID getter and setter methods. * * @covers ::getId() - * @covers ::setId() */ public function testGetLangcode() { $language_code = $this->randomMachineName(2); - $this->assertSame($this->language, $this->language->setId($language_code)); - $this->assertSame($language_code, $this->language->getId()); + $language = new Language(array('id' => $language_code)); + $this->assertSame($language_code, $language->getId()); } /** @@ -115,20 +114,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.