Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / migrate / src / Plugin / Migration.php

diff --git a/web/core/modules/migrate/src/Plugin/Migration.php b/web/core/modules/migrate/src/Plugin/Migration.php
index 13092e777585addbc61d68433d40a1eb0c281265..3bbe38ad7425cad92f7d8a57bc5f6913f1fd6483 100644 (file)
--- a/web/core/modules/migrate/src/Plugin/Migration.php
+++ b/web/core/modules/migrate/src/Plugin/Migration.php
@@ -312,6 +312,8 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
    *
    * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.x. Use
    *   more specific getters instead.
+   *
+   * @see https://www.drupal.org/node/2873795
    */
   public function get($property) {
     return isset($this->$property) ? $this->$property : NULL;
@@ -570,7 +572,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
    */
   public function mergeProcessOfProperty($property, array $process_of_property) {
     // If we already have a process value then merge the incoming process array
-    //otherwise simply set it.
+    // otherwise simply set it.
     $current_process = $this->getProcess();
     if (isset($current_process[$property])) {
       $this->process = NestedArray::mergeDeepArray([$current_process, $this->getProcessNormalized([$property => $process_of_property])], TRUE);
@@ -619,7 +621,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
         if ($plugin_configuration['plugin'] == 'migration') {
           $return = array_merge($return, (array) $plugin_configuration['migration']);
         }
-        if ($plugin_configuration['plugin'] == 'iterator') {
+        if ($plugin_configuration['plugin'] == 'sub_process') {
           $return = array_merge($return, $this->findMigrationDependencies($plugin_configuration['process']));
         }
       }