diff modules/contrib/migrate_plus/src/DataParserPluginBase.php @ 4:a9cd425dd02b

Update, including to Drupal core 8.6.10

--- a/modules/contrib/migrate_plus/src/DataParserPluginBase.php	Thu Feb 28 11:14:44 2019 +0000
+++ b/modules/contrib/migrate_plus/src/DataParserPluginBase.php	Thu Feb 28 13:11:55 2019 +0000
@@ -73,7 +73,6 @@
     return new static($configuration, $plugin_id, $plugin_definition);
   }
 
-
   /**
    * Returns the initialized data fetcher plugin.
    *
@@ -111,8 +110,11 @@
     $this->fetchNextRow();
     // If there was no valid row there, try the next url (if any).
     if (is_null($this->currentItem)) {
-      if ($this->nextSource()) {
+      while ($this->nextSource()) {
         $this->fetchNextRow();
+        if ($this->valid()) {
+          break;
+        }
       }
     }
     if ($this->valid()) {
@@ -125,7 +127,7 @@
   /**
    * Opens the specified URL.
    *
-   * @param $url
+   * @param string $url
    *   URL to open.
    *
    * @return bool
@@ -134,8 +136,9 @@
   abstract protected function openSourceUrl($url);
 
   /**
-   * Retrieves the next row of data from the open source URL, populating
-   * currentItem.
+   * Retrieves the next row of data. populating currentItem.
+   *
+   * Retrieves from the open source URL.
    */
   abstract protected function fetchNextRow();