From 4b42df3dbd1f45e4db60465ec1dd11801cdf7ba7 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 22 Aug 2014 12:28:51 +0100
Subject: [PATCH] Issue #2318817 by alimac, martin107: Remove method setId()
from core/lib/Drupal/Core/Language/LanguageInterface.
---
core/lib/Drupal/Core/Language/Language.php | 9 ---------
.../lib/Drupal/Core/Language/LanguageInterface.php | 10 ----------
.../Tests/Core/Language/LanguageUnitTest.php | 14 +++++---------
3 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php
index cf2248bd572d..d8df0cb96afc 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 e718749993f2..04ad4267728a 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 d86452f37c16..100e5c04d5fd 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.
--
GitLab