Merge remote-tracking branch 'prolic/json-renamed-interfaces'

zendframework · May 15, 2012 · 6c3029f · 6c3029f
2 parents a6db686 + 9477a03
commit 6c3029f
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 15 deletions.
diff --git a/library/Zend/Json/Exception.php → ...end/Json/Exception/ExceptionInterface.php b/library/Zend/Json/Exception.php → ...end/Json/Exception/ExceptionInterface.php
@@ -18,13 +18,13 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Json;
+namespace Zend\Json\Exception;
 
 /**
  * @category   Zend
  * @package    Zend_Json
  * @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 Exception
+interface ExceptionInterface
 {}
diff --git a/library/Zend/Json/Exception/InvalidArgumentException.php b/library/Zend/Json/Exception/InvalidArgumentException.php
@@ -26,5 +26,7 @@
  * @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 implements \Zend\Json\Exception
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
 {}
diff --git a/library/Zend/Json/Exception/RuntimeException.php b/library/Zend/Json/Exception/RuntimeException.php
@@ -26,5 +26,7 @@
  * @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 \Zend\Json\Exception
+class RuntimeException
+    extends \RuntimeException
+    implements ExceptionInterface
 {}
diff --git a/library/Zend/Json/Server/Exception/ErrorException.php b/library/Zend/Json/Server/Exception/ErrorException.php
@@ -21,8 +21,7 @@
 
 namespace Zend\Json\Server\Exception;
 
-use BadMethodCallException,
-    Zend\Json\Server\Exception;
+use BadMethodCallException;
 
 /**
  * Thrown by Zend\Json\Server\Client when an JSON-RPC fault response is returned.
@@ -35,5 +34,5 @@
  */
 class ErrorException
     extends BadMethodCallException
-    implements Exception
+    implements ExceptionInterface
 {}
diff --git a/library/Zend/Json/Server/Exception.php → ...n/Server/Exception/ExceptionInterface.php b/library/Zend/Json/Server/Exception.php → ...n/Server/Exception/ExceptionInterface.php
@@ -18,7 +18,9 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Json\Server;
+namespace Zend\Json\Server\Exception;
+
+use Zend\Json\Exception\ExceptionInterface as Exception;
 
 /**
  * @category   Zend
@@ -27,5 +29,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 Exception extends \Zend\Json\Exception
+interface ExceptionInterface extends Exception
 {}
diff --git a/library/Zend/Json/Server/Exception/InvalidArgumentException.php b/library/Zend/Json/Server/Exception/InvalidArgumentException.php
@@ -20,12 +20,16 @@
 
 namespace Zend\Json\Server\Exception;
 
+use Zend\Json\Exception;
+
 /**
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
  * @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 implements \Zend\Json\Server\Exception
+class InvalidArgumentException
+    extends Exception\InvalidArgumentException
+    implements ExceptionInterface
 {}
diff --git a/library/Zend/Json/Server/Exception/RuntimeException.php b/library/Zend/Json/Server/Exception/RuntimeException.php
@@ -20,12 +20,16 @@
 
 namespace Zend\Json\Server\Exception;
 
+use Zend\Json\Exception;
+
 /**
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
  * @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 \Zend\Json\Server\Exception
+class RuntimeException
+    extends Exception\RuntimeException
+    implements ExceptionInterface
 {}
diff --git a/library/Zend/Locale/Exception/InvalidArgumentException.php b/library/Zend/Locale/Exception/InvalidArgumentException.php
@@ -3,5 +3,5 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Locale\Exception
+    implements ExceptionInterface
 {}
diff --git a/library/Zend/Locale/Exception/MathException.php b/library/Zend/Locale/Exception/MathException.php
@@ -28,7 +28,7 @@
  */
 class MathException 
     extends \LogicException
-    implements \Zend\Locale\Exception
+    implements ExceptionInterface
 {
     protected $op1 = null;
     protected $op2 = null;

diff --git a/library/Zend/Locale/Exception/UnexpectedValueException.php b/library/Zend/Locale/Exception/UnexpectedValueException.php
@@ -3,5 +3,5 @@
 
 class UnexpectedValueException
     extends \UnexpectedValueException
-    implements \Zend\Locale\Exception
+    implements ExceptionInterface
 {}
diff --git a/library/Zend/Locale/Exception/UnsupportedTokenException.php b/library/Zend/Locale/Exception/UnsupportedTokenException.php
@@ -3,5 +3,5 @@
 
 class UnsupportedMethod
     extends \RuntimeException
-    implements \Zend\Locale\Exception
+    implements ExceptionInterface
 {}