Merge branch 'master' into rfc/escaper

src/Exception.php → src/Exception/ExceptionInterface.php

@@ -18,18 +18,14 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
-namespace Zend\Console;
+namespace Zend\Console\Exception;
 
 /**
- * @uses       Zend\Exception
  * @category   Zend
  * @package    Zend_Console
  * @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 Exception
+interface ExceptionInterface
 {
 }

src/Exception/InvalidArgumentException.php

@@ -4,7 +4,7 @@
 
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\Console\Exception
+    implements ExceptionInterface
 {
 
 } 

src/Exception/RuntimeException.php

@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Console\Exception;
 
 /**
@@ -31,7 +28,7 @@
  */
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\Console\Exception
+    implements ExceptionInterface
 {
     /**
      * Usage

src/Getopt.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Console;
 
 /**
@@ -99,8 +96,6 @@
  *
  * @todo  Feature request to implement callbacks.
  *        e.g. if -a is specified, run function 'handleOptionA'().
- * @uses  \Zend\Console\GetoptException
- * @uses  \Zend\Json\Json
  */
 class Getopt
 {
@@ -331,8 +326,8 @@ public function __unset($key)
      * These are appended to those defined when the constructor was called.
      *
      * @param  array $argv
-     * @throws \Zend\Console\Getopt\Exception When not given an array as parameter
-     * @return \Zend\Console\Getopt\Getopt Provides a fluent interface
+     * @throws \Zend\Console\Exception\ExceptionInterface When not given an array as parameter
+     * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function addArguments($argv)
     {
@@ -349,8 +344,8 @@ public function addArguments($argv)
      * These replace any currently defined.
      *
      * @param  array $argv
-     * @throws \Zend\Console\Getopt\Exception When not given an array as parameter
-     * @return \Zend\Console\Getopt\Getopt Provides a fluent interface
+     * @throws \Zend\Console\Exception\ExceptionInterface When not given an array as parameter
+     * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function setArguments($argv)
     {
@@ -368,7 +363,7 @@ public function setArguments($argv)
      * the behavior of Zend_Console_Getopt.
      *
      * @param  array $getoptConfig
-     * @return \Zend\Console\Getopt\Getopt Provides a fluent interface
+     * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function setOptions($getoptConfig)
     {
@@ -387,7 +382,7 @@ public function setOptions($getoptConfig)
      *
      * @param  string $configKey
      * @param  string $configValue
-     * @return \Zend\Console\Getopt\Getopt Provides a fluent interface
+     * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function setOption($configKey, $configValue)
     {
@@ -402,7 +397,7 @@ public function setOption($configKey, $configValue)
      * These are appended to the rules defined when the constructor was called.
      *
      * @param  array $rules
-     * @return \Zend\Console\Getopt\Getopt Provides a fluent interface
+     * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function addRules($rules)
     {
@@ -616,8 +611,8 @@ public function getUsageMessage()
      * mapping option name (short or long) to an alias.
      *
      * @param  array $aliasMap
-     * @throws \Zend\Console\Getopt\Exception
-     * @return \Zend\Console\Getopt\Getopt Provides a fluent interface
+     * @throws \Zend\Console\Exception\ExceptionInterface
+     * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function setAliases($aliasMap)
     {
@@ -648,7 +643,7 @@ public function setAliases($aliasMap)
      * mapping option name (short or long) to the help string.
      *
      * @param  array $helpMap
-     * @return \Zend\Console\Getopt\Getopt Provides a fluent interface
+     * @return \Zend\Console\Getopt Provides a fluent interface
      */
     public function setHelp($helpMap)
     {
@@ -670,7 +665,7 @@ public function setHelp($helpMap)
      * Also find option parameters, and remaining arguments after
      * all options have been parsed.
      *
-     * @return \Zend\Console\Getopt\Getopt|null Provides a fluent interface
+     * @return \Zend\Console\Getopt|null Provides a fluent interface
      */
     public function parse()
     {
@@ -748,7 +743,7 @@ protected function _parseShortOptionCluster(&$argv)
      *
      * @param  string $flag
      * @param  mixed  $argv
-     * @throws \Zend\Console\Getopt\Exception
+     * @throws \Zend\Console\Exception\ExceptionInterface
      * @return void
      */
     protected function _parseSingleOption($flag, &$argv)
@@ -885,7 +880,7 @@ protected function _setBooleanFlagValue($flag)
      *
      * @param  string $flag
      * @param  string $param
-     * @throws \Zend\Console\Getopt\Exception
+     * @throws \Zend\Console\Exception\ExceptionInterface
      * @return bool
      */
     protected function _checkParameterType($flag, $param)
@@ -954,7 +949,7 @@ protected function _addRulesModeGnu($rules)
      * Define legal options using the Zend-style format.
      *
      * @param  array $rules
-     * @throws \Zend\Console\Getopt\Exception
+     * @throws \Zend\Console\Exception\ExceptionInterface
      * @return void
      */
     protected function _addRulesModeZend($rules)

test/GetoptTest.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Console;
 use Zend\Console\Getopt,
     Zend\Console\GetoptException;