Merge branch 'master' of git://github.com/zendframework/zf2 into cach…

…e_plugin_priority

Conflicts:
	library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
	library/Zend/Cache/Storage/Plugin/ClearByFactor.php
	library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
	library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
	library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
	library/Zend/Cache/Storage/Plugin/Serializer.php

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

@@ -18,7 +18,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\Console;
+namespace Zend\Console\Exception;
 
 /**
  * @uses       Zend\Exception
@@ -27,6 +27,6 @@
  * @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

@@ -28,7 +28,7 @@
  */
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\Console\Exception
+    implements ExceptionInterface
 {
     /**
      * Usage

src/Getopt.php

@@ -328,8 +328,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)
     {
@@ -346,8 +346,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)
     {
@@ -365,7 +365,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)
     {
@@ -384,7 +384,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)
     {
@@ -399,7 +399,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)
     {
@@ -613,8 +613,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)
     {
@@ -645,7 +645,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)
     {
@@ -667,7 +667,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()
     {
@@ -745,7 +745,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)
@@ -882,7 +882,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)
@@ -951,7 +951,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)