Skip to content

Commit ce32aa2

Browse files
committed
fixes zendframework#6812 : Zend\Paginator\Adapter\DbSelect::getItems should return array
1 parent 1e6d321 commit ce32aa2

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

library/Zend/Paginator/Adapter/DbSelect.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,12 @@ public function getItems($offset, $itemCountPerPage)
8787
$resultSet = clone $this->resultSetPrototype;
8888
$resultSet->initialize($result);
8989

90-
return $resultSet;
90+
$items = array();
91+
foreach($resultSet as $key => $result) {
92+
$items[] = $result;
93+
}
94+
95+
return $items;
9196
}
9297

9398
/**

tests/ZendTest/Paginator/Adapter/DbSelectTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function testGetItems()
7474
$this->mockSelect->expects($this->once())->method('limit')->with($this->equalTo(10));
7575
$this->mockSelect->expects($this->once())->method('offset')->with($this->equalTo(2));
7676
$items = $this->dbSelect->getItems(2, 10);
77-
$this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
77+
$this->assertEquals(array(), $items);
7878
}
7979

8080
public function testCount()

tests/ZendTest/Paginator/Adapter/DbTableGatewayTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testGetItems()
6464
->will($this->returnValue($mockResult));
6565

6666
$items = $this->dbTableGateway->getItems(2, 10);
67-
$this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
67+
$this->assertEquals(array(), $items);
6868
}
6969

7070
public function testCount()
@@ -97,7 +97,7 @@ public function testGetItemsWithWhereAndOrder()
9797
->will($this->returnValue($mockResult));
9898

9999
$items = $this->dbTableGateway->getItems(2, 10);
100-
$this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
100+
$this->assertEquals(array(), $items);
101101
}
102102

103103
public function testGetItemsWithWhereAndOrderAndGroup()
@@ -118,7 +118,7 @@ public function testGetItemsWithWhereAndOrderAndGroup()
118118
->will($this->returnValue($mockResult));
119119

120120
$items = $this->dbTableGateway->getItems(2, 10);
121-
$this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
121+
$this->assertEquals(array(), $items);
122122
}
123123

124124
public function testGetItemsWithWhereAndOrderAndGroupAndHaving()
@@ -140,6 +140,6 @@ public function testGetItemsWithWhereAndOrderAndGroupAndHaving()
140140
->will($this->returnValue($mockResult));
141141

142142
$items = $this->dbTableGateway->getItems(2, 10);
143-
$this->assertInstanceOf('Zend\Db\ResultSet\ResultSet', $items);
143+
$this->assertEquals(array(), $items);
144144
}
145145
}

0 commit comments

Comments
 (0)