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

Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2

Browse source
This commit is contained in:
Pantheon Automation 2016-06-02 15:56:09 -07:00 • committed by Greg Anderson
parent 9eae24d844
commit 28556d630e
1322 changed files with 6699 additions and 2064 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/modules/config/config.module
View file

@ -22,7 +22,7 @@ function config_help($route_name, RouteMatchInterface $route_match) {
$output .= '<dd>' . t('You can create and download an archive consisting of all your site\'s configuration exported as <em>*.yml</em> files on the <a href=":url">Export</a> page.', array(':url' => \Drupal::url('config.export_full'))) . '</dd>';
$output .= '<dt>' . t('Importing a full configuration') . '</dt>';
$output .= '<dd>' . t('You can upload a full site configuration from an archive file on the <a href=":url">Import</a> page. When importing data from a different environment, the site and import files must have matching configuration values for UUID in the <em>system.site</em> configuration item. That means that your other environments should initially be set up as clones of the target site. Migrations are not supported.', array(':url' => \Drupal::url('config.import_full'))) . '</dd>';
$output .= '<dt>' . t('Synchronizing configuration'). '</dt>';
$output .= '<dt>' . t('Synchronizing configuration') . '</dt>';
$output .= '<dd>' . t('You can review differences between the active configuration and an imported configuration archive on the <a href=":synchronize">Synchronize</a> page to ensure that the changes are as expected, before finalizing the import. The Synchronize page also shows configuration items that would be added or removed.', array(':synchronize' => \Drupal::url('config.sync'))) . '</dd>';
$output .= '<dt>' . t('Exporting a single configuration item') . '</dt>';
$output .= '<dd>' . t('You can export a single configuration item by selecting a <em>Configuration type</em> and <em>Configuration name</em> on the <a href=":single-export">Single export</a> page. The configuration and its corresponding <em>*.yml file name</em> are then displayed on the page for you to copy.', array(':single-export' => \Drupal::url('config.export_single'))) . '</dd>';
@ -69,7 +69,7 @@ function config_file_download($uri) {
$date = DateTime::createFromFormat('U', $request->server->get('REQUEST_TIME'));
$date_string = $date->format('Y-m-d-H-i');
$hostname = str_replace('.', '-', $request->getHttpHost());
$filename = 'config' . '-' . $hostname . '-' . $date_string. '.tar.gz';
$filename = 'config' . '-' . $hostname . '-' . $date_string . '.tar.gz';
$disposition = 'attachment; filename="' . $filename . '"';
return array(
'Content-disposition' => $disposition,

1
core/modules/config/src/ConfigSubscriber.php
View file

@ -33,4 +33,5 @@ class ConfigSubscriber extends ConfigImportValidateEventSubscriberBase {
$events[ConfigEvents::IMPORT_VALIDATE][] = array('onConfigImporterValidate', 20);
return $events;
}
}

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

@ -160,4 +160,5 @@ class ConfigController implements ContainerInjectionInterface {
return $build;
}
}

15
core/modules/config/src/Form/ConfigImportForm.php
View file

@ -67,13 +67,16 @@ class ConfigImportForm extends FormBase {
* {@inheritdoc}
*/
public function validateForm(array &$form, FormStateInterface $form_state) {
$file_upload = $this->getRequest()->files->get('files[import_tarball]', NULL, TRUE);
if ($file_upload && $file_upload->isValid()) {
$form_state->setValue('import_tarball', $file_upload->getRealPath());
}
else {
$form_state->setErrorByName('import_tarball', $this->t('The file could not be uploaded.'));
$all_files = $this->getRequest()->files->get('files', []);
if (!empty($all_files['import_tarball'])) {
$file_upload = $all_files['import_tarball'];
if ($file_upload->isValid()) {
$form_state->setValue('import_tarball', $file_upload->getRealPath());
return;
}
}
$form_state->setErrorByName('import_tarball', $this->t('The file could not be uploaded.'));
}
/**

12
core/modules/config/src/Form/ConfigSingleImportForm.php
View file

@ -2,6 +2,7 @@
namespace Drupal\config\Form;
use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
use Drupal\Component\Serialization\Yaml;
use Drupal\config\StorageReplaceDataWrapper;
use Drupal\Core\Config\ConfigImporter;
@ -281,8 +282,13 @@ class ConfigSingleImportForm extends ConfirmFormBase {
return;
}
// Decode the submitted import.
$data = Yaml::decode($form_state->getValue('import'));
try {
// Decode the submitted import.
$data = Yaml::decode($form_state->getValue('import'));
}
catch (InvalidDataTypeException $e) {
$form_state->setErrorByName('import', $this->t('The import failed with the following message: %message', ['%message' => $e->getMessage()]));
}
// Validate for config entities.
if ($form_state->getValue('config_type') !== 'system.simple') {
@ -388,7 +394,7 @@ class ConfigSingleImportForm extends ConfirmFormBase {
if ($config_importer->alreadyImporting()) {
drupal_set_message($this->t('Another request may be importing configuration already.'), 'error');
}
else{
else {
try {
$sync_steps = $config_importer->initialize();
$batch = [

3
core/modules/config/src/Form/ConfigSync.php
View file

@ -330,7 +330,7 @@ class ConfigSync extends FormBase {
if ($config_importer->alreadyImporting()) {
drupal_set_message($this->t('Another request may be synchronizing configuration already.'));
}
else{
else {
try {
$sync_steps = $config_importer->initialize();
$batch = array(
@ -411,5 +411,4 @@ class ConfigSync extends FormBase {
}
}
}

1
core/modules/config/src/StorageReplaceDataWrapper.php
View file

@ -196,4 +196,5 @@ class StorageReplaceDataWrapper implements StorageInterface {
$this->replacementData[$this->collection][$name] = $data;
return $this;
}
}

3
core/modules/config/src/Tests/ConfigEntityTest.php
View file

@ -195,7 +195,8 @@ class ConfigEntityTest extends WebTestBase {
try {
$same_id->save();
$this->fail('Not possible to overwrite an entity entity.');
} catch (EntityStorageException $e) {
}
catch (EntityStorageException $e) {
$this->pass('Not possible to overwrite an entity entity.');
}

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

@ -226,7 +226,7 @@ class ConfigExportImportUITest extends WebTestBase {
// Export the configuration.
$this->drupalPostForm('admin/config/development/configuration/full/export', array(), 'Export');
$this->tarball = $this->getRawContent();
$filename = file_directory_temp() .'/' . $this->randomMachineName();
$filename = file_directory_temp() . '/' . $this->randomMachineName();
file_put_contents($filename, $this->tarball);
// Set up the active storage collections to test import.

7
core/modules/config/src/Tests/ConfigImportAllTest.php
View file

@ -60,7 +60,7 @@ class ConfigImportAllTest extends ModuleTestBase {
\Drupal::service('module_installer')->install(array_keys($all_modules));
$this->assertModules(array_keys($all_modules), TRUE);
foreach($all_modules as $module => $info) {
foreach ($all_modules as $module => $info) {
$this->assertModuleConfig($module);
$this->assertModuleTablesExist($module);
}
@ -118,7 +118,7 @@ class ConfigImportAllTest extends ModuleTestBase {
\Drupal::service('module_installer')->uninstall(array_keys($modules_to_uninstall));
$this->assertModules(array_keys($modules_to_uninstall), FALSE);
foreach($modules_to_uninstall as $module => $info) {
foreach ($modules_to_uninstall as $module => $info) {
$this->assertNoModuleConfig($module);
$this->assertModuleTablesDoNotExist($module);
}
@ -133,7 +133,7 @@ class ConfigImportAllTest extends ModuleTestBase {
// Check that all modules that were uninstalled are now reinstalled.
$this->assertModules(array_keys($modules_to_uninstall), TRUE);
foreach($modules_to_uninstall as $module => $info) {
foreach ($modules_to_uninstall as $module => $info) {
$this->assertModuleConfig($module);
$this->assertModuleTablesExist($module);
}
@ -157,4 +157,5 @@ class ConfigImportAllTest extends ModuleTestBase {
$this->assertConfigSchema($typed_config, $name, $config->get());
}
}
}

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

@ -49,7 +49,7 @@ class ConfigInstallProfileOverrideTest extends WebTestBase {
// Verify that the original data matches. We have to read the module config
// file directly, because the install profile default system.cron.yml
// configuration file was used to create the active configuration.
$config_dir = drupal_get_path('module', 'system') . '/'. InstallStorage::CONFIG_INSTALL_DIRECTORY;
$config_dir = drupal_get_path('module', 'system') . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY;
$this->assertTrue(is_dir($config_dir));
$source_storage = new FileStorage($config_dir);
$data = $source_storage->read($config_name);

1
core/modules/config/src/Tests/ConfigInstallWebTest.php
View file

@ -187,4 +187,5 @@ class ConfigInstallWebTest extends WebTestBase {
$this->rebuildContainer();
$this->assertTrue(entity_load('config_test', 'other_module_test_with_dependency'), 'The config_test.dynamic.other_module_test_with_dependency configuration has been created during install.');
}
}

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

@ -37,6 +37,16 @@ class ConfigSingleImportExportTest extends WebTestBase {
$uuid = \Drupal::service('uuid');
$this->drupalLogin($this->drupalCreateUser(array('import configuration')));
// Attempt an import with invalid YAML.
$edit = [
'config_type' => 'action',
'import' => '{{{',
];
$this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
$this->assertText('The import failed with the following message: Malformed inline YAML string ({{{) at line 1 (near &quot;{{{&quot;)');
$import = <<<EOD
label: First
weight: 0

1
core/modules/config/tests/config_events_test/src/EventSubscriber.php
View file

@ -54,4 +54,5 @@ class EventSubscriber implements EventSubscriberInterface {
$events[ConfigEvents::RENAME][] = array('configEventRecorder');
return $events;
}
}