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

…e_interfaces
zendframework · May 31, 2012 · 71ea52c · 71ea52c
commit 71ea52c
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 19 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/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -5,5 +5,4 @@
 class BadMethodCallException
     extends \BadMethodCallException
     implements ExceptionInterface
-{
-}
+{}
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -29,5 +29,4 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ExceptionInterface
-{
-}
+{}
diff --git a/src/Exception/ExceptionNotLoadedException.php b/src/Exception/ExceptionNotLoadedException.php
@@ -2,8 +2,5 @@
 
 namespace Zend\Soap\Exception;
 
-class ExtensionNotLoadedException
-    extends \RuntimeException
-    implements ExceptionInterface
-{
-}
+class ExtensionNotLoadedException extends RuntimeException
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,5 +5,4 @@
 class InvalidArgumentException
     extends \InvalidArgumentException
     implements ExceptionInterface
-{
-}
+{}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,6 +5,4 @@
 class RuntimeException
     extends \RuntimeException
     implements ExceptionInterface
-{
-
-}
+{}
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
@@ -5,6 +5,4 @@
 class UnexpectedValueException
     extends \UnexpectedValueException
     implements ExceptionInterface
-{
-
-}
+{}
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,4 @@ @@
      * @license    http://framework.zend.com/license/new-bsd     New BSD License
      */
     interface ExceptionInterface
-    {
-    }
+    {}