Issue #2012566 by clemens.tolboom, Luka Zitnik: Naming confusion between...

Issue #2012566 by clemens.tolboom, Luka Zitnik: Naming confusion between config_comparer and storage_comparer in config.admin.inc and other places.

core/modules/config/lib/Drupal/config/Form/ConfigSync.php

@@ -149,8 +149,8 @@ public function buildForm(array $form, array &$form_state) {
     );
 
     $source_list = $this->sourceStorage->listAll();
-    $config_comparer = new StorageComparer($this->sourceStorage, $this->targetStorage);
-    if (empty($source_list) || !$config_comparer->createChangelist()->hasChanges()) {
+    $storage_comparer = new StorageComparer($this->sourceStorage, $this->targetStorage);
+    if (empty($source_list) || !$storage_comparer->createChangelist()->hasChanges()) {
       $form['no_changes'] = array(
         '#theme' => 'table',
         '#header' => array('Name', 'Operations'),
@@ -162,13 +162,13 @@ public function buildForm(array $form, array &$form_state) {
     }
     else {
       // Store the comparer for use in the submit.
-      $form_state['storage_comparer'] = $config_comparer;
+      $form_state['storage_comparer'] = $storage_comparer;
     }
 
     // Add the AJAX library to the form for dialog support.
     $form['#attached']['library'][] = array('system', 'drupal.ajax');
 
-    foreach ($config_comparer->getChangelist() as $config_change_type => $config_files) {
+    foreach ($storage_comparer->getChangelist() as $config_change_type => $config_files) {
       if (empty($config_files)) {
         continue;
       }

core/modules/config/lib/Drupal/config/Tests/ConfigImporterTest.php

@@ -51,12 +51,12 @@ function setUp() {
     unset($GLOBALS['hook_config_test']);
 
     // Set up the ConfigImporter object for testing.
-    $config_comparer = new StorageComparer(
+    $storage_comparer = new StorageComparer(
       $this->container->get('config.storage.staging'),
       $this->container->get('config.storage')
     );
     $this->configImporter = new ConfigImporter(
-      $config_comparer->createChangelist(),
+      $storage_comparer->createChangelist(),
       $this->container->get('event_dispatcher'),
       $this->container->get('config.factory'),
       $this->container->get('entity.manager'),

core/modules/simpletest/lib/Drupal/simpletest/TestBase.php

@@ -1390,12 +1390,12 @@ public static function filePreDeleteCallback($path) {
   public function configImporter() {
     if (!$this->configImporter) {
       // Set up the ConfigImporter object for testing.
-      $config_comparer = new StorageComparer(
+      $storage_comparer = new StorageComparer(
         $this->container->get('config.storage.staging'),
         $this->container->get('config.storage')
       );
       $this->configImporter = new ConfigImporter(
-        $config_comparer,
+        $storage_comparer,
         $this->container->get('event_dispatcher'),
         $this->container->get('config.factory'),
         $this->container->get('entity.manager'),