Merge branch 'master' of https://github.com/zendframework/zf2 into zf…

…-3371
zendframework · Jan 30, 2013 · 7783b57 · 7783b57
commit 7783b57
Show file tree

Hide file tree

Showing 30 changed files with 453 additions and 198 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,20 +5,18 @@
  * @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 ReflectionClass;
 use Zend\Console\Charset;
 use Zend\Console\Exception;
+use Zend\Console\Color\Xterm256;
 use Zend\Console\ColorInterface as Color;
 
 /**
  * @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
@@ -38,7 +36,6 @@ class Posix extends AbstractAdapter
     /**
      * Map of colors to ANSI codes
      *
-     * @todo implement Xterm 256 colors (http://www.frexx.de/xterm-256-notes/)
      * @var array
      */
     protected static $ansiColorMap = array(
@@ -218,28 +215,9 @@ public function setPos($x, $y)
      */
     public function colorize($string, $color = null, $bgColor = null)
     {
-        // Retrieve ansi color codes
-        if ($color !== null) {
-            if (!isset(static::$ansiColorMap['fg'][$color])) {
-                throw new Exception\BadMethodCallException(sprintf(
-                    'Unknown color "%s". Please use one of the Zend\Console\ColorInterface constants',
-                    $color
-                ));
-            }
-            $color = static::$ansiColorMap['fg'][$color];
-        }
-
-        if ($bgColor !== null) {
-            if (!isset(static::$ansiColorMap['bg'][$bgColor])) {
-                throw new Exception\BadMethodCallException(sprintf(
-                    'Unknown color "%s". Please use one of the Zend\Console\ColorInterface constants',
-                    $bgColor
-                ));
-            }
-            $bgColor = static::$ansiColorMap['bg'][$bgColor];
-        }
-
-        return ($color   !== null ? "\x1b[" . $color   . 'm' : '')
+        $color   = $this->getColorCode($color, 'fg');
+        $bgColor = $this->getColorCode($bgColor, 'bg');
+        return ($color !== null ? "\x1b[" . $color   . 'm' : '')
             . ($bgColor !== null ? "\x1b[" . $bgColor . 'm' : '')
             . $string
             . "\x1b[22;39m\x1b[0;49m";
@@ -253,17 +231,7 @@ public function colorize($string, $color = null, $bgColor = null)
      */
     public function setColor($color)
     {
-        // Retrieve ansi color code
-        if ($color !== null) {
-            if (!isset(static::$ansiColorMap['fg'][$color])) {
-                throw new Exception\BadMethodCallException(sprintf(
-                    'Unknown color "%s". Please use one of the Zend\Console\ColorInterface constants',
-                    $color
-                ));
-            }
-            $color = static::$ansiColorMap['fg'][$color];
-        }
-
+        $color = $this->getColorCode($color, 'fg');
         echo "\x1b[" . $color . 'm';
     }
 
@@ -275,18 +243,7 @@ public function setColor($color)
      */
     public function setBgColor($bgColor)
     {
-        // Retrieve ansi color code
-        if ($bgColor !== null) {
-            if (!isset(static::$ansiColorMap['bg'][$bgColor])) {
-                throw new Exception\BadMethodCallException(sprintf(
-                    'Unknown color "%s". Please use one of the Zend\Console\ColorInterface constants',
-                    $bgColor
-                ));
-            }
-
-            $bgColor = static::$ansiColorMap['bg'][$bgColor];
-        }
-
+        $bgColor = $this->getColorCode($bgColor, 'bg');
         echo "\x1b[" . ($bgColor) . 'm';
     }
 
@@ -402,4 +359,38 @@ protected function setTTYMode($mode)
         // Set new mode
         shell_exec('stty '.escapeshellcmd($mode));
     }
+
+    /**
+     * Get the final color code and throw exception on error
+     *
+     * @param  null|int|Xterm256 $color
+     * @throws Exception\BadMethodCallException
+     * @return string
+     */
+    protected function getColorCode($color, $type = 'fg')
+    {
+        if ($color instanceof Xterm256) {
+            $r    = new ReflectionClass($color);
+            $code = $r->getStaticPropertyValue('color');
+            if ($type == 'fg') {
+                $code = sprintf($code, $color::FOREGROUND);
+            } else {
+                $code = sprintf($code, $color::BACKGROUND);
+            }
+            return $code;
+        }
+
+        if ($color !== null) {
+            if (!isset(static::$ansiColorMap[$type][$color])) {
+                throw new Exception\BadMethodCallException(sprintf(
+                        'Unknown color "%s". Please use one of the Zend\Console\ColorInterface constants or use Zend\Console\Color\Xterm256::calculate',
+                        $color
+                ));
+            }
+
+            return static::$ansiColorMap[$type][$color];
+        }
+
+        return null;
+    }
 }
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
 {