Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_interfaces
zendframework · May 31, 2012 · 5b6a369 · 5b6a369
commit 5b6a369
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-travisdir=$(dirname $(readlink /proc/$$/fd/255))
+travisdir=$(dirname "$0")
 testdir="$travisdir/../tests"
 testedcomponents=(`cat "$travisdir/tested-components"`)
 result=0

diff --git a/.travis/skipped-components b/.travis/skipped-components
@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

diff --git a/.travis/tested-components b/.travis/tested-components
@@ -22,17 +22,19 @@ Zend/Form
 Zend/GData
 Zend/Http
 Zend/InfoCard
+Zend/InputFilter
 Zend/Json
 Zend/Ldap
 Zend/Loader
 Zend/Locale
 Zend/Log
 Zend/Mail
 Zend/Markup
+Zend/Math
 Zend/Measure
 Zend/Memory
 Zend/Mime
-Zend/Module
+Zend/ModuleManager
 Zend/Mvc
 Zend/Navigation
 Zend/OAuth

diff --git a/src/Cloud/Decorator/Exception/ExceptionInterface.php b/src/Cloud/Decorator/Exception/ExceptionInterface.php
@@ -21,6 +21,8 @@
 
 namespace Zend\Tag\Cloud\Decorator\Exception;
 
+use Zend\Tag\Exception\ExceptionInterface as Exception;
+
 /**
  * Exception class for Zend_Tag_Cloud_Decorator
  *
@@ -29,6 +31,5 @@
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface ExceptionInterface extends \Zend\Tag\Exception\ExceptionInterface
-{
-}
+interface ExceptionInterface extends Exception
+{}
diff --git a/src/Cloud/Decorator/Exception/InvalidArgumentException.php b/src/Cloud/Decorator/Exception/InvalidArgumentException.php
@@ -1,7 +1,10 @@
 <?php
+
 namespace Zend\Tag\Cloud\Decorator\Exception;
 
+use Zend\Tag\Exception;
+
 class InvalidArgumentException
-    extends \InvalidArgumentException
+    extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{} 
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -3,5 +3,5 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Tag\Exception\ExceptionInterface
-{}
+    implements ExceptionInterface
+{}
diff --git a/src/Exception/OutOfBoundsException.php b/src/Exception/OutOfBoundsException.php
@@ -3,5 +3,5 @@
 
 class OutOfBoundsException
     extends \OutOfBoundsException
-    implements \Zend\Tag\Exception\ExceptionInterface
-{}
+    implements ExceptionInterface
+{}