pkp/pkp-lib#5122 Support Iterator pattern for DAOResultFactories

ajnyga · Nov 17, 2019 · 9b1a10b · 9b1a10b
1 parent df5422f
commit 9b1a10b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/classes/publication/PublicationDAO.inc.php b/classes/publication/PublicationDAO.inc.php
@@ -22,7 +22,9 @@ class PublicationDAO extends PKPPublicationDAO {
 	 */
 	public function _fromRow($primaryRow) {
 		$publication = parent::_fromRow($primaryRow);
-		$publication->setData('galleys', Services::get('galley')->getMany(['publicationIds' => $publication->getId()]));
+		$publication->setData('galleys', iterator_to_array(
+			Services::get('galley')->getMany(['publicationIds' => $publication->getId()])
+		));
 		return $publication;
 	}
 }
diff --git a/classes/services/GalleyService.inc.php b/classes/services/GalleyService.inc.php
@@ -43,7 +43,7 @@ public function get($galleyId) {
 	 *    @option int count
 	 * 	  @option int offset
 	 * }
-	 * @return array
+	 * @return Iterator
 	 */
 	public function getMany($args = []) {
 		$galleyQB = $this->_getQueryBuilder($args);
@@ -53,7 +53,7 @@ public function getMany($args = []) {
 		$result = $galleyDao->retrieveRange($galleyQO->toSql(), $galleyQO->getBindings(), $range);
 		$queryResults = new DAOResultFactory($result, $galleyDao, '_fromRow');
 
-		return $queryResults->toArray();
+		return $queryResults->toIterator();
 	}
 
 	/**

diff --git a/classes/services/IssueService.inc.php b/classes/services/IssueService.inc.php
@@ -52,7 +52,7 @@ public function get($issueId) {
 	 * 		@option string orderDirection
 	 * }
 	 *
-	 * @return array
+	 * @return Iterator
 	 */
 	public function getMany($args = array()) {
 		$issueListQB = $this->_getQueryBuilder($args);
@@ -62,7 +62,7 @@ public function getMany($args = array()) {
 		$result = $issueDao->retrieveRange($issueListQO->toSql(), $issueListQO->getBindings(), $range);
 		$queryResults = new DAOResultFactory($result, $issueDao, '_fromRow');
 
-		return $queryResults->toArray();
+		return $queryResults->toIterator();
 	}
 
 	/**