Commit a198ce63 authored by alexpott's avatar alexpott
Browse files

Issue #2388925 by xjm, preshetin: British again invade config sync

parent 6031d0bb
...@@ -560,7 +560,7 @@ protected function processExtensions(array &$context) { ...@@ -560,7 +560,7 @@ protected function processExtensions(array &$context) {
$operation = $this->getNextExtensionOperation(); $operation = $this->getNextExtensionOperation();
if (!empty($operation)) { if (!empty($operation)) {
$this->processExtension($operation['type'], $operation['op'], $operation['name']); $this->processExtension($operation['type'], $operation['op'], $operation['name']);
$context['message'] = t('Synchronising extensions: @op @name.', array('@op' => $operation['op'], '@name' => $operation['name'])); $context['message'] = t('Synchronizing extensions: @op @name.', array('@op' => $operation['op'], '@name' => $operation['name']));
$processed_count = count($this->processedExtensions['module']['install']) + count($this->processedExtensions['module']['uninstall']); $processed_count = count($this->processedExtensions['module']['install']) + count($this->processedExtensions['module']['uninstall']);
$processed_count += count($this->processedExtensions['theme']['uninstall']) + count($this->processedExtensions['theme']['install']); $processed_count += count($this->processedExtensions['theme']['uninstall']) + count($this->processedExtensions['theme']['install']);
$context['finished'] = $processed_count / $this->totalExtensionsToProcess; $context['finished'] = $processed_count / $this->totalExtensionsToProcess;
...@@ -857,8 +857,8 @@ protected function checkOp($collection, $op, $name) { ...@@ -857,8 +857,8 @@ protected function checkOp($collection, $op, $name) {
case 'update': case 'update':
if (!$target_exists) { if (!$target_exists) {
$this->logError($this->t('Update target "@name" is missing.', array('@name' => $name))); $this->logError($this->t('Update target "@name" is missing.', array('@name' => $name)));
// Mark as processed so that the synchronisation continues. Once the // Mark as processed so that the synchronization continues. Once the
// the current synchronisation is complete it will show up as a // the current synchronization is complete it will show up as a
// create. // create.
$this->setProcessedConfiguration($collection, $op, $name); $this->setProcessedConfiguration($collection, $op, $name);
return FALSE; return FALSE;
......
...@@ -304,7 +304,7 @@ public function preSave(EntityStorageInterface $storage) { ...@@ -304,7 +304,7 @@ public function preSave(EntityStorageInterface $storage) {
} }
if (!$this->isSyncing()) { if (!$this->isSyncing()) {
// Ensure the correct dependencies are present. If the configuration is // Ensure the correct dependencies are present. If the configuration is
// being written during a configuration synchronisation then there is no // being written during a configuration synchronization then there is no
// need to recalculate the dependencies. // need to recalculate the dependencies.
$this->calculateDependencies(); $this->calculateDependencies();
} }
......
...@@ -262,7 +262,7 @@ protected function addChangelistUpdate($collection) { ...@@ -262,7 +262,7 @@ protected function addChangelistUpdate($collection) {
if (isset($this->sourceData[$collection][$name]['uuid']) && $this->sourceData[$collection][$name]['uuid'] != $this->targetData[$collection][$name]['uuid']) { if (isset($this->sourceData[$collection][$name]['uuid']) && $this->sourceData[$collection][$name]['uuid'] != $this->targetData[$collection][$name]['uuid']) {
// The entity has the same file as an existing entity but the UUIDs do // The entity has the same file as an existing entity but the UUIDs do
// not match. This means that the entity has been recreated so config // not match. This means that the entity has been recreated so config
// synchronisation should do the same. // synchronization should do the same.
$recreates[] = $name; $recreates[] = $name;
} }
else { else {
......
...@@ -216,7 +216,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) { ...@@ -216,7 +216,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
->setSourceStorage($source_storage); ->setSourceStorage($source_storage);
} }
else { else {
// If we're not in a config synchronisation reset the source storage // If we're not in a config synchronization reset the source storage
// so that the extension install storage will pick up the new // so that the extension install storage will pick up the new
// configuration. // configuration.
$config_installer->resetSourceStorage(); $config_installer->resetSourceStorage();
......
...@@ -353,7 +353,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { ...@@ -353,7 +353,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
* @param \Drupal\Core\Config\ConfigImporter $config_importer * @param \Drupal\Core\Config\ConfigImporter $config_importer
* The batch config importer object to persist. * The batch config importer object to persist.
* @param string $sync_step * @param string $sync_step
* The synchronisation step to do. * The synchronization step to do.
* @param $context * @param $context
* The batch context. * The batch context.
*/ */
...@@ -375,7 +375,7 @@ public static function processBatch(ConfigImporter $config_importer, $sync_step, ...@@ -375,7 +375,7 @@ public static function processBatch(ConfigImporter $config_importer, $sync_step,
/** /**
* Finish batch. * Finish batch.
* *
* This function is a static function to avoid serialising the ConfigSync * This function is a static function to avoid serializing the ConfigSync
* object unnecessarily. * object unnecessarily.
*/ */
public static function finishBatch($success, $results, $operations) { public static function finishBatch($success, $results, $operations) {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
use Drupal\Core\Config\Entity\ConfigEntityInterface; use Drupal\Core\Config\Entity\ConfigEntityInterface;
/** /**
* Provides test assertions for testing config entity synchronisation. * Provides test assertions for testing config entity synchronization.
* *
* Can be used by test classes that extend \Drupal\simpletest\WebTestBase or * Can be used by test classes that extend \Drupal\simpletest\WebTestBase or
* \Drupal\simpletest\KernelTestBase. * \Drupal\simpletest\KernelTestBase.
......
...@@ -35,7 +35,7 @@ public function testConfigOverrideImport() { ...@@ -35,7 +35,7 @@ public function testConfigOverrideImport() {
// Uninstall the language module and its dependencies so we can test // Uninstall the language module and its dependencies so we can test
// enabling the language module and creating overrides at the same time // enabling the language module and creating overrides at the same time
// during a configuration synchronisation. // during a configuration synchronization.
\Drupal::service('module_installer')->uninstall(array('language')); \Drupal::service('module_installer')->uninstall(array('language'));
// Ensure that the current site has no overrides registered to the // Ensure that the current site has no overrides registered to the
// ConfigFactory. // ConfigFactory.
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
use Drupal\simpletest\WebTestBase; use Drupal\simpletest\WebTestBase;
/** /**
* Tests importing renamed node type via configuration synchronisation. * Tests importing renamed node type via configuration synchronization.
* *
* @group node * @group node
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment