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

…e_shareEm
zendframework · Apr 25, 2012 · 37055aa · 37055aa
commit 37055aa
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/Exception.php → src/Exception/ExceptionInterface.php b/src/Exception.php → src/Exception/ExceptionInterface.php
@@ -19,7 +19,7 @@
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Uri;
+namespace Zend\Uri\Exception;
 
 /**
  * Exceptions for Zend_Uri
@@ -29,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
+interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -4,5 +4,5 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception
+    implements \Zend\Uri\Exception\ExceptionInterface
 {}
diff --git a/src/Exception/InvalidUriException.php b/src/Exception/InvalidUriException.php
@@ -33,7 +33,7 @@
  */
 class InvalidUriException
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception
+    implements \Zend\Uri\Exception\ExceptionInterface
 {
 
 }
diff --git a/src/Exception/InvalidUriPartException.php b/src/Exception/InvalidUriPartException.php
@@ -4,7 +4,7 @@
 
 class InvalidUriPartException 
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception
+    implements \Zend\Uri\Exception\ExceptionInterface
 {
     /**
      * Part-specific error codes

diff --git a/src/Exception/InvalidUriTypeException.php b/src/Exception/InvalidUriTypeException.php
@@ -33,7 +33,7 @@
  */
 class InvalidUriTypeException
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception
+    implements \Zend\Uri\Exception\ExceptionInterface
 {
 
 }
diff --git a/src/UriFactory.php b/src/UriFactory.php
@@ -37,7 +37,7 @@
  * @uses      \Zend\Uri\Http
  * @uses      \Zend\Uri\File
  * @uses      \Zend\Uri\Mailto
- * @uses      \Zend\Uri\Exception
+ * @uses      \Zend\Uri\Exception\ExceptionInterface
  * @uses      \Zend\Loader
  * @category  Zend
  * @package   Zend_Uri
@@ -61,8 +61,8 @@ abstract class UriFactory
     /**
      * Register a scheme-specific class to be used
      *
-     * @param unknown_type $scheme
-     * @param unknown_type $class
+     * @param string $scheme
+     * @param string $class
      */
     static public function registerScheme($scheme, $class)
     {