bachir/edlp_d8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated core from 8.4 to 8.5 : bug with login_destination

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-13 14:01:21 +01:00
parent 0d78da249b
commit e668535a4e
3486 changed files with 89604 additions and 33283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/modules/language/language.info.yml
+3 -3
View File
@@ -6,8 +6,8 @@ package: Multilingual
# core: 8.x
configure: entity.configurable_language.collection
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457825
core/modules/language/language.module
+4
View File
@@ -272,6 +272,8 @@ function language_get_default_langcode($entity_type, $bundle) {
*
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use \Drupal::config('language.negotiation')->get('url.prefixes') instead.
*
* @see https://www.drupal.org/node/2912748
*/
function language_negotiation_url_prefixes() {
return \Drupal::config('language.negotiation')->get('url.prefixes');
@@ -301,6 +303,8 @@ function language_negotiation_url_prefixes_update() {
*
* @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
* Use \Drupal::config('language.negotiation')->get('url.domains') instead.
*
* @see https://www.drupal.org/node/2912748
*/
function language_negotiation_url_domains() {
return \Drupal::config('language.negotiation')->get('url.domains');
core/modules/language/migration_templates/d6_language_content_settings.yml → core/modules/language/migrations/d6_language_content_settings.yml
+1 -1
View File
@@ -1,8 +1,8 @@
id: d6_language_content_settings
label: Drupal 6 language content settings
migration_tags:
- Drupal 6
- Configuration
source:
plugin: d6_language_content_settings
constants:
core/modules/language/migration_templates/d6_language_negotiation_settings.yml → core/modules/language/migrations/d6_language_negotiation_settings.yml
+1
View File
@@ -2,6 +2,7 @@ id: d6_language_negotiation_settings
label: Language negotiation settings
migration_tags:
- Drupal 6
- Configuration
source:
plugin: variable
variables:
core/modules/language/migration_templates/d6_language_types.yml → core/modules/language/migrations/d6_language_types.yml
+1
View File
@@ -2,6 +2,7 @@ id: d6_language_types
label: Language types
migration_tags:
- Drupal 6
- Configuration
source:
plugin: variable
variables:
core/modules/language/migration_templates/d7_language_content_settings.yml → core/modules/language/migrations/d7_language_content_settings.yml
+1
View File
@@ -2,6 +2,7 @@ id: d7_language_content_settings
label: Drupal 7 language content settings
migration_tags:
- Drupal 7
- Configuration
source:
plugin: d7_language_content_settings
constants:
core/modules/language/migration_templates/d7_language_negotiation_settings.yml → core/modules/language/migrations/d7_language_negotiation_settings.yml
+1
View File
@@ -2,6 +2,7 @@ id: d7_language_negotiation_settings
label: Language negotiation settings
migration_tags:
- Drupal 7
- Configuration
source:
plugin: variable
variables:
core/modules/language/migration_templates/d7_language_types.yml → core/modules/language/migrations/d7_language_types.yml
+1
View File
@@ -2,6 +2,7 @@ id: d7_language_types
label: Language types
migration_tags:
- Drupal 7
- Configuration
source:
plugin: variable
variables:
core/modules/language/migration_templates/default_language.yml → core/modules/language/migrations/default_language.yml
+1
View File
@@ -3,6 +3,7 @@ label: Default language
migration_tags:
- Drupal 6
- Drupal 7
- Configuration
source:
plugin: variable
variables:
core/modules/language/migration_templates/language.yml → core/modules/language/migrations/language.yml
+1
View File
@@ -3,6 +3,7 @@ label: Languages
migration_tags:
- Drupal 6
- Drupal 7
- Configuration
source:
plugin: language
process:
core/modules/language/migration_templates/language_prefixes_and_domains.yml → core/modules/language/migrations/language_prefixes_and_domains.yml
+1
View File
@@ -3,6 +3,7 @@ label: Language prefixes and domains
migration_tags:
- Drupal 6
- Drupal 7
- Configuration
source:
plugin: language
fetch_all: true
core/modules/language/src/ConfigurableLanguageManager.php
+6 -1
View File
@@ -426,7 +426,12 @@ class ConfigurableLanguageManager extends LanguageManager implements Configurabl
}
/**
* {@inheritdoc}
* Sets the configuration override language.
*
* @param \Drupal\Core\Language\LanguageInterface $language
* The language to override configuration with.
*
* @return $this
*/
public function setConfigOverrideLanguage(LanguageInterface $language = NULL) {
$this->configFactoryOverride->setLanguage($language);
core/modules/language/src/Form/ContentLanguageSettingsForm.php
+2
View File
@@ -11,6 +11,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Configure the content language settings for this site.
*
* @internal
*/
class ContentLanguageSettingsForm extends FormBase {
core/modules/language/src/Form/LanguageAddForm.php
+2
View File
@@ -9,6 +9,8 @@ use Drupal\language\Entity\ConfigurableLanguage;
/**
* Controller for language addition forms.
*
* @internal
*/
class LanguageAddForm extends LanguageFormBase {
core/modules/language/src/Form/LanguageDeleteForm.php
+2
View File
@@ -6,6 +6,8 @@ use Drupal\Core\Entity\EntityDeleteForm;
/**
* Defines a confirmation form for deleting a language entity.
*
* @internal
*/
class LanguageDeleteForm extends EntityDeleteForm {
core/modules/language/src/Form/LanguageEditForm.php
+2
View File
@@ -6,6 +6,8 @@ use Drupal\Core\Form\FormStateInterface;
/**
* Controller for language edit forms.
*
* @internal
*/
class LanguageEditForm extends LanguageFormBase {
core/modules/language/src/Form/NegotiationBrowserDeleteForm.php
+2
View File
@@ -9,6 +9,8 @@ use Drupal\Core\Url;
/**
* Defines a confirmation form for deleting a browser language negotiation mapping.
*
* @internal
*/
class NegotiationBrowserDeleteForm extends ConfirmFormBase {
use ConfigFormBaseTrait;
core/modules/language/src/Form/NegotiationBrowserForm.php
+2
View File
@@ -11,6 +11,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Configure the browser language negotiation method for this site.
*
* @internal
*/
class NegotiationBrowserForm extends ConfigFormBase {
core/modules/language/src/Form/NegotiationConfigureForm.php
+2
View File
@@ -17,6 +17,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Configure the selected language negotiation method for this site.
*
* @internal
*/
class NegotiationConfigureForm extends ConfigFormBase {
core/modules/language/src/Form/NegotiationSelectedForm.php
+2
View File
@@ -8,6 +8,8 @@ use Drupal\Core\Form\ConfigFormBase;
/**
* Configure the selected language negotiation method for this site.
*
* @internal
*/
class NegotiationSelectedForm extends ConfigFormBase {
core/modules/language/src/Form/NegotiationSessionForm.php
+2
View File
@@ -7,6 +7,8 @@ use Drupal\Core\Form\FormStateInterface;
/**
* Configure the session language negotiation method for this site.
*
* @internal
*/
class NegotiationSessionForm extends ConfigFormBase {
core/modules/language/src/Form/NegotiationUrlForm.php
+2
View File
@@ -12,6 +12,8 @@ use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
/**
* Configure the URL language negotiation method for this site.
*
* @internal
*/
class NegotiationUrlForm extends ConfigFormBase {
core/modules/language/tests/language_config_override_test/language_config_override_test.info.yml
+3 -3
View File
@@ -5,8 +5,8 @@ description: 'Support module for the language config override test.'
package: Testing
# version: VERSION
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457825
core/modules/language/tests/language_elements_test/language_elements_test.info.yml
+3 -3
View File
@@ -7,8 +7,8 @@ package: Testing
dependencies:
- entity_test
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457825
core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
+2
View File
@@ -8,6 +8,8 @@ use Drupal\language\Entity\ContentLanguageSettings;
/**
* A form containing a language configuration element.
*
* @internal
*/
class LanguageConfigurationElement extends FormBase {
core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
+2
View File
@@ -7,6 +7,8 @@ use Drupal\Core\Form\FormStateInterface;
/**
* A form containing a language select element.
*
* @internal
*/
class LanguageConfigurationElementTest extends FormBase {
core/modules/language/tests/language_test/language_test.info.yml
+3 -3
View File
@@ -5,8 +5,8 @@ description: 'Support module for the language layer tests.'
package: Testing
# version: VERSION
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457825
core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php
+1 -5
View File
@@ -160,11 +160,7 @@ class LanguageNegotiationInfoTest extends BrowserTestBase {
foreach ($this->languageManager()->getDefinedLanguageTypesInfo() as $type => $info) {
if (!in_array($type, $configurable) && isset($info['fixed'])) {
$negotiation = $this->config('language.types')->get('negotiation.' . $type . '.enabled');
$equal = count($info['fixed']) == count($negotiation);
while ($equal && list($id) = each($negotiation)) {
list(, $info_id) = each($info['fixed']);
$equal = $info_id == $id;
}
$equal = array_keys($negotiation) === array_values($info['fixed']);
$this->assertTrue($equal, format_string('language negotiation for %type is properly set up', ['%type' => $type]));
}
}
core/modules/language/tests/src/Kernel/Migrate/d6/MigrateDefaultLanguageTest.php
+3 -3
View File
@@ -45,10 +45,10 @@ class MigrateDefaultLanguageTest extends MigrateDrupal6TestBase {
$count = 0;
foreach ($messages as $message) {
$count++;
$this->assertSame($message->message, "The language 'tv' does not exist on this site.");
$this->assertSame((int) $message->level, MigrationInterface::MESSAGE_ERROR);
$this->assertSame("The language 'tv' does not exist on this site.", $message->message);
$this->assertSame(MigrationInterface::MESSAGE_ERROR, (int) $message->level);
}
$this->assertSame($count, 1);
$this->assertSame(1, $count);
}
/**
core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageNegotiationSettingsTest.php
+35 -35
View File
@@ -29,26 +29,26 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
]);
$config = $this->config('language.negotiation');
$this->assertSame($config->get('session.parameter'), 'language');
$this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX);
$this->assertSame($config->get('selected_langcode'), 'site_default');
$this->assertSame('language', $config->get('session.parameter'));
$this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
$this->assertSame('site_default', $config->get('selected_langcode'));
$expected_prefixes = [
'en' => '',
'fr' => 'fr',
'zu' => 'zu',
];
$this->assertSame($config->get('url.prefixes'), $expected_prefixes);
$this->assertSame($expected_prefixes, $config->get('url.prefixes'));
$config = $this->config('language.types');
$this->assertSame($config->get('all'), ['language_interface', 'language_content', 'language_url']);
$this->assertSame($config->get('configurable'), ['language_interface']);
$this->assertSame($config->get('negotiation.language_content.enabled'), ['language-interface' => 0]);
$this->assertSame($config->get('negotiation.language_url.enabled'), ['language-url' => 0, 'language-url-fallback' => 1]);
$this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
$this->assertSame(['language_interface'], $config->get('configurable'));
$this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
$this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
$expected_language_interface = [
'language-url' => 0,
'language-selected' => 1,
];
$this->assertSame($config->get('negotiation.language_interface.enabled'), $expected_language_interface);
$this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
}
/**
@@ -68,19 +68,19 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
]);
$config = $this->config('language.negotiation');
$this->assertSame($config->get('session.parameter'), 'language');
$this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX);
$this->assertSame($config->get('selected_langcode'), 'site_default');
$this->assertSame('language', $config->get('session.parameter'));
$this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
$this->assertSame('site_default', $config->get('selected_langcode'));
$config = $this->config('language.types');
$this->assertSame($config->get('all'), ['language_interface', 'language_content', 'language_url']);
$this->assertSame($config->get('configurable'), ['language_interface']);
$this->assertSame($config->get('negotiation.language_content.enabled'), ['language-interface' => 0]);
$this->assertSame($config->get('negotiation.language_url.enabled'), ['language-url' => 0, 'language-url-fallback' => 1]);
$this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
$this->assertSame(['language_interface'], $config->get('configurable'));
$this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
$this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
$expected_language_interface = [
'language-selected' => 0,
];
$this->assertSame($config->get('negotiation.language_interface.enabled'), $expected_language_interface);
$this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
}
/**
@@ -100,28 +100,28 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
]);
$config = $this->config('language.negotiation');
$this->assertSame($config->get('session.parameter'), 'language');
$this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX);
$this->assertSame($config->get('selected_langcode'), 'site_default');
$this->assertSame('language', $config->get('session.parameter'));
$this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
$this->assertSame('site_default', $config->get('selected_langcode'));
$expected_prefixes = [
'en' => '',
'fr' => 'fr',
'zu' => 'zu',
];
$this->assertSame($config->get('url.prefixes'), $expected_prefixes);
$this->assertSame($expected_prefixes, $config->get('url.prefixes'));
$config = $this->config('language.types');
$this->assertSame($config->get('all'), ['language_interface', 'language_content', 'language_url']);
$this->assertSame($config->get('configurable'), ['language_interface']);
$this->assertSame($config->get('negotiation.language_content.enabled'), ['language-interface' => 0]);
$this->assertSame($config->get('negotiation.language_url.enabled'), ['language-url' => 0, 'language-url-fallback' => 1]);
$this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
$this->assertSame(['language_interface'], $config->get('configurable'));
$this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
$this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
$expected_language_interface = [
'language-url' => 0,
'language-user' => 1,
'language-browser' => 2,
'language-selected' => 3,
];
$this->assertSame($config->get('negotiation.language_interface.enabled'), $expected_language_interface);
$this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
}
/**
@@ -142,26 +142,26 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
global $base_url;
$config = $this->config('language.negotiation');
$this->assertSame($config->get('session.parameter'), 'language');
$this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_DOMAIN);
$this->assertSame($config->get('selected_langcode'), 'site_default');
$this->assertSame('language', $config->get('session.parameter'));
$this->assertSame(LanguageNegotiationUrl::CONFIG_DOMAIN, $config->get('url.source'));
$this->assertSame('site_default', $config->get('selected_langcode'));
$expected_domains = [
'en' => parse_url($base_url, PHP_URL_HOST),
'fr' => 'fr.drupal.org',
'zu' => 'zu.drupal.org',
];
$this->assertSame($config->get('url.domains'), $expected_domains);
$this->assertSame($expected_domains, $config->get('url.domains'));
$config = $this->config('language.types');
$this->assertSame($config->get('all'), ['language_interface', 'language_content', 'language_url']);
$this->assertSame($config->get('configurable'), ['language_interface']);
$this->assertSame($config->get('negotiation.language_content.enabled'), ['language-interface' => 0]);
$this->assertSame($config->get('negotiation.language_url.enabled'), ['language-url' => 0, 'language-url-fallback' => 1]);
$this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
$this->assertSame(['language_interface'], $config->get('configurable'));
$this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
$this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
$expected_language_interface = [
'language-url' => 0,
'language-selected' => 1,
];
$this->assertSame($config->get('negotiation.language_interface.enabled'), $expected_language_interface);
$this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
}
}
core/modules/language/tests/src/Kernel/Migrate/d7/MigrateDefaultLanguageTest.php
+3 -3
View File
@@ -45,10 +45,10 @@ class MigrateDefaultLanguageTest extends MigrateDrupal7TestBase {
$count = 0;
foreach ($messages as $message) {
$count++;
$this->assertSame($message->message, "The language 'tv' does not exist on this site.");
$this->assertSame((int) $message->level, MigrationInterface::MESSAGE_ERROR);
$this->assertSame("The language 'tv' does not exist on this site.", $message->message);
$this->assertSame(MigrationInterface::MESSAGE_ERROR, (int) $message->level);
}
$this->assertSame($count, 1);
$this->assertSame(1, $count);
}
/**
core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
+17 -17
View File
@@ -28,10 +28,10 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
]);
$config = $this->config('language.types');
$this->assertSame($config->get('all'), ['language_content', 'language_url', 'language_interface']);
$this->assertSame($config->get('configurable'), ['language_interface']);
$this->assertSame($config->get('negotiation.language_content'), ['enabled' => ['language-interface' => 0]]);
$this->assertSame($config->get('negotiation.language_url'), ['enabled' => ['language-url' => 0, 'language-url-fallback' => 1]]);
$this->assertSame(['language_content', 'language_url', 'language_interface'], $config->get('all'));
$this->assertSame(['language_interface'], $config->get('configurable'));
$this->assertSame(['enabled' => ['language-interface' => 0]], $config->get('negotiation.language_content'));
$this->assertSame(['enabled' => ['language-url' => 0, 'language-url-fallback' => 1]], $config->get('negotiation.language_url'));
$expected_language_interface = [
'enabled' => [
'language-url' => -9,
@@ -46,7 +46,7 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
'language-selected' => -6,
],
];
$this->assertSame($config->get('negotiation.language_interface'), $expected_language_interface);
$this->assertSame($expected_language_interface, $config->get('negotiation.language_interface'));
}
/**
@@ -60,14 +60,14 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
]);
$config = $this->config('language.negotiation');
$this->assertSame($config->get('session.parameter'), 'language');
$this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX);
$this->assertSame($config->get('selected_langcode'), 'site_default');
$this->assertSame('language', $config->get('session.parameter'));
$this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
$this->assertSame('site_default', $config->get('selected_langcode'));
$expected_prefixes = [
'en' => '',
'is' => 'is',
];
$this->assertSame($config->get('url.prefixes'), $expected_prefixes);
$this->assertSame($expected_prefixes, $config->get('url.prefixes'));
}
/**
@@ -87,14 +87,14 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
global $base_url;
$config = $this->config('language.negotiation');
$this->assertSame($config->get('session.parameter'), 'language');
$this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_DOMAIN);
$this->assertSame($config->get('selected_langcode'), 'site_default');
$this->assertSame('language', $config->get('session.parameter'));
$this->assertSame(LanguageNegotiationUrl::CONFIG_DOMAIN, $config->get('url.source'));
$this->assertSame('site_default', $config->get('selected_langcode'));
$expected_domains = [
'en' => parse_url($base_url, PHP_URL_HOST),
'is' => 'is.drupal.org',
];
$this->assertSame($config->get('url.domains'), $expected_domains);
$this->assertSame($expected_domains, $config->get('url.domains'));
}
/**
@@ -112,14 +112,14 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
]);
$config = $this->config('language.negotiation');
$this->assertSame($config->get('session.parameter'), 'language');
$this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX);
$this->assertSame($config->get('selected_langcode'), 'site_default');
$this->assertSame('language', $config->get('session.parameter'));
$this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
$this->assertSame('site_default', $config->get('selected_langcode'));
$expected_prefixes = [
'en' => '',
'is' => 'is',
];
$this->assertSame($config->get('url.prefixes'), $expected_prefixes);
$this->assertSame($expected_prefixes, $config->get('url.prefixes'));
}
}
core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
+24 -5
View File
@@ -4,6 +4,9 @@ namespace Drupal\Tests\language\Unit;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Entity\EntityManager;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Entity\EntityTypeRepositoryInterface;
use Drupal\language\Entity\ContentLanguageSettings;
use Drupal\Tests\UnitTestCase;
@@ -27,6 +30,13 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
*/
protected $entityManager;
/**
* The entity type manager used for testing.
*
* @var \Drupal\Core\Entity\EntityTypeManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $entityTypeManager;
/**
* The ID of the type of the entity under test.
*
@@ -62,7 +72,8 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
$this->entityTypeId = $this->randomMachineName();
$this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
$this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
$this->entityManager = new EntityManager();
$this->entityTypeManager = $this->getMock(EntityTypeManagerInterface::class);
$this->uuid = $this->getMock('\Drupal\Component\Uuid\UuidInterface');
@@ -72,9 +83,13 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
$container = new ContainerBuilder();
$container->set('entity.manager', $this->entityManager);
$container->set('entity_type.manager', $this->entityTypeManager);
$container->set('uuid', $this->uuid);
$container->set('config.typed', $this->typedConfigManager);
$container->set('config.storage', $this->configEntityStorageInterface);
// Inject the container into entity.manager so it can defer to other entity
// services.
$this->entityManager->setContainer($container);
\Drupal::setContainer($container);
}
@@ -88,7 +103,7 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
->method('getBundleConfigDependency')
->will($this->returnValue(['type' => 'config', 'name' => 'test.test_entity_type.id']));
$this->entityManager->expects($this->any())
$this->entityTypeManager->expects($this->any())
->method('getDefinition')
->with('test_entity_type')
->will($this->returnValue($target_entity_type));
@@ -254,16 +269,20 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
->method('create')
->will($this->returnValue($nullConfig));
$this->entityManager
$this->entityTypeManager
->expects($this->any())
->method('getStorage')
->with('language_content_settings')
->will($this->returnValue($this->configEntityStorageInterface));
$this->entityManager->expects($this->any())
$entity_type_repository = $this->getMockForAbstractClass(EntityTypeRepositoryInterface::class);
$entity_type_repository->expects($this->any())
->method('getEntityTypeFromClass')
->with('Drupal\language\Entity\ContentLanguageSettings')
->with(ContentLanguageSettings::class)
->willReturn('language_content_settings');
\Drupal::getContainer()->set('entity_type.repository', $entity_type_repository);
$config = ContentLanguageSettings::loadByEntityTypeBundle($type, $bundle);
$this->assertSame($expected_langcode, $config->getDefaultLangcode());
core/modules/language/tests/test_module/test_module.info.yml
+3 -3
View File
@@ -5,8 +5,8 @@ package: Testing
# version: VERSION
# core: 8.x
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457825