Merge branch 'feature/docblock-simplification' into develop

zendframework · Jan 21, 2013 · c100a2a · c100a2a
3 parents 5537924 + de5b7ca + 7725142
commit c100a2a
Show file tree

Hide file tree

Showing 81 changed files with 0 additions and 378 deletions.
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Exception;
 
 /**
  * Bad method call exception
- *
- * @category   Zend
- * @package    Zend_View
  */
 class BadMethodCallException
     extends \BadMethodCallException

diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Exception;
 
 /**
  * Domain exception
- *
- * @category   Zend
- * @package    Zend_View
  */
 class DomainException
     extends \DomainException

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,14 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_View
- */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Exception;
 
 /**
  * Invalid argument exception
- *
- * @category   Zend
- * @package    Zend_View
  */
 class InvalidArgumentException
     extends \InvalidArgumentException

diff --git a/src/Exception/InvalidHelperException.php b/src/Exception/InvalidHelperException.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Exception;
 
 /**
  * Invalid helper exception
- *
- * @category   Zend
- * @package    Zend_View
  */
 class InvalidHelperException
     extends \Exception

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Exception;
 
 /**
  * Runtime exception
- *
- * @category   Zend
- * @package    Zend_View
  */
 class RuntimeException
     extends \RuntimeException

diff --git a/src/Helper/AbstractHelper.php b/src/Helper/AbstractHelper.php
@@ -5,19 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
 
 use Zend\View\Helper\HelperInterface;
 use Zend\View\Renderer\RendererInterface as Renderer;
 
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- */
 abstract class AbstractHelper implements HelperInterface
 {
     /**

diff --git a/src/Helper/AbstractHtmlElement.php b/src/Helper/AbstractHtmlElement.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
 
-/**
- * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
- */
 abstract class AbstractHtmlElement extends AbstractHelper
 {
     /**

diff --git a/src/Helper/BasePath.php b/src/Helper/BasePath.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -14,9 +13,6 @@
 
 /**
  * Helper for retrieving the base path.
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class BasePath extends AbstractHelper
 {

diff --git a/src/Helper/Cycle.php b/src/Helper/Cycle.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
 
 /**
  * Helper for alternating between set of values
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class Cycle extends AbstractHelper implements \Iterator
 {

diff --git a/src/Helper/DeclareVars.php b/src/Helper/DeclareVars.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
 
 /**
  * Helper for declaring default values of template variables
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class DeclareVars extends AbstractHelper
 {

diff --git a/src/Helper/Doctype.php b/src/Helper/Doctype.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -15,9 +14,6 @@
 
 /**
  * Helper for setting and retrieving the doctype
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class Doctype extends AbstractHelper
 {

diff --git a/src/Helper/EscapeCss.php b/src/Helper/EscapeCss.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -14,9 +13,6 @@
 
 /**
  * Helper for escaping values
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class EscapeCss extends Escaper\AbstractHelper
 {

diff --git a/src/Helper/EscapeHtml.php b/src/Helper/EscapeHtml.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -14,9 +13,6 @@
 
 /**
  * Helper for escaping values
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class EscapeHtml extends Escaper\AbstractHelper
 {

diff --git a/src/Helper/EscapeHtmlAttr.php b/src/Helper/EscapeHtmlAttr.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -14,9 +13,6 @@
 
 /**
  * Helper for escaping values
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class EscapeHtmlAttr extends Escaper\AbstractHelper
 {

diff --git a/src/Helper/EscapeJs.php b/src/Helper/EscapeJs.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -14,9 +13,6 @@
 
 /**
  * Helper for escaping values
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class EscapeJs extends Escaper\AbstractHelper
 {

diff --git a/src/Helper/EscapeUrl.php b/src/Helper/EscapeUrl.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -14,9 +13,6 @@
 
 /**
  * Helper for escaping values
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class EscapeUrl extends Escaper\AbstractHelper
 {

diff --git a/src/Helper/Escaper/AbstractHelper.php b/src/Helper/Escaper/AbstractHelper.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper\Escaper;
@@ -16,9 +15,6 @@
 
 /**
  * Helper for escaping values
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 abstract class AbstractHelper extends Helper\AbstractHelper
 {

diff --git a/src/Helper/FlashMessenger.php b/src/Helper/FlashMessenger.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -18,9 +17,6 @@
 
 /**
  * Helper to proxy the plugin flash messenger
- *
- * @package    Zend_View
- * @subpackage Helper
  */
 class FlashMessenger extends AbstractHelper implements ServiceLocatorAwareInterface
 {

diff --git a/src/Helper/Gravatar.php b/src/Helper/Gravatar.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -14,9 +13,6 @@
 
 /**
  * Helper for retrieving avatars from gravatar.com
- *
- * @package    Zend\View
- * @subpackage Helper
  */
 class Gravatar extends AbstractHtmlElement
 {

diff --git a/src/Helper/HeadLink.php b/src/Helper/HeadLink.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -18,8 +17,6 @@
  * Zend_Layout_View_Helper_HeadLink
  *
  * @see        http://www.w3.org/TR/xhtml1/dtds.html
- * @package    Zend_View
- * @subpackage Helper
  */
 class HeadLink extends Placeholder\Container\AbstractStandalone
 {

diff --git a/src/Helper/HeadMeta.php b/src/Helper/HeadMeta.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_View
  */
 
 namespace Zend\View\Helper;
@@ -18,8 +17,6 @@
  * Zend_Layout_View_Helper_HeadMeta
  *
  * @see        http://www.w3.org/TR/xhtml1/dtds.html
- * @package    Zend_View
- * @subpackage Helper
  */
 class HeadMeta extends Placeholder\Container\AbstractStandalone
 {