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

…e_interfaces

.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

.travis/skipped-components

@@ -1,5 +1,6 @@
 Zend/Amf
 Zend/Date
+Zend/Dojo
 Zend/Queue
 Zend/Service
 Zend/Test

.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

src/Exception/InvalidArgumentException.php

@@ -24,7 +24,6 @@
 /**
  * @category   Zend
  * @package    Zend_Text
- * @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
  */

src/Exception/OutOfBoundsException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Zend\Text\Exception;
+
+use Zend\Text\Exception;
+
+class OutOfBoundsException 
+    extends \OutOfBoundsException
+    implements ExceptionInterface
+{}

src/Exception/OverflowException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Zend\Text\Exception;
+
+use Zend\Text\Exception;
+
+class OverflowException
+    extends \OverflowException
+    implements ExceptionInterface
+{}

src/Exception/RuntimeException.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Text
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Text\Exception;
+
+/**
+ * @category  Zend
+ * @package   Zend_Text
+ * @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 \RuntimeException
+    implements ExceptionInterface
+{}

src/Exception/UnexpectedValueException.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category  Zend
+ * @package   Zend_Text
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+namespace Zend\Text\Exception;
+
+/**
+ * @category  Zend
+ * @package   Zend_Text
+ * @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 \UnexpectedValueException
+    implements ExceptionInterface
+{
+}

src/Figlet/Exception/InvalidArgumentException.php

@@ -21,16 +21,17 @@
 
 namespace Zend\Text\Figlet\Exception;
 
+use Zend\Text\Exception;
+
 /**
- * Exception class for Zend_Figlet
+ * Exception class for Zend_Text
  *
  * @category  Zend
- * @package   Zend_Text_Figlet
+ * @package   Zend_Text
  * @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 \InvalidArgumentException
+    extends Exception\InvalidArgumentException
     implements ExceptionInterface
-{
-}
+{}

src/Figlet/Exception/RuntimeException.php

@@ -20,16 +20,17 @@
 
 namespace Zend\Text\Figlet\Exception;
 
+use Zend\Text\Exception;
+
 /**
- * Exception class for Zend_Figlet
+ * Exception class for Zend_Text
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
  * @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 \RuntimeException
+    extends Exception\RuntimeException
     implements ExceptionInterface
-{
-}
+{}

src/Figlet/Exception/UnexpectedValueException.php

@@ -20,16 +20,17 @@
 
 namespace Zend\Text\Figlet\Exception;
 
+use Zend\Text\Exception;
+
 /**
- * Exception class for Zend_Figlet
+ * Exception class for Zend_Text
  *
  * @category  Zend
  * @package   Zend_Text_Figlet
  * @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 \UnexpectedValueException
+    extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{
-}
+{}

src/Table/Exception/OutOfBoundsException.php

@@ -1,8 +1,10 @@
 <?php
+
 namespace Zend\Text\Table\Exception;
 
+use Zend\Text\Exception;
+
 class OutOfBoundsException 
-    extends \OutOfBoundsException
+    extends Exception\OutOfBoundsException
     implements ExceptionInterface
-{
-}
+{}

src/Table/Exception/OverflowException.php

@@ -1,8 +1,10 @@
 <?php
+
 namespace Zend\Text\Table\Exception;
 
+use Zend\Text\Exception;
+
 class OverflowException
-    extends \OverflowException
+    extends Exception\OverflowException
     implements ExceptionInterface
-{
-}
+{}

src/Table/Exception/UnexpectedValueException.php

@@ -1,8 +1,10 @@
 <?php
+
 namespace Zend\Text\Table\Exception;
 
+use Zend\Text\Exception;
+
 class UnexpectedValueException
-    extends \UnexpectedValueException
+    extends Exception\UnexpectedValueException
     implements ExceptionInterface
-{
-}
+{}