info/DesignPatternsPHP
1
0
Fork 0
mirror of https://github.com/DesignPatternsPHP/DesignPatternsPHP.git synced 2025-07-26 17:50:11 +02:00
Code Issues Projects Releases Wiki Activity

Changes to take care of unwanted (negative) indices

Browse Source
This commit is contained in:
Nils Rückmann
2015-09-07 02:17:17 +02:00
parent 367e5c0a20
commit c6f9dccff1
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Behavioral/Iterator/BookList.php
View File

@@ -9,7 +9,7 @@ class BookList implements \Countable
public function getBook($bookNumberToGet) public function getBook($bookNumberToGet)
{ {
if ((int)$bookNumberToGet <= $this->count()) { if (isset($this->books[$bookNumberToGet])) {
return $this->books[$bookNumberToGet]; return $this->books[$bookNumberToGet];
} }

2
Behavioral/Iterator/BookListIterator.php
View File

@@ -61,7 +61,7 @@ class BookListIterator implements \Iterator
*/ */
public function valid() public function valid()
{ {
return $this->currentBook < $this->bookList->count(); return null !== $this->bookList->getBook($this->currentBook);
} }
/** /**

11
Behavioral/Iterator/BookListReverseIterator.php
View File

@@ -11,13 +11,14 @@ class BookListReverseIterator extends BookListIterator
$this->currentBook = $this->bookList->count() - 1; $this->currentBook = $this->bookList->count() - 1;
} }
/**
* (PHP 5 &gt;= 5.0.0)<br/>
* Move forward to next element
* @link http://php.net/manual/en/iterator.next.php
* @return void Any returned value is ignored.
*/
public function next() public function next()
{ {
$this->currentBook--; $this->currentBook--;
} }
public function valid()
{
return 0 <= $this->currentBook;
}
} }