Merge pull request #135 from phpcr/fix-array-search

dbu · dbu · commit 08fd6d839407 · 2014-11-07T17:21:22.000+01:00
fix bug about array_search
diff --git a/src/PHPCR/Util/TreeWalker.php b/src/PHPCR/Util/TreeWalker.php
@@ -63,7 +63,7 @@ public function __construct(ItemVisitorInterface $nodeVisitor, ItemVisitorInterf
      */
     public function addNodeFilter(TreeWalkerFilterInterface $filter)
     {
-        if (!array_search($filter, $this->nodeFilters)) {
+        if (!in_array($filter, $this->nodeFilters)) {
             $this->nodeFilters[] = $filter;
         }
     }
@@ -75,7 +75,7 @@ public function addNodeFilter(TreeWalkerFilterInterface $filter)
      */
     public function addPropertyFilter(TreeWalkerFilterInterface $filter)
     {
-        if (!array_search($filter, $this->propertyFilters)) {
+        if (!in_array($filter, $this->propertyFilters)) {
             $this->propertyFilters[] = $filter;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function __construct(ItemVisitorInterface $nodeVisitor, ItemVisitorInterf`
`63`	`63`	`*/`
`64`	`64`	`public function addNodeFilter(TreeWalkerFilterInterface $filter)`
`65`	`65`	`{`
`66`		`- if (!array_search($filter, $this->nodeFilters)) {`
	`66`	`+ if (!in_array($filter, $this->nodeFilters)) {`
`67`	`67`	`$this->nodeFilters[] = $filter;`
`68`	`68`	`}`
`69`	`69`	`}`
`@@ -75,7 +75,7 @@ public function addNodeFilter(TreeWalkerFilterInterface $filter)`
`75`	`75`	`*/`
`76`	`76`	`public function addPropertyFilter(TreeWalkerFilterInterface $filter)`
`77`	`77`	`{`
`78`		`- if (!array_search($filter, $this->propertyFilters)) {`
	`78`	`+ if (!in_array($filter, $this->propertyFilters)) {`
`79`	`79`	`$this->propertyFilters[] = $filter;`
`80`	`80`	`}`
`81`	`81`	`}`