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

…e_interfaces
zendframework · May 31, 2012 · 547a1fc · 547a1fc
commit 547a1fc
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 15 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/Exception.php b/src/Exception.php
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -0,0 +1,5 @@
+<?php
+namespace Zend\Test\Exception;
+
+interface ExceptionInterface
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Zend\Test\Exception;
+
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
+{}
diff --git a/src/PHPUnit/Exception.php b/src/PHPUnit/Exception.php
diff --git a/src/PHPUnit/Exception/ExceptionInterface.php b/src/PHPUnit/Exception/ExceptionInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Zend\Test\PHPUnit\Exception;
+
+use Zend\Test\Exception\ExceptionInterface as Exception;
+
+interface ExceptionInterface extends Exception
+{}
diff --git a/src/PHPUnit/Exception/InvalidArgumentException.php b/src/PHPUnit/Exception/InvalidArgumentException.php
@@ -1,7 +1,10 @@
 <?php
+
 namespace Zend\Test\PHPUnit\Exception;
 
+use Zend\Test\Exception;
+
 class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements \Zend\Test\PHPUnit\Exception
-{}
+    extends Exception\InvalidArgumentException
+    implements ExceptionInterface
+{}