diff -u b/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php --- b/core/lib/Drupal/Core/Config/StorageComparer.php +++ b/core/lib/Drupal/Core/Config/StorageComparer.php @@ -117,7 +117,7 @@ * @param string $op * The change operation performed. Either delete, create or update. * @param array $changes - * Array of changes to add the changelist. + * Array of changes to add to the changelist. */ protected function addChangeList($op, array $changes) { // Only add changes that aren't already listed. @@ -167,7 +167,7 @@ * * The list of updates is sorted so that dependencies are created before * configuration entities that depend on them. For example, field instances - * should be created after fields. + * should be updated after fields. */ protected function addChangelistUpdate() { foreach (array_intersect($this->sourceNames, $this->targetNames) as $name) { diff -u b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php --- b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php +++ b/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php @@ -140,17 +140,17 @@ unset($target_data['views.view.frontpage']); $this->sourceStorage->expects($this->once()) - ->method('listAll') - ->will($this->returnValue(array_keys($source_data))); + ->method('listAll') + ->will($this->returnValue(array_keys($source_data))); $this->targetStorage->expects($this->once()) - ->method('listAll') - ->will($this->returnValue(array_keys($target_data))); + ->method('listAll') + ->will($this->returnValue(array_keys($target_data))); $this->sourceStorage->expects($this->once()) - ->method('readMultiple') - ->will($this->returnValue($source_data)); + ->method('readMultiple') + ->will($this->returnValue($source_data)); $this->targetStorage->expects($this->once()) - ->method('readMultiple') - ->will($this->returnValue($target_data)); + ->method('readMultiple') + ->will($this->returnValue($target_data)); $this->storageComparer->createChangelist(); $expected = array( @@ -173,17 +173,17 @@ unset($source_data['views.view.frontpage']); $this->sourceStorage->expects($this->once()) - ->method('listAll') - ->will($this->returnValue(array_keys($source_data))); + ->method('listAll') + ->will($this->returnValue(array_keys($source_data))); $this->targetStorage->expects($this->once()) - ->method('listAll') - ->will($this->returnValue(array_keys($target_data))); + ->method('listAll') + ->will($this->returnValue(array_keys($target_data))); $this->sourceStorage->expects($this->once()) - ->method('readMultiple') - ->will($this->returnValue($source_data)); + ->method('readMultiple') + ->will($this->returnValue($source_data)); $this->targetStorage->expects($this->once()) - ->method('readMultiple') - ->will($this->returnValue($target_data)); + ->method('readMultiple') + ->will($this->returnValue($target_data)); $this->storageComparer->createChangelist(); $expected = array( @@ -206,17 +206,17 @@ $source_data['field.field.node.body']['new_config_key'] = 'new data'; $this->sourceStorage->expects($this->once()) - ->method('listAll') - ->will($this->returnValue(array_keys($source_data))); + ->method('listAll') + ->will($this->returnValue(array_keys($source_data))); $this->targetStorage->expects($this->once()) - ->method('listAll') - ->will($this->returnValue(array_keys($target_data))); + ->method('listAll') + ->will($this->returnValue(array_keys($target_data))); $this->sourceStorage->expects($this->once()) - ->method('readMultiple') - ->will($this->returnValue($source_data)); + ->method('readMultiple') + ->will($this->returnValue($source_data)); $this->targetStorage->expects($this->once()) - ->method('readMultiple') - ->will($this->returnValue($target_data)); + ->method('readMultiple') + ->will($this->returnValue($target_data)); $this->storageComparer->createChangelist(); $expected = array(