projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
modules
/
migrate
/
src
/
Plugin
/
migrate
/
source
/
SourcePluginBase.php
diff --git
a/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
b/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
index 94e5c221a90ce344dd858a66c35504d243fe09c9..8267bac783541046ee7b7aa63cf3a32f1aee34e8 100644
(file)
--- a/
web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/
web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@
-216,8
+216,8
@@
abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
/**
* Initializes the iterator with the source data.
*
/**
* Initializes the iterator with the source data.
*
- * @return
array
- *
An array of the
data for this source.
+ * @return
\Iterator
+ *
Returns an iteratable object of
data for this source.
*/
abstract protected function initializeIterator();
*/
abstract protected function initializeIterator();
@@
-353,7
+353,7
@@
abstract class SourcePluginBase extends PluginBase implements MigrateSourceInter
$row_data = $this->getIterator()->current() + $this->configuration;
$this->fetchNextRow();
$row_data = $this->getIterator()->current() + $this->configuration;
$this->fetchNextRow();
- $row = new Row($row_data, $this->
migration->getSourcePlugin()->getIds(), $this->migration->getDestination
Ids());
+ $row = new Row($row_data, $this->
get
Ids());
// Populate the source key for this row.
$this->currentSourceIds = $row->getSourceIdValues();
// Populate the source key for this row.
$this->currentSourceIds = $row->getSourceIdValues();