Merge branch 'feature/docblock-simplification' into develop

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

Hide file tree

Showing 29 changed files with 0 additions and 152 deletions.
diff --git a/src/Adapter/AbstractAdapter.php b/src/Adapter/AbstractAdapter.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_Console
  */
 
 namespace Zend\Console\Adapter;
 
 use Zend\Console\Charset;
 use Zend\Console\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Adapter
- */
 abstract class AbstractAdapter implements AdapterInterface
 {
     /**

diff --git a/src/Adapter/AdapterInterface.php b/src/Adapter/AdapterInterface.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_Console
  */
 
 namespace Zend\Console\Adapter;
 
 use Zend\Console\Charset\CharsetInterface;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- */
 interface AdapterInterface
 {
     const LINE_NONE = 1;

diff --git a/src/Adapter/Posix.php b/src/Adapter/Posix.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_Console
  */
 
 namespace Zend\Console\Adapter;
@@ -18,9 +17,6 @@
 
 /**
  * @todo Add GNU readline support
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Adapter
  * @link http://en.wikipedia.org/wiki/ANSI_escape_code
  */
 class Posix extends AbstractAdapter

diff --git a/src/Adapter/Virtual.php b/src/Adapter/Virtual.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_Console
  */
 
 namespace Zend\Console\Adapter;
@@ -14,10 +13,6 @@
 
 /**
  * Virtual buffer adapter
- *
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Adapter
  */
 class Virtual extends AbstractAdapter
 {

diff --git a/src/Adapter/Windows.php b/src/Adapter/Windows.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_Console
  */
 
 namespace Zend\Console\Adapter;
 
 use Zend\Console\Charset;
 use Zend\Console\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Adapter
- */
 class Windows extends Virtual
 {
     /**

diff --git a/src/Adapter/WindowsAnsicon.php b/src/Adapter/WindowsAnsicon.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_Console
  */
 
 namespace Zend\Console\Adapter;
@@ -27,10 +26,6 @@
  * Console should not run in UTF8 code page (65001), because ANSICON does not behave well with it.
  * It's best to use non-unicode code page 437, 850, 851, 852 or similar. Run "help mode" for more
  * information on how to change Windows console code page.
- *
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Adapter
  */
 class WindowsAnsicon extends Posix
 {

diff --git a/src/Charset/Ascii.php b/src/Charset/Ascii.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_Console
  */
 
 namespace Zend\Console\Charset;
 
 /**
  * Basic (low) ASCII line drawing characters.
- *
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Charset
  */
 class Ascii implements CharsetInterface
 {

diff --git a/src/Charset/AsciiExtended.php b/src/Charset/AsciiExtended.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_Console
  */
 
 namespace Zend\Console\Charset;
@@ -14,9 +13,6 @@
  * Extended ASCII character set (positions 127+, MS DOS & Windows compatible)
  *
  * @link http://en.wikipedia.org/wiki/Box-drawing_characters
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Charset
  */
 class AsciiExtended implements CharsetInterface
 {

diff --git a/src/Charset/CharsetInterface.php b/src/Charset/CharsetInterface.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_Console
  */
 
 namespace Zend\Console\Charset;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- */
 interface CharsetInterface
 {
 }
diff --git a/src/Charset/DECSG.php b/src/Charset/DECSG.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_Console
  */
 
 namespace Zend\Console\Charset;
@@ -14,9 +13,6 @@
  * DEC Special Graphics (VT100 line drawing) character set
  *
  * @link http://vt100.net/docs/vt220-rm/table2-4.html
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Charset
  */
 class DECSG implements CharsetInterface
 {

diff --git a/src/Charset/Utf8.php b/src/Charset/Utf8.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_Console
  */
 
 namespace Zend\Console\Charset;
@@ -14,9 +13,6 @@
  * UTF-8 box drawing
  *
  * @link http://en.wikipedia.org/wiki/Box-drawing_characters
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Charset
  */
 class Utf8 implements CharsetInterface
 {

diff --git a/src/Charset/Utf8Heavy.php b/src/Charset/Utf8Heavy.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_Console
  */
 
 namespace Zend\Console\Charset;
@@ -14,9 +13,6 @@
  * UTF-8 box drawing (modified to use heavy single lines)
  *
  * @link http://en.wikipedia.org/wiki/Box-drawing_characters
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Charset
  */
 class Utf8Heavy extends Utf8
 {

diff --git a/src/Color/Xterm256.php b/src/Color/Xterm256.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_Console
  */
 
 namespace Zend\Console\Color;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- */
 class Xterm256
 {
     /**

diff --git a/src/ColorInterface.php b/src/ColorInterface.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_Console
  */
 
 namespace Zend\Console;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- */
 interface ColorInterface
 {
     const NORMAL = 0;

diff --git a/src/Console.php b/src/Console.php
@@ -5,17 +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_Console
  */
 
 namespace Zend\Console;
 
 /**
  * An static, utility class for interacting with Console environment.
  * Declared abstract to prevent from instantiating.
- *
- * @category   Zend
- * @package    Zend_Console
  */
 abstract class Console
 {

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.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_Console
  */
 
 namespace Zend\Console\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Exception
- */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.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_Console
  */
 
 namespace Zend\Console\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Exception
- */
 interface ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.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_Console
  */
 
 namespace Zend\Console\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.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_Console
  */
 
 namespace Zend\Console\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
     /**

diff --git a/src/Getopt.php b/src/Getopt.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_Console
  */
 
 namespace Zend\Console;
@@ -68,11 +67,6 @@
  * Example:  'abc:' means options '-a', '-b', and '-c'
  * are legal, and the latter requires a string parameter.
  *
- * @category   Zend
- * @package    Zend_Console_Getopt
- * @version    Release: @package_version@
- * @since      Class available since Release 0.6.0
- *
  * @todo  Handle flags that implicitly print usage message, e.g. --help
  *
  * @todo  Enable user to specify header and footer content in the help message.

diff --git a/src/Prompt/AbstractPrompt.php b/src/Prompt/AbstractPrompt.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_Console
  */
 
 namespace Zend\Console\Prompt;
@@ -15,11 +14,6 @@
 use Zend\Console\Adapter\AdapterInterface as ConsoleAdapter;
 use Zend\Console\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Prompt
- */
 abstract class AbstractPrompt implements PromptInterface
 {
     /**

diff --git a/src/Prompt/Char.php b/src/Prompt/Char.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_Console
  */
 
 namespace Zend\Console\Prompt;
 
-/**
- * @category   Zend
- * @package    Zend_Console
- * @subpackage Prompt
- */
 class Char extends AbstractPrompt
 {
     /**