diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index 2b379fb..ff55b5b 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -744,7 +744,7 @@ public function getTranslationFromContext(EntityInterface $entity, $langcode = N if ($entity instanceof TranslatableInterface) { if (empty($langcode)) { - $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId(); + $langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->id; } // Retrieve language fallback candidates to perform the entity language @@ -755,7 +755,7 @@ public function getTranslationFromContext(EntityInterface $entity, $langcode = N // Ensure the default language has the proper language code. $default_language = $entity->getUntranslated()->language(); - $candidates[$default_language->getId()] = LanguageInterface::LANGCODE_DEFAULT; + $candidates[$default_language->id] = LanguageInterface::LANGCODE_DEFAULT; // Return the most fitting entity translation. foreach ($candidates as $candidate) { diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index b003f1c..8bff839 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -44,7 +44,7 @@ class Language implements LanguageInterface { * * @var string */ - protected $id = ''; + public $id = ''; /** * The direction, left-to-right, or right-to-left. diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index 16b29ca..6f5795b 100644 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -67,7 +67,8 @@ exit; } -$test_list = simpletest_script_get_test_list(); +// $test_list = simpletest_script_get_test_list(); +$test_list = array_fill(0,50,'\Drupal\system\Tests\Entity\EntityTranslationTest'); // Try to allocate unlimited time to run the tests. drupal_set_time_limit(0);