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

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

Hide file tree

Showing 4 changed files with 9 additions and 9 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/Definition/Annotation/Inject.php b/src/Definition/Annotation/Inject.php
@@ -2,9 +2,9 @@
 
 namespace Zend\Di\Definition\Annotation;
 
-use Zend\Code\Annotation\Annotation;
+use Zend\Code\Annotation\AnnotationInterface;
 
-class Inject implements Annotation
+class Inject implements AnnotationInterface
 {
 
     protected $content = null;
@@ -13,4 +13,4 @@ public function initialize($content)
     {
         $this->content = $content;
     }
-}
+}
diff --git a/src/Definition/Annotation/Instantiator.php b/src/Definition/Annotation/Instantiator.php
@@ -2,9 +2,9 @@
 
 namespace Zend\Di\Definition\Annotation;
 
-use Zend\Code\Annotation\Annotation;
+use Zend\Code\Annotation\AnnotationInterface;
 
-class Instantiator implements Annotation
+class Instantiator implements AnnotationInterface
 {
 
     protected $content = null;
@@ -13,4 +13,4 @@ public function initialize($content)
     {
         $this->content = $content;
     }
-}
+}