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

@@ -19,7 +19,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\File;
+namespace Zend\File\Exception;
 
 /**
  * Marker interface for exceptions found in this component
@@ -28,6 +28,6 @@
  * @subpackage Exception
  * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
  */
-interface Exception
+interface ExceptionInterface
 {
 }

src/Exception/InvalidArgumentException.php

@@ -21,8 +21,6 @@
 
 namespace Zend\File\Exception;
 
-use Zend\File\Exception;
-
 /**
  * Exception class raised when invalid arguments are discovered
  * 
@@ -31,6 +29,6 @@
  */
 class InvalidArgumentException 
     extends \InvalidArgumentException 
-    implements Exception
+    implements ExceptionInterface
 {
 }

src/Transfer/Adapter/AbstractAdapter.php

@@ -371,7 +371,7 @@ public function addPrefixPaths(array $spec)
     /**
      * Adds a new validator for this class
      *
-     * @param  string|Validator\Validator $validator           Type of validator to add
+     * @param  string|Validator\ValidatorInterface $validator           Type of validator to add
      * @param  boolean                    $breakChainOnFailure If the validation chain should stop an failure
      * @param  string|array               $options             Options to set for the validator
      * @param  string|array               $files               Files to limit this validator to
@@ -380,7 +380,7 @@ public function addPrefixPaths(array $spec)
      */
     public function addValidator($validator, $breakChainOnFailure = false, $options = null, $files = null)
     {
-        if ($validator instanceof Validator\Validator) {
+        if ($validator instanceof Validator\ValidatorInterface) {
             $name = get_class($validator);
         } elseif (is_string($validator)) {
             $name      = $this->getPluginLoader(self::VALIDATOR)->load($validator);
@@ -395,7 +395,7 @@ public function addValidator($validator, $breakChainOnFailure = false, $options
                 unset($options['messages']);
             }
         } else {
-            throw new Exception\InvalidArgumentException('Invalid validator provided to addValidator; must be string or Zend\Validator\Validator');
+            throw new Exception\InvalidArgumentException('Invalid validator provided to addValidator; must be string or Zend\Validator\ValidatorInterface');
         }
 
         $this->validators[$name] = $validator;
@@ -427,7 +427,7 @@ public function addValidator($validator, $breakChainOnFailure = false, $options
     public function addValidators(array $validators, $files = null)
     {
         foreach ($validators as $name => $validatorInfo) {
-            if ($validatorInfo instanceof Validator\Validator) {
+            if ($validatorInfo instanceof Validator\ValidatorInterface) {
                 $this->addValidator($validatorInfo, null, null, $files);
             } else if (is_string($validatorInfo)) {
                 if (!is_int($name)) {

src/Transfer/Exception/BadMethodCallException.php

@@ -28,5 +28,5 @@
  */
 class BadMethodCallException
     extends \BadMethodCallException
-    implements \Zend\File\Transfer\Exception
+    implements ExceptionInterface
 {}

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

@@ -18,7 +18,9 @@
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-namespace Zend\File\Transfer;
+namespace Zend\File\Transfer\Exception;
+
+use Zend\File\Exception\ExceptionInterface as FileException;
 
 /**
  * Exception class for Zend\File\Transfer
@@ -28,7 +30,8 @@
  * @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
+    extends FileException
 {
 
 }

src/Transfer/Exception/InvalidArgumentException.php

@@ -28,5 +28,5 @@
  */
 class InvalidArgumentException
     extends \InvalidArgumentException
-    implements \Zend\File\Transfer\Exception
+    implements ExceptionInterface
 {}

src/Transfer/Exception/PhpEnvironmentException.php

@@ -28,5 +28,5 @@
  */
 class PhpEnvironmentException
     extends \RuntimeException
-    implements \Zend\File\Transfer\Exception
+    implements ExceptionInterface
 {}

src/Transfer/Exception/RuntimeException.php

@@ -28,5 +28,5 @@
  */
 class RuntimeException
     extends \RuntimeException
-    implements \Zend\File\Transfer\Exception
+    implements ExceptionInterface
 {}

test/Transfer/Adapter/HttpTest.php

@@ -23,7 +23,7 @@
 namespace ZendTest\File\Transfer\Adapter;
 
 use Zend\File\Transfer\Adapter,
-    Zend\File\Transfer\Exception,
+    Zend\File\Transfer\Exception\RuntimeException,
     Zend\ProgressBar,
     Zend\ProgressBar\Adapter as AdapterProgressBar,
     Zend\Validator\File as FileValidator;
@@ -124,7 +124,7 @@ public function testReceiveUnknownFile()
     {
         try {
             $this->assertFalse($this->adapter->receive('unknownFile'));
-        } catch (Exception $e) {
+        } catch (RuntimeException $e) {
             $this->assertContains('not find', $e->getMessage());
         }
     }