Merge branch 'hotfix/uri-normalization' of https://github.com/denixpo…

…rt/zf2 into hotfix/uri-normalization

src/Exception/ExceptionInterface.php

@@ -1,33 +1,22 @@
 <?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.
+ * Zend Framework (http://framework.zend.com/)
  *
- * @category  Zend
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
- * @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\Uri\Exception;
 
 /**
- * Exceptions for Zend_Uri
+ * Exception for Zend_Uri
  *
  * @category  Zend
  * @package   Zend_Uri
  * @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 ExceptionInterface
-{}
+{}

src/Exception/InvalidArgumentException.php

@@ -1,8 +1,16 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Uri
+ */
 
 namespace Zend\Uri\Exception;
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception\ExceptionInterface
-{}
+    implements ExceptionInterface
+{}

src/Exception/InvalidUriException.php

@@ -1,39 +1,24 @@
 <?php
-
 /**
- * Zend Framework
- *
- * LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id$
  */
 
 namespace Zend\Uri\Exception;
 
 /**
  * Exceptions for Zend_Uri
  *
- * @uses      \Zend\URI\Exception
  * @category  Zend
  * @package   Zend_Uri
  * @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 InvalidUriException
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception\ExceptionInterface
-{
-
-}
+    implements ExceptionInterface
+{}

src/Exception/InvalidUriPartException.php

@@ -1,10 +1,18 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Uri
+ */
 
 namespace Zend\Uri\Exception;
 
 class InvalidUriPartException 
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception\ExceptionInterface
+    implements ExceptionInterface
 {
     /**
      * Part-specific error codes

src/Exception/InvalidUriTypeException.php

@@ -1,39 +1,24 @@
 <?php
-
 /**
- * Zend Framework
- *
- * LICENSE
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Uri
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
- * @version   $Id$
  */
 
 namespace Zend\Uri\Exception;
 
 /**
  * Exceptions for Zend_Uri
  *
- * @uses      \Zend\URI\Exception
  * @category  Zend
  * @package   Zend_Uri
  * @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 InvalidUriTypeException
     extends \InvalidArgumentException
-    implements \Zend\Uri\Exception\ExceptionInterface
-{
-
-}
+    implements ExceptionInterface
+{}

src/File.php

@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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_Uri
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Uri
  */
 
 namespace Zend\Uri;
@@ -56,7 +46,8 @@ public function isValid()
      * User Info part is not used in file URIs
      *
      * @see    Uri::setUserInfo()
-     * @throws Exception\InvalidUriPartException
+     * @param  string $userInfo
+     * @return File
      */
     public function setUserInfo($userInfo)
     {
@@ -67,7 +58,8 @@ public function setUserInfo($userInfo)
      * Fragment part is not used in file URIs
      *
      * @see    Uri::setFragment()
-     * @throws Exception\InvalidUriPartException
+     * @param  string $fragment
+     * @return File
      */
     public function setFragment($fragment)
     {
@@ -112,4 +104,4 @@ public static function fromWindowsPath($path)
         $url->setPath($path);
         return $url;
     }
-}
+}

src/Http.php

@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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_Uri
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Uri
  */
 
 namespace Zend\Uri;
@@ -187,4 +177,4 @@ public function getPort()
         }
         return $this->port;
     }
-}
+}

src/Mailto.php

@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * 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_Uri
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd     New BSD License
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Uri
  */
 
 namespace Zend\Uri;
@@ -26,7 +16,7 @@
 /**
  * "Mailto" URI handler
  *
- * The 'mailto:...' scheme is loosly defined in RFC-1738
+ * The 'mailto:...' scheme is loosely defined in RFC-1738
  *
  * @category  Zend
  * @package   Zend_Uri
@@ -122,4 +112,4 @@ public function getValidator()
         }
         return $this->emailValidator;
     }
-}
+}