Skip to content

Commit 6bf4a0b

Browse files
committed
fixed naming bug + PHP 5.3 issue
1 parent 55999d8 commit 6bf4a0b

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

lib/Elastica/Scroll.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Scroll implements \Iterator
1414
/**
1515
* @var string
1616
*/
17-
public $_expiryTime;
17+
public $expiryTime;
1818

1919
/**
2020
* @var Search

test/lib/Elastica/Test/ScrollTest.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,24 @@ public function testForeach()
2222
foreach ($scroll as $scrollId => $resultSet) {
2323
$this->assertNotEmpty($scrollId);
2424

25+
$results = $resultSet->getResults();
2526
switch (true) {
2627
case $count === 1:
2728
// hits: 1 - 5
2829
$this->assertEquals(5, $resultSet->count());
29-
$this->assertEquals('1', $resultSet->getResults()[0]->getId());
30-
$this->assertEquals('5', $resultSet->getResults()[4]->getId());
30+
$this->assertEquals('1', $results[0]->getId());
31+
$this->assertEquals('5', $results[4]->getId());
3132
break;
3233
case $count === 2:
3334
// hits: 6 - 10
3435
$this->assertEquals(5, $resultSet->count());
35-
$this->assertEquals('6', $resultSet->getResults()[0]->getId());
36-
$this->assertEquals('10', $resultSet->getResults()[4]->getId());
36+
$this->assertEquals('6', $results[0]->getId());
37+
$this->assertEquals('10', $results[4]->getId());
3738
break;
3839
case $count === 3:
3940
// hit: 11
4041
$this->assertEquals(1, $resultSet->count());
41-
$this->assertEquals('11', $resultSet->getResults()[0]->getId());
42+
$this->assertEquals('11', $results[0]->getId());
4243
break;
4344
case $count === 4:
4445
$this->assertEquals(0, $resultSet->count());

0 commit comments

Comments
 (0)