Merge branch 'feature/docblock-simplification' into develop

zendframework · Jan 21, 2013 · e0d3e13 · e0d3e13
commit e0d3e13
Show file tree

Hide file tree

Showing 58 changed files with 0 additions and 303 deletions.
diff --git a/src/AbstractOptions.php b/src/AbstractOptions.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib;
 
 use Traversable;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- */
 abstract class AbstractOptions implements ParameterObjectInterface
 {
     /**

diff --git a/src/ArraySerializableInterface.php b/src/ArraySerializableInterface.php
@@ -5,15 +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_Stdlib
  */
 
 namespace Zend\Stdlib;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- */
 interface ArraySerializableInterface
 {
     /**

diff --git a/src/ArrayStack.php b/src/ArrayStack.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_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -15,9 +14,6 @@
 
 /**
  * ArrayObject that acts as a stack with regards to iteration
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 class ArrayStack extends ArrayObject
 {

diff --git a/src/ArrayUtils.php b/src/ArrayUtils.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_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -16,9 +15,6 @@
  * Utility class for testing and manipulation of PHP arrays.
  *
  * Declared abstract, as we have no need for instantiation.
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 abstract class ArrayUtils
 {

diff --git a/src/CallbackHandler.php b/src/CallbackHandler.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_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -20,9 +19,6 @@
  * A handler for a event, event, filterchain, etc. Abstracts PHP callbacks,
  * primarily to allow for lazy-loading and ensuring availability of default
  * arguments (currying).
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 class CallbackHandler
 {

diff --git a/src/DateTime.php b/src/DateTime.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_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -16,9 +15,6 @@
  * DateTime
  *
  * An extension of the \DateTime object.
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 class DateTime extends \DateTime
 {

diff --git a/src/DispatchableInterface.php b/src/DispatchableInterface.php
@@ -5,18 +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_Stdlib
  */
 
 namespace Zend\Stdlib;
 
 use Zend\Stdlib\RequestInterface as Request;
 use Zend\Stdlib\ResponseInterface as Response;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- */
 interface DispatchableInterface
 {
     /**

diff --git a/src/ErrorHandler.php b/src/ErrorHandler.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_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -15,9 +14,6 @@
 /**
  * ErrorHandler that can be used to catch internal PHP errors
  * and convert to a ErrorException instance.
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 abstract class ErrorHandler
 {

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Bad method call exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {

diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Domain exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Exception marker interface
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 interface ExceptionInterface
 {

diff --git a/src/Exception/ExtensionNotLoadedException.php b/src/Exception/ExtensionNotLoadedException.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Extension not loaded exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class ExtensionNotLoadedException extends RuntimeException
 {

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Invalid Argument Exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {

diff --git a/src/Exception/InvalidCallbackException.php b/src/Exception/InvalidCallbackException.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Invalid callback exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class InvalidCallbackException extends DomainException implements ExceptionInterface
 {

diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Logic exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class LogicException extends \LogicException implements ExceptionInterface
 {

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,17 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Exception;
 
 /**
  * Runtime exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {

diff --git a/src/Glob.php b/src/Glob.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_Stdlib
  */
 
 namespace Zend\Stdlib;
 
 /**
  * Wrapper for glob with fallback if GLOB_BRACE is not available.
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 abstract class Glob
 {

diff --git a/src/Hydrator/AbstractHydrator.php b/src/Hydrator/AbstractHydrator.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_Stdlib
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -16,11 +15,6 @@
 use Zend\Stdlib\Hydrator\StrategyEnabledInterface;
 use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Hydrator
- */
 abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInterface
 {
     /**

diff --git a/src/Hydrator/ArraySerializable.php b/src/Hydrator/ArraySerializable.php
@@ -5,18 +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_Stdlib
  */
 
 namespace Zend\Stdlib\Hydrator;
 
 use Zend\Stdlib\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Hydrator
- */
 class ArraySerializable extends AbstractHydrator
 {
 

diff --git a/src/Hydrator/ClassMethods.php b/src/Hydrator/ClassMethods.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_Stdlib
  */
 
 namespace Zend\Stdlib\Hydrator;
@@ -22,11 +21,6 @@
 use Zend\Stdlib\Hydrator\Filter\IsFilter;
 use Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Hydrator
- */
 class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
 {
     /**

diff --git a/src/Hydrator/Filter/FilterComposite.php b/src/Hydrator/Filter/FilterComposite.php
@@ -5,18 +5,12 @@
  * @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_Service
  */
 namespace Zend\Stdlib\Hydrator\Filter;
 
 use ArrayObject;
 use Zend\Stdlib\Exception\InvalidArgumentException;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Hydrator
- */
 class FilterComposite implements FilterInterface
 {
     /**

diff --git a/src/Hydrator/Filter/FilterInterface.php b/src/Hydrator/Filter/FilterInterface.php
@@ -5,15 +5,9 @@
  * @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_Service
  */
 namespace Zend\Stdlib\Hydrator\Filter;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Hydrator
- */
 interface FilterInterface
 {
     /**