Merge branch 'stdlib-renamed-interfaces' of https://github.com/prolic…

…/zf2 into feature/zen27-stdlib

Conflicts:
	library/Zend/Mvc/ApplicationInterface.php
	library/Zend/Mvc/Bootstrap.php
	library/Zend/Mvc/Controller/ActionController.php
	library/Zend/Mvc/Controller/RestfulController.php
	library/Zend/Mvc/MvcEvent.php
	library/Zend/Mvc/Router/Http/TreeRouteStack.php
	library/Zend/Mvc/View/DefaultRenderingStrategy.php
	library/Zend/Mvc/View/ExceptionStrategy.php
	library/Zend/Mvc/View/RouteNotFoundStrategy.php
	library/Zend/View/View.php
	library/Zend/View/ViewEvent.php
	tests/Zend/Mvc/Controller/TestAsset/UnlocatableEventfulController.php

src/DispatchableInterface.php

@@ -0,0 +1,10 @@
+<?php
+namespace Zend\Stdlib;
+
+use Zend\Stdlib\ResponseInterface as Response,
+    Zend\Stdlib\RequestInterface as Request;
+
+interface DispatchableInterface
+{
+    public function dispatch(Request $request, Response $response = null);
+}

src/Exception/BadMethodCallException.php

@@ -20,8 +20,6 @@
 
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
 /**
  * Bad method call exception
  *
@@ -30,7 +28,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
  */
-class BadMethodCallException extends \BadMethodCallException
-    implements Exception
+class BadMethodCallException
+    extends \BadMethodCallException
+    implements ExceptionInterface
 {
 }

src/Exception/DomainException.php

@@ -2,8 +2,8 @@
 
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
-class DomainException extends \DomainException implements Exception
+class DomainException
+    extends \DomainException
+    implements ExceptionInterface
 {
 }

src/Exception/ExceptionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\Stdlib\Exception;
+
+interface ExceptionInterface
+{
+}

src/Exception/InvalidArgumentException.php

@@ -2,10 +2,8 @@
 
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
-class InvalidArgumentException 
-    extends \InvalidArgumentException 
-    implements Exception
+class InvalidArgumentException
+    extends \InvalidArgumentException
+    implements ExceptionInterface
 {
 }

src/Exception/InvalidCallbackException.php

@@ -20,20 +20,16 @@
 
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
 /**
  * Invalid callback exception
  *
- * @uses       Exception
- * @uses       Zend\Stdlib\Exception
  * @category   Zend
  * @package    Zend_Stdlib
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidCallbackException
-    extends DomainException
-    implements Exception
+    extends \DomainException
+    implements ExceptionInterface
 {
 }

src/Exception/LogicException.php

@@ -20,8 +20,6 @@
 
 namespace Zend\Stdlib\Exception;
 
-use Zend\Stdlib\Exception;
-
 /**
  * logic exception
  *
@@ -30,6 +28,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
  */
-class LogicException extends \LogicException implements Exception
+class LogicException
+    extends \LogicException
+    implements ExceptionInterface
 {
 }

src/Message.php

@@ -4,7 +4,7 @@
 
 use Traversable;
 
-class Message implements MessageDescription
+class Message implements MessageInterface
 {
     /**
      * @var array

src/MessageDescription.php → src/MessageInterface.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Stdlib;
 
-interface MessageDescription
+interface MessageInterface
 {
     public function setMetadata($spec, $value = null);
     public function getMetadata($key = null);

src/Options.php

@@ -28,7 +28,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Options implements ParameterObject
+abstract class Options implements ParameterObjectInterface
 {
     /**
      * @param  array|Traversable|null $options

src/ParameterObject.php → src/ParameterObjectInterface.php

@@ -26,7 +26,7 @@
  * @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 ParameterObject
+interface ParameterObjectInterface
 {
     /**
      * @param string $key

src/Parameters.php

@@ -4,7 +4,7 @@
 
 use ArrayObject;
 
-class Parameters extends ArrayObject implements ParametersDescription
+class Parameters extends ArrayObject implements ParametersInterface
 {
     /**
      * Constructor

src/ParametersDescription.php → src/ParametersInterface.php

@@ -12,7 +12,7 @@
  *     class QueryParams extends ArrayObject implements Parameters {}
  * and have 90% of the functionality
  */
-interface ParametersDescription extends ArrayAccess, Countable, Serializable, Traversable
+interface ParametersInterface extends ArrayAccess, Countable, Serializable, Traversable
 {
     public function __construct(array $values = null);
 

src/Request.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Stdlib;
 
-class Request extends Message implements RequestDescription
+class Request extends Message implements RequestInterface
 {
     // generic request implementation
 }

src/RequestInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\Stdlib;
+
+interface RequestInterface extends MessageInterface
+{
+}

src/Response.php

@@ -2,7 +2,7 @@
 
 namespace Zend\Stdlib;
 
-class Response extends Message implements ResponseDescription
+class Response extends Message implements ResponseInterface
 {
     // generic response implementation
 }

src/ResponseInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Zend\Stdlib;
+
+interface ResponseInterface extends MessageInterface
+{
+
+}

test/ParametersTest.php

@@ -10,7 +10,7 @@ class ParametersTest extends \PHPUnit_Framework_TestCase
     public function testParametersConstructionAndClassStructure()
     {
         $parameters = new Parameters();
-        $this->assertInstanceOf('Zend\Stdlib\ParametersDescription', $parameters);
+        $this->assertInstanceOf('Zend\Stdlib\ParametersInterface', $parameters);
         $this->assertInstanceOf('ArrayObject', $parameters);
         $this->assertInstanceOf('ArrayAccess', $parameters);
         $this->assertInstanceOf('Countable', $parameters);