Merge branch 'master' of https://github.com/zendframework/zf2 into qu…

…ickfix/sharedem-type-preference
zendframework · May 10, 2012 · 9b1ac2d · 9b1ac2d
commit 9b1ac2d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -8,7 +8,7 @@ for tested in "${testedcomponents[@]}"
     do
         echo "$tested:"
         phpunit -c $testdir/phpunit.xml $testdir/$tested
-        let "result = $result || $?"
+        result=$(($result || $?))
 done
 
-exit $result
+exit $result
diff --git a/.travis/tested-components b/.travis/tested-components
@@ -10,7 +10,7 @@ Zend/Crypt
 Zend/Currency
 Zend/Db
 Zend/Di
-Zend/Docbook
+Zend/DocBook
 Zend/Dojo
 Zend/Dom
 Zend/EventManager

diff --git a/src/Paginator.php b/src/Paginator.php
@@ -21,7 +21,7 @@
     Zend\Db\Table\AbstractRowset as DbAbstractRowset,
     Zend\Db\Table\Select as DbTableSelect,
     Zend\Db\Sql,
-    Zend\Filter\Filter,
+    Zend\Filter\FilterInterface,
     Zend\Json\Json,
     Zend\Stdlib\ArrayUtils,
     Zend\View;
@@ -127,7 +127,7 @@ class Paginator implements Countable, IteratorAggregate
     /**
      * Result filter
      *
-     * @var Filter
+     * @var FilterInterface
      */
     protected $_filter = null;
 
@@ -573,7 +573,7 @@ public function setCurrentPageNumber($pageNumber)
     /**
      * Get the filter
      *
-     * @return Filter
+     * @return FilterInterface
      */
     public function getFilter()
     {
@@ -583,10 +583,10 @@ public function getFilter()
     /**
      * Set a filter chain
      *
-     * @param  Filter $filter
+     * @param  FilterInterface $filter
      * @return Paginator
      */
-    public function setFilter(Filter $filter)
+    public function setFilter(FilterInterface $filter)
     {
         $this->_filter = $filter;