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

…ickfix/sharedem-type-preference
zendframework · May 10, 2012 · 2003fce · 2003fce
commit 2003fce
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/Processor/Filter.php b/src/Processor/Filter.php
@@ -23,7 +23,7 @@
 use Zend\Config\Config,
     Zend\Config\Processor,
     Zend\Config\Exception,
-    Zend\Filter\Filter as ZendFilter,
+    Zend\Filter\FilterInterface as ZendFilter,
     \Traversable,
     \ArrayObject;
 
@@ -36,14 +36,14 @@
 class Filter implements Processor
 {
     /**
-     * @var \Zend\Filter\Filter
+     * @var \Zend\Filter\FilterInterface
      */
     protected $filter;
 
     /**
      * Filter all config values using the supplied Zend\Filter
      *
-     * @param \Zend\Filter\Filter $filter
+     * @param \Zend\Filter\FilterInterface $filter
      * @return \Zend\Config\Processor\Filter
      */
     public function __construct(ZendFilter $filter)
@@ -52,15 +52,15 @@ public function __construct(ZendFilter $filter)
     }
 
     /**
-     * @return \Zend\Filter\Filter
+     * @return \Zend\Filter\FilterInterface
      */
     public function getFilter()
     {
         return $this->filter;
     }
 
     /**
-     * @param \Zend\Filter\Filter $filter
+     * @param \Zend\Filter\FilterInterface $filter
      */
     public function setFilter(ZendFilter $filter)
     {