opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.1. For more information, see https://www.drupal.org/node/2718713

Browse source
This commit is contained in:
Pantheon Automation 2016-05-04 14:35:41 -07:00 • committed by Greg Anderson
parent c0a0d5a94c
commit 9eae24d844
669 changed files with 3873 additions and 1553 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/modules/language/language.module
View file

@ -33,7 +33,7 @@ function language_help($route_name, RouteMatchInterface $route_match) {
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Adding languages') . '</dt>';
$output .= '<dd>' . t('You can add languages on the <a href=":language_list">Languages</a> page by selecting <em>Add language</em> and choosing a language from the drop-down menu. This language is then displayed in the languages list, where it can be configured further. If the <a href=":interface">Interface translation module</a> is enabled, and the <em>translation server</em> is set as a translation source, then the interface translation for this language is automatically downloaded as well.' , array(':language_list' => \Drupal::url('entity.configurable_language.collection'), ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#')) . '</dd>';
$output .= '<dd>' . t('You can add languages on the <a href=":language_list">Languages</a> page by selecting <em>Add language</em> and choosing a language from the drop-down menu. This language is then displayed in the languages list, where it can be configured further. If the <a href=":interface">Interface translation module</a> is enabled, and the <em>translation server</em> is set as a translation source, then the interface translation for this language is automatically downloaded as well.', array(':language_list' => \Drupal::url('entity.configurable_language.collection'), ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#')) . '</dd>';
$output .= '<dt>' . t('Adding custom languages') . '</dt>';
$output .= '<dd>' . t('You can add a language that is not provided in the drop-down list by choosing <em>Custom language</em> at the end of the list. You then have to configure its language code, name, and direction in the form provided.') . '</dd>';
$output .= '<dt>' . t('Configuring content languages') . '</dt>';

1
core/modules/language/src/ContentLanguageSettingsInterface.php
View file

@ -76,4 +76,3 @@ interface ContentLanguageSettingsInterface extends ConfigEntityInterface {
public function isDefaultConfiguration();
}

2
core/modules/language/src/Form/LanguageFormBase.php
View file

@ -24,7 +24,7 @@ abstract class LanguageFormBase extends EntityForm {
/**
* Constructs a ContentEntityForm object.
*
* @param \Drupal\language\ConfigurableLanguageManagerInterface $language_manager
* @param \Drupal\language\ConfigurableLanguageManagerInterface $language_manager
* The configurable language manager.
*/
public function __construct(ConfigurableLanguageManagerInterface $language_manager) {

1
core/modules/language/src/Form/NegotiationBrowserForm.php
View file

@ -212,4 +212,3 @@ class NegotiationBrowserForm extends ConfigFormBase {
return $config->get('map');
}
}

2
core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationUrl.php
View file

@ -144,7 +144,7 @@ class LanguageNegotiationUrl extends LanguageNegotiationMethodBase implements In
}
}
}
elseif ($config['source'] == LanguageNegotiationUrl::CONFIG_DOMAIN) {
elseif ($config['source'] == LanguageNegotiationUrl::CONFIG_DOMAIN) {
if (is_object($options['language']) && !empty($config['domains'][$options['language']->getId()])) {
// Save the original base URL. If it contains a port, we need to

2
core/modules/language/src/Tests/EntityTypeWithoutLanguageFormTest.php
View file

@ -30,7 +30,7 @@ class EntityTypeWithoutLanguageFormTest extends WebTestBase {
protected function setUp() {
parent::setUp();
// Create and login administrative user.
// Create and log in administrative user.
$admin_user = $this->drupalCreateUser(array(
'administer languages',
));

2
core/modules/language/src/Tests/LanguagePathMonolingualTest.php
View file

@ -21,7 +21,7 @@ class LanguagePathMonolingualTest extends WebTestBase {
protected function setUp() {
parent::setUp();
// Create and login user.
// Create and log in user.
$web_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'administer site configuration'));
$this->drupalLogin($web_user);

2
core/modules/language/src/Tests/LanguageSwitchingTest.php
View file

@ -25,7 +25,7 @@ class LanguageSwitchingTest extends WebTestBase {
protected function setUp() {
parent::setUp();
// Create and login user.
// Create and log in user.
$admin_user = $this->drupalCreateUser(array('administer blocks', 'administer languages', 'access administration pages'));
$this->drupalLogin($admin_user);
}

2
core/modules/language/src/Tests/LanguageUrlRewritingTest.php
View file

@ -33,7 +33,7 @@ class LanguageUrlRewritingTest extends WebTestBase {
protected function setUp() {
parent::setUp();
// Create and login user.
// Create and log in user.
$this->webUser = $this->drupalCreateUser(array('administer languages', 'access administration pages'));
$this->drupalLogin($this->webUser);

4
core/modules/language/src/Tests/Condition/LanguageConditionTest.php → core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
View file

@ -1,9 +1,9 @@
<?php
namespace Drupal\language\Tests\Condition;
namespace Drupal\Tests\language\Kernel\Condition;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests that the language condition, provided by the language module, is

4
core/modules/language/src/Tests/ConfigurableLanguageTest.php → core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php
View file

@ -1,8 +1,8 @@
<?php
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Kernel;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
use Drupal\language\Entity\ConfigurableLanguage;
/**

6
core/modules/language/src/Tests/EntityDefaultLanguageTest.php → core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php
View file

@ -1,10 +1,10 @@
<?php
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Kernel;
use Drupal\Core\Language\LanguageInterface;
use Drupal\language\Entity\ContentLanguageSettings;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests default language code is properly generated for entities.
@ -18,7 +18,7 @@ class EntityDefaultLanguageTest extends KernelTestBase {
*
* @var array
*/
public static $modules = array('language', 'node', 'field', 'text', 'user');
public static $modules = array('language', 'node', 'field', 'text', 'user', 'system');
/**
* {@inheritdoc}

5
core/modules/language/src/Tests/EntityUrlLanguageTest.php → core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Kernel;
use Drupal\Core\Language\LanguageInterface;
use Drupal\entity_test\Entity\EntityTest;
@ -46,7 +46,8 @@ class EntityUrlLanguageTest extends LanguageTestBase {
$config = $this->config('language.negotiation');
$config->set('url.prefixes', ['en' => 'en', 'es' => 'es', 'fr' => 'fr'])
->save();
$this->kernel->rebuildContainer();
\Drupal::service('kernel')->rebuildContainer();
$this->createTranslatableEntity();
}

4
core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php → core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php
View file

@ -1,9 +1,9 @@
<?php
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Kernel;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Ensures the language config overrides can be installed.

2
core/modules/language/src/Tests/LanguageDependencyInjectionTest.php → core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Kernel;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\language\Exception\DeleteDefaultLanguageException;

2
core/modules/language/src/Tests/LanguageFallbackTest.php → core/modules/language/tests/src/Kernel/LanguageFallbackTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Kernel;
use Drupal\Core\Language\LanguageInterface;
use Drupal\language\Entity\ConfigurableLanguage;

4
core/modules/language/src/Tests/LanguageTestBase.php → core/modules/language/tests/src/Kernel/LanguageTestBase.php
View file

@ -1,8 +1,8 @@
<?php
namespace Drupal\language\Tests;
namespace Drupal\Tests\language\Kernel;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Test for dependency injected language object.

32
core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
View file

@ -178,13 +178,13 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
'target_entity_type_id' => 'test_entity_type',
'target_bundle' => 'test_bundle',
), 'language_content_settings');
$alterableConfig->setLanguageAlterable(true);
$alterableConfig->setLanguageAlterable(TRUE);
$nonAlterableConfig = new ContentLanguageSettings(array(
'target_entity_type_id' => 'test_entity_type',
'target_bundle' => 'test_fixed_language_bundle',
), 'language_content_settings');
$nonAlterableConfig->setLanguageAlterable(false);
$nonAlterableConfig->setLanguageAlterable(FALSE);
$defaultConfig = new ContentLanguageSettings(array(
'target_entity_type_id' => 'test_entity_type',
@ -192,9 +192,9 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
), 'language_content_settings');
return [
[$alterableConfig, true],
[$nonAlterableConfig, false],
[$defaultConfig, false],
[$alterableConfig, TRUE],
[$nonAlterableConfig, FALSE],
[$defaultConfig, FALSE],
];
}
@ -208,11 +208,11 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
}
public function providerIsDefaultConfiguration() {
$alteredLanguage= new ContentLanguageSettings(array(
$alteredLanguage = new ContentLanguageSettings(array(
'target_entity_type_id' => 'test_entity_type',
'target_bundle' => 'test_bundle',
), 'language_content_settings');
$alteredLanguage->setLanguageAlterable(true);
$alteredLanguage->setLanguageAlterable(TRUE);
$alteredDefaultLangcode = new ContentLanguageSettings(array(
'target_entity_type_id' => 'test_entity_type',
@ -226,9 +226,9 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
), 'language_content_settings');
return [
[$alteredLanguage, false],
[$alteredDefaultLangcode, false],
[$defaultConfig, true],
[$alteredLanguage, FALSE],
[$alteredDefaultLangcode, FALSE],
[$defaultConfig, TRUE],
];
}
@ -271,11 +271,11 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
}
public function providerLoadByEntityTypeBundle() {
$alteredLanguage= new ContentLanguageSettings(array(
$alteredLanguage = new ContentLanguageSettings(array(
'target_entity_type_id' => 'test_entity_type',
'target_bundle' => 'test_bundle',
), 'language_content_settings');
$alteredLanguage->setLanguageAlterable(true);
$alteredLanguage->setLanguageAlterable(TRUE);
$langcode = $this->randomMachineName();
$alteredDefaultLangcode = new ContentLanguageSettings(array(
@ -290,10 +290,10 @@ class ContentLanguageSettingsUnitTest extends UnitTestCase {
), 'language_content_settings');
return [
['test_entity_type.test_bundle', $alteredLanguage, LanguageInterface::LANGCODE_SITE_DEFAULT, true],
['test_entity_type.test_fixed_language_bundle', $alteredDefaultLangcode, $langcode, false],
['test_entity_type.test_default_language_bundle', $defaultConfig, LanguageInterface::LANGCODE_SITE_DEFAULT, false],
['test_entity_type.null_bundle', NULL, LanguageInterface::LANGCODE_SITE_DEFAULT, false],
['test_entity_type.test_bundle', $alteredLanguage, LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE],
['test_entity_type.test_fixed_language_bundle', $alteredDefaultLangcode, $langcode, FALSE],
['test_entity_type.test_default_language_bundle', $defaultConfig, LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE],
['test_entity_type.null_bundle', NULL, LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE],
];
}