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

Update to Drupal 8.0.2. For more information, see https://www.drupal.org/drupal-8.0.2-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-01-06 16:31:26 -08:00 • committed by Greg Anderson
parent 1a0e9d9fac
commit a6b049dd05
538 changed files with 5247 additions and 1594 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/modules/config/src/Controller/ConfigController.php
View file

@ -142,6 +142,9 @@ class ConfigController implements ContainerInjectionInterface {
$build['diff'] = array(
'#type' => 'table',
'#attributes' => array(
'class' => array('diff'),
),
'#header' => array(
array('data' => t('Active'), 'colspan' => '2'),
array('data' => t('Staged'), 'colspan' => '2'),

2
core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideIntegrationTest.php
View file

@ -27,7 +27,7 @@ class CacheabilityMetadataConfigOverrideIntegrationTest extends WebTestBase {
/**
* {@inheritdoc}
*/
public function setUp() {
protected function setUp() {
parent::setUp();
// @todo If our block does not contain any content then the cache context

2
core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
View file

@ -32,7 +32,7 @@ class CacheabilityMetadataConfigOverrideTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
public function setUp() {
protected function setUp() {
parent::setUp();
$this->installEntitySchema('block_content');
$this->installConfig(['config_override_test']);

2
core/modules/config/src/Tests/ConfigCRUDTest.php
View file

@ -7,6 +7,7 @@
namespace Drupal\config\Tests;
use Drupal\Component\Utility\Crypt;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Config\ConfigNameException;
use Drupal\Core\Config\ConfigValueException;
@ -263,6 +264,7 @@ class ConfigCRUDTest extends KernelTestBase {
'string' => 'string',
'string_int' => '1',
);
$data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($data));
$this->assertIdentical($config->get(), $data);
// Re-set each key using Config::set().

19
core/modules/config/src/Tests/ConfigDiffTest.php
View file

@ -35,13 +35,10 @@ class ConfigDiffTest extends KernelTestBase {
$add_key = 'biff';
$add_data = 'bangpow';
$change_data = 'foobar';
$original_data = array(
'foo' => 'bar',
'404' => 'herp',
);
// Install the default config.
$this->installConfig(array('config_test'));
$original_data = \Drupal::config($config_name)->get();
// Change a configuration value in sync.
$sync_data = $original_data;
@ -95,7 +92,7 @@ class ConfigDiffTest extends KernelTestBase {
$diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, $config_name);
// Prove the fields match.
$edits = $diff->getEdits();
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
$this->assertEqual(count($edits), 1, 'There is one item in the diff');
// Rename the entity.
@ -105,11 +102,11 @@ class ConfigDiffTest extends KernelTestBase {
$diff = \Drupal::service('config.manager')->diff($active, $sync, 'config_test.dynamic.' . $new_test_entity_id, $config_name);
$edits = $diff->getEdits();
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
$this->assertEqual($edits[1]->type, 'change', 'The second item in the diff is a change.');
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
$this->assertEqual($edits[1]->type, 'change', 'The second item in the diff is a change.');
$this->assertEqual($edits[1]->orig, array('id: ' . $new_test_entity_id));
$this->assertEqual($edits[1]->closing, array('id: ' . $test_entity_id));
$this->assertEqual($edits[2]->type, 'copy', 'The third item in the diff is a copy.');
$this->assertEqual($edits[2]->type, 'copy', 'The third item in the diff is a copy.');
$this->assertEqual(count($edits), 3, 'There are three items in the diff.');
}
@ -135,16 +132,16 @@ class ConfigDiffTest extends KernelTestBase {
// Test the fields match in the default collection diff.
$diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
$edits = $diff->getEdits();
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
$this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
$this->assertEqual(count($edits), 1, 'There is one item in the diff');
// Test that the differences are detected when diffing the collection.
$diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, NULL, 'test');
$edits = $diff->getEdits();
$this->assertEqual($edits[0]->type, 'change', 'The second item in the diff is a copy.');
$this->assertEqual($edits[0]->type, 'change', 'The second item in the diff is a copy.');
$this->assertEqual($edits[0]->orig, array('foo: bar'));
$this->assertEqual($edits[0]->closing, array('foo: baz'));
$this->assertEqual($edits[1]->type, 'copy', 'The second item in the diff is a copy.');
$this->assertEqual($edits[1]->type, 'copy', 'The second item in the diff is a copy.');
}
}

2
core/modules/config/src/Tests/ConfigEntityStaticCacheTest.php
View file

@ -41,7 +41,7 @@ class ConfigEntityStaticCacheTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
public function setUp() {
protected function setUp() {
parent::setUp();
$this->entityTypeId = 'config_test';
$this->entityId = 'test_1';

4
core/modules/config/src/Tests/ConfigImportUITest.php
View file

@ -311,6 +311,10 @@ class ConfigImportUITest extends WebTestBase {
// Deleted value is escaped.
$this->assertText(Html::escape("404: '<em>herp</em>'"));
// Verify diff colors are displayed.
$result = $this->xpath('//table[contains(@class, :class)]', array(':class' => 'diff'));
$this->assertEqual(count($result), 1, "Diff UI is displaying colors.");
// Reset data back to original, and remove a key
$sync_data = $original_data;
unset($sync_data[$remove_key]);

4
core/modules/config/src/Tests/ConfigInstallProfileOverrideTest.php
View file

@ -7,6 +7,7 @@
namespace Drupal\config\Tests;
use Drupal\Component\Utility\Crypt;
use Drupal\Core\Config\InstallStorage;
use Drupal\simpletest\WebTestBase;
use Drupal\Core\Config\FileStorage;
@ -48,6 +49,7 @@ class ConfigInstallProfileOverrideTest extends WebTestBase {
'requirements_error' => 1209600,
),
);
$expected_profile_data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($expected_profile_data));
// Verify that the original data matches. We have to read the module config
// file directly, because the install profile default system.cron.yml
@ -85,7 +87,7 @@ class ConfigInstallProfileOverrideTest extends WebTestBase {
// type does not exist.
$optional_dir = drupal_get_path('module', 'testing_config_overrides') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
$optional_storage = new FileStorage($optional_dir);
foreach (['config_test.dynamic.dotted.default', 'config_test.dynamic.override','config_test.dynamic.override_unmet'] as $id) {
foreach (['config_test.dynamic.dotted.default', 'config_test.dynamic.override', 'config_test.dynamic.override_unmet'] as $id) {
$this->assertTrue(\Drupal::config($id)->isNew(), "The config_test entity $id contained in the profile's optional directory does not exist.");
// Make that we don't get false positives from the assertion above.
$this->assertTrue($optional_storage->exists($id), "The config_test entity $id does exist in the profile's optional directory.");

2
core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
View file

@ -22,7 +22,7 @@ class ConfigLanguageOverrideTest extends KernelTestBase {
*
* @var array
*/
public static $modules = array('user', 'language', 'config_test', 'system', 'field');
public static $modules = array('user', 'language', 'config_test', 'system', 'field');
/**
* {@inheritdoc}

10
core/modules/config/src/Tests/ConfigSchemaTest.php
View file

@ -63,6 +63,7 @@ class ConfigSchemaTest extends KernelTestBase {
$expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
$expected['mapping']['langcode']['type'] = 'string';
$expected['mapping']['langcode']['label'] = 'Language code';
$expected['mapping']['_core']['type'] = '_core_config_info';
$expected['mapping']['testitem'] = array('label' => 'Test item');
$expected['mapping']['testlist'] = array('label' => 'Test list');
$expected['type'] = 'config_schema_test.someschema';
@ -106,6 +107,7 @@ class ConfigSchemaTest extends KernelTestBase {
'label' => 'Language code',
'type' => 'string',
);
$expected['mapping']['_core']['type'] = '_core_config_info';
$expected['type'] = 'system.maintenance';
$expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
$this->assertEqual($definition, $expected, 'Retrieved the right metadata for system.maintenance');
@ -120,6 +122,7 @@ class ConfigSchemaTest extends KernelTestBase {
'type' => 'string',
'label' => 'Language code',
);
$expected['mapping']['_core']['type'] = '_core_config_info';
$expected['mapping']['label'] = array(
'label' => 'Label',
'type' => 'label',
@ -179,6 +182,7 @@ class ConfigSchemaTest extends KernelTestBase {
$expected['mapping']['third_party_settings']['type'] = 'sequence';
$expected['mapping']['third_party_settings']['label'] = 'Third party settings';
$expected['mapping']['third_party_settings']['sequence']['type'] = '[%parent.%parent.%type].third_party.[%key]';
$expected['mapping']['_core']['type'] = '_core_config_info';
$expected['type'] = 'image.style.*';
$this->assertEqual($definition, $expected);
@ -231,6 +235,7 @@ class ConfigSchemaTest extends KernelTestBase {
$expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
$expected['mapping']['langcode']['type'] = 'string';
$expected['mapping']['langcode']['label'] = 'Language code';
$expected['mapping']['_core']['type'] = '_core_config_info';
$expected['mapping']['testid']['type'] = 'string';
$expected['mapping']['testid']['label'] = 'ID';
$expected['mapping']['testdescription']['type'] = 'text';
@ -386,7 +391,9 @@ class ConfigSchemaTest extends KernelTestBase {
$extension_path = drupal_get_path('module', 'config_schema_test');
$install_storage = new FileStorage($extension_path . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY);
$original_data = $install_storage->read('config_schema_test.ignore');
$this->assertIdentical($this->config('config_schema_test.ignore')->get(), $original_data);
$installed_data = $this->config('config_schema_test.ignore')->get();
unset($installed_data['_core']);
$this->assertIdentical($installed_data, $original_data);
}
/**
@ -401,6 +408,7 @@ class ConfigSchemaTest extends KernelTestBase {
$expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
$expected['mapping']['langcode']['type'] = 'string';
$expected['mapping']['langcode']['label'] = 'Language code';
$expected['mapping']['_core']['type'] = '_core_config_info';
$expected['mapping']['testid']['type'] = 'string';
$expected['mapping']['testid']['label'] = 'ID';
$expected['mapping']['testdescription']['type'] = 'text';

2
core/modules/config/src/Tests/ConfigSingleImportExportTest.php
View file

@ -202,7 +202,7 @@ EOD;
$this->assertIdentical($expected_options, array_intersect($expected_options, $options), 'The expected configuration files are listed.');
$this->drupalGet('admin/config/development/configuration/single/export/system.simple/system.image');
$this->assertFieldByXPath('//textarea[@name="export"]', "toolkit: gd\n", 'The expected system configuration is displayed.');
$this->assertFieldByXPath('//textarea[@name="export"]', "toolkit: gd\n_core:\n default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24\n", 'The expected system configuration is displayed.');
$this->drupalGet('admin/config/development/configuration/single/export/date_format');
$this->assertFieldByXPath('//select[@name="config_type"]//option[@selected="selected"]', t('Date format'), 'The date format entity type is selected when specified in the URL.');