diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php index 44811c5..eafcd5d 100644 --- a/core/lib/Drupal/Core/Language/LanguageManager.php +++ b/core/lib/Drupal/Core/Language/LanguageManager.php @@ -363,7 +363,7 @@ public function getConfigOverrideLanguage() { * * By default removes the locked languages. * - * @param array $languages + * @param \Drupal\Core\Language\LanguageInterface[] $languages * Array with languages to be filtered. * * @param int $flags @@ -371,14 +371,14 @@ public function getConfigOverrideLanguage() { * It can be: LanguageInterface::STATE_CONFIGURABLE, * LanguageInterface::STATE_LOCKED, LanguageInterface::STATE_ALL. * - * @return array + * @return \Drupal\Core\Language\LanguageInterface[] * An associative array of languages, keyed by the language code. */ protected function languageFilter(array $languages, $flags = LanguageInterface::STATE_CONFIGURABLE) { $filtered_languages = array(); // Add the site's default language if flagged as allowed value. if ($flags & LanguageInterface::STATE_SITE_DEFAULT) { - $default = isset($default) ? $default : $this->getDefaultLanguage(); + $default = $this->getDefaultLanguage(); // Rename the default language. But we do not want to do this globally, // if we're acting on a global object, so clone the object first. $default = clone $default; @@ -394,4 +394,5 @@ protected function languageFilter(array $languages, $flags = LanguageInterface:: return $filtered_languages; } + } diff --git a/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php b/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php index 939852e..9fff59e 100644 --- a/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php +++ b/core/modules/language/src/Tests/LanguageSelectorTranslatableTest.php @@ -16,6 +16,11 @@ */ class LanguageSelectorTranslatableTest extends WebTestBase { + /** + * Modules to enable. + * + * @var array + */ public static $modules = array( 'language', 'content_translation', @@ -42,7 +47,6 @@ protected function setUp() { // Create user and set permissions. $this->administrator = $this->drupalCreateUser($this->getAdministratorPermissions(), 'administrator'); $this->drupalLogin($this->administrator); - } /** @@ -51,17 +55,17 @@ protected function setUp() { protected function getAdministratorPermissions() { return array_filter( array('translate interface', - 'administer content translation', - 'create content translations', - 'update content translations', - 'delete content translations', - 'administer languages' + 'administer content translation', + 'create content translations', + 'update content translations', + 'delete content translations', + 'administer languages' ) ); } /** - * Test Content Translation language selectors are correctly translatable. + * Tests Content Translation language selectors are correctly translatable. */ public function testLanguageStringSelector() { // Add another language.