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

…e_interfaces
zendframework · May 31, 2012 · 51e106e · 51e106e
commit 51e106e
Show file tree

Hide file tree

Showing 6 changed files with 17 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/Adapter/Exception/InvalidArgumentException.php b/src/Adapter/Exception/InvalidArgumentException.php
@@ -10,14 +10,15 @@
 
 namespace Zend\Paginator\Adapter\Exception;
 
+use Zend\Paginator\Exception;
+
 /**
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException
-    extends \Zend\Paginator\Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+    ExceptionInterface
 {}
diff --git a/src/Adapter/Exception/RuntimeException.php b/src/Adapter/Exception/RuntimeException.php
@@ -10,14 +10,15 @@
 
 namespace Zend\Paginator\Adapter\Exception;
 
+use Zend\Paginator\Exception;
+
 /**
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException
-    extends \Zend\Paginator\Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements 
+    ExceptionInterface
 {}
diff --git a/src/Adapter/Exception/UnexpectedValueException.php b/src/Adapter/Exception/UnexpectedValueException.php
@@ -10,14 +10,15 @@
 
 namespace Zend\Paginator\Adapter\Exception;
 
+use Zend\Paginator\Exception;
+
 /**
  * @category   Zend
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class UnexpectedValueException
-    extends \Zend\Paginator\Exception\UnexpectedValueException
-    implements ExceptionInterface
+class UnexpectedValueException extends Exception\UnexpectedValueException implements 
+    ExceptionInterface
 {}