Merge pull request DesignPatternsPHP#123 from ftwbzhao/feature/iterator/booklist/remove

Dominik Liebler · Dominik Liebler · commit 539f6364276e · 2015-03-08T18:06:29.000+01:00
fix booklist remove function
diff --git a/Behavioral/Iterator/BookList.php b/Behavioral/Iterator/BookList.php
@@ -25,7 +25,7 @@ public function addBook(Book $book)
 
     public function removeBook(Book $bookToRemove)
     {
-        foreach ($this as $key => $book) {
+        foreach ($this->books as $key => $book) {
             /** @var Book $book */
             if ($book->getAuthorAndTitle() === $bookToRemove->getAuthorAndTitle()) {
                 unset($this->books[$key]);
diff --git a/Behavioral/Iterator/Tests/IteratorTest.php b/Behavioral/Iterator/Tests/IteratorTest.php
@@ -63,4 +63,13 @@ public function testUseAReverseIteratorAndValidateAuthors($expected)
             $iterator->next();
         }
     }
+
+    /**
+     * Test BookList Remove
+     */
+    public function testBookRemove()
+    {
+        $this->bookList->removeBook($this->bookList->getBook(0));
+        $this->assertEquals($this->bookList->count(), 2);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function addBook(Book $book)`
`25`	`25`
`26`	`26`	`public function removeBook(Book $bookToRemove)`
`27`	`27`	`{`
`28`		`- foreach ($this as $key => $book) {`
	`28`	`+ foreach ($this->books as $key => $book) {`
`29`	`29`	`/** @var Book $book */`
`30`	`30`	`if ($book->getAuthorAndTitle() === $bookToRemove->getAuthorAndTitle()) {`
`31`	`31`	`unset($this->books[$key]);`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,13 @@ public function testUseAReverseIteratorAndValidateAuthors($expected)`
`63`	`63`	`$iterator->next();`
`64`	`64`	`}`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ /**`
	`68`	`+ * Test BookList Remove`
	`69`	`+ */`
	`70`	`+ public function testBookRemove()`
	`71`	`+ {`
	`72`	`+ $this->bookList->removeBook($this->bookList->getBook(0));`
	`73`	`+ $this->assertEquals($this->bookList->count(), 2);`
	`74`	`+ }`
`66`	`75`	`}`