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

…e_plugin_priority Conflicts: library/Zend/Cache/Storage/Adapter/AbstractAdapter.php library/Zend/Cache/Storage/Plugin/ClearByFactor.php library/Zend/Cache/Storage/Plugin/ExceptionHandler.php library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php library/Zend/Cache/Storage/Plugin/Serializer.php
zendframework · May 7, 2012 · b50b4db · b50b4db
commit b50b4db
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 171 deletions.
diff --git a/src/Exception.php b/src/Exception.php
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -0,0 +1,22 @@
+<?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;
+
+/**
+ * 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
+{}
diff --git a/src/Exception/InvalidArgumentException.php b/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
-{}
+    implements ExceptionInterface
+{}
diff --git a/src/Exception/InvalidUriException.php b/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
-{
-
-}
+    implements ExceptionInterface
+{}
diff --git a/src/Exception/InvalidUriPartException.php b/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
+    implements ExceptionInterface
 {
     /**
      * Part-specific error codes

diff --git a/src/Exception/InvalidUriTypeException.php b/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
-{
-
-}
+    implements ExceptionInterface
+{}
diff --git a/src/File.php b/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;
     }
-}
+}
diff --git a/src/Http.php b/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;
     }
-}
+}
diff --git a/src/Mailto.php b/src/Mailto.php
@@ -1,32 +1,22 @@
 <?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;
 
-use Zend\Validator\Validator,
+use Zend\Validator\ValidatorInterface,
     Zend\Validator\EmailAddress as EmailValidator;
 
 /**
  * "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
@@ -39,7 +29,7 @@ class Mailto extends Uri
 
     /**
      * Validator for use when validating email address
-     * @var Validator
+     * @var ValidatorInterface
      */
     protected $emailValidator;
 
@@ -101,7 +91,7 @@ public function getEmail()
      * @param  Validator $validator
      * @return Mailto
      */
-    public function setValidator(Validator $validator)
+    public function setValidator(ValidatorInterface $validator)
     {
         $this->emailValidator = $validator;
         return $this;