Browse files

[zen-27] Renamed interfaces in Zend\Stdlib

  • Loading branch information...
1 parent 52120c3 commit bdf1aaaaf6da2ba8241551c6fd4ee1477ed480dd @prolic prolic committed Apr 21, 2012
Showing with 281 additions and 232 deletions.
  1. +2 −2 documentation/manual/en/module_specs/Zend_EventManager-EventManager.xml
  2. +11 −11 documentation/manual/en/module_specs/Zend_Http_Request.xml
  3. +9 −9 documentation/manual/en/module_specs/Zend_Mvc-Controllers.xml
  4. +1 −1 documentation/manual/en/module_specs/Zend_Mvc-Intro.xml
  5. +1 −1 documentation/manual/en/module_specs/Zend_Mvc-QuickStart.xml
  6. +1 −1 documentation/manual/en/module_specs/Zend_Mvc-Routing.xml
  7. +1 −1 documentation/manual/en/module_specs/zend.view.quick-start.xml
  8. +9 −9 documentation/manual/it/module_specs/Zend_Mvc-Controllers.xml
  9. +1 −1 documentation/manual/it/module_specs/Zend_Mvc-Intro.xml
  10. +1 −1 documentation/manual/it/module_specs/Zend_Mvc-Routing.xml
  11. +9 −9 library/Zend/Http/Client.php
  12. +2 −2 library/Zend/Http/Client/Cookies.php
  13. +1 −1 library/Zend/Http/Cookies.php
  14. +3 −3 library/Zend/Http/PhpEnvironment/Request.php
  15. +23 −23 library/Zend/Http/Request.php
  16. +2 −2 library/Zend/Http/Response.php
  17. +4 −4 library/Zend/Mvc/AppContext.php
  18. +4 −4 library/Zend/Mvc/Application.php
  19. +4 −4 library/Zend/Mvc/Bootstrap.php
  20. +8 −8 library/Zend/Mvc/Controller/ActionController.php
  21. +2 −2 library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
  22. +3 −3 library/Zend/Mvc/Controller/Plugin/Forward.php
  23. +5 −5 library/Zend/Mvc/Controller/PluginBroker.php
  24. +32 −8 library/Zend/Mvc/Controller/RestfulController.php
  25. +24 −2 library/Zend/Mvc/MvcEvent.php
  26. +1 −1 library/Zend/Mvc/Router/Http/Hostname.php
  27. +1 −1 library/Zend/Mvc/Router/Http/Literal.php
  28. +3 −3 library/Zend/Mvc/Router/Http/Part.php
  29. +3 −3 library/Zend/Mvc/Router/Http/Query.php
  30. +3 −3 library/Zend/Mvc/Router/Http/Regex.php
  31. +3 −3 library/Zend/Mvc/Router/Http/Scheme.php
  32. +3 −3 library/Zend/Mvc/Router/Http/Segment.php
  33. +3 −3 library/Zend/Mvc/Router/Http/TreeRouteStack.php
  34. +3 −3 library/Zend/Mvc/Router/Http/Wildcard.php
  35. +3 −3 library/Zend/Mvc/Router/Route.php
  36. +3 −3 library/Zend/Mvc/Router/SimpleRouteStack.php
  37. +3 −3 library/Zend/Mvc/View/DefaultRenderingStrategy.php
  38. +2 −2 library/Zend/Mvc/View/ExceptionStrategy.php
  39. +2 −2 library/Zend/Mvc/View/RouteNotFoundStrategy.php
  40. +0 −7 library/Zend/Stdlib/Dispatchable.php
  41. +7 −0 library/Zend/Stdlib/DispatchableInterface.php
  42. +0 −7 library/Zend/Stdlib/Exception.php
  43. +2 −2 library/Zend/Stdlib/Exception/BadMethodCallException.php
  44. +2 −2 library/Zend/Stdlib/Exception/DomainException.php
  45. +7 −0 library/Zend/Stdlib/Exception/ExceptionInterface.php
  46. +2 −2 library/Zend/Stdlib/Exception/InvalidArgumentException.php
  47. +2 −2 library/Zend/Stdlib/Exception/InvalidCallbackException.php
  48. +2 −2 library/Zend/Stdlib/Exception/LogicException.php
  49. +1 −1 library/Zend/Stdlib/Message.php
  50. +1 −1 library/Zend/Stdlib/{MessageDescription.php → MessageInterface.php}
  51. +1 −1 library/Zend/Stdlib/Options.php
  52. +1 −1 library/Zend/Stdlib/{ParameterObject.php → ParameterObjectInterface.php}
  53. +1 −1 library/Zend/Stdlib/Parameters.php
  54. +1 −1 library/Zend/Stdlib/{ParametersDescription.php → ParametersInterface.php}
  55. +1 −1 library/Zend/Stdlib/Request.php
  56. +0 −7 library/Zend/Stdlib/RequestDescription.php
  57. +7 −0 library/Zend/Stdlib/RequestInterface.php
  58. +1 −1 library/Zend/Stdlib/Response.php
  59. +0 −8 library/Zend/Stdlib/ResponseDescription.php
  60. +8 −0 library/Zend/Stdlib/ResponseInterface.php
  61. +2 −2 library/Zend/View/View.php
  62. +3 −2 library/Zend/View/ViewEvent.php
  63. +1 −1 tests/Zend/Mvc/Controller/ActionControllerTest.php
  64. +1 −1 tests/Zend/Mvc/Controller/Plugin/ForwardTest.php
  65. +1 −1 tests/Zend/Mvc/Controller/RestfulControllerTest.php
  66. +4 −4 tests/Zend/Mvc/Controller/TestAsset/UneventfulController.php
  67. +4 −4 tests/Zend/Mvc/Controller/TestAsset/UnlocatableEventfulController.php
  68. +3 −3 tests/Zend/Mvc/Router/Http/TestAsset/DummyRoute.php
  69. +3 −3 tests/Zend/Mvc/Router/Http/TestAsset/DummyRouteWithParam.php
  70. +3 −3 tests/Zend/Mvc/Router/TestAsset/DummyRoute.php
  71. +3 −3 tests/Zend/Mvc/Router/TestAsset/DummyRouteWithParam.php
  72. +4 −4 tests/Zend/Mvc/TestAsset/PathController.php
  73. +2 −0 tests/Zend/Mvc/View/DefaultRendereringStrategyTest.php
  74. +1 −1 tests/Zend/Stdlib/ParametersTest.php
View
4 documentation/manual/en/module_specs/Zend_EventManager-EventManager.xml
@@ -708,7 +708,7 @@ $listener = function($e) {
</para>
<programlisting language="php"><![CDATA[
-class Foo implements Dispatchable
+class Foo implements DispatchableInterface
{
// assume composed event manager
@@ -733,7 +733,7 @@ class Foo implements Dispatchable
</para>
<programlisting language="php"><![CDATA[
-class Foo implements Dispatchable
+class Foo implements DispatchableInterface
{
// assume composed event manager
View
22 documentation/manual/en/module_specs/Zend_Http_Request.xml
@@ -147,7 +147,7 @@ $request->post()->set('foo', 'bar');
<methodsynopsis>
<methodname>setUri</methodname>
<methodparam>
- <funcparams>string|Zend\Stdlib\RequestDescription\Zend\Stdlib\Message\Zend\Stdlib\ParametersDescription\Zend\Stdlib\Parameters\Zend\Uri\Http $uri</funcparams>
+ <funcparams>string|Zend\Stdlib\RequestInterface\Zend\Stdlib\Message\Zend\Stdlib\ParametersInterface\Zend\Stdlib\Parameters\Zend\Uri\Http $uri</funcparams>
</methodparam>
</methodsynopsis>
<para>
@@ -223,7 +223,7 @@ $request->post()->set('foo', 'bar');
<methodsynopsis>
<methodname>setQuery</methodname>
<methodparam>
- <funcparams>Zend\Stdlib\ParametersDescription $query</funcparams>
+ <funcparams>Zend\Stdlib\ParametersInterface $query</funcparams>
</methodparam>
</methodsynopsis>
<para>
@@ -243,7 +243,7 @@ $request->post()->set('foo', 'bar');
<void/>
</methodsynopsis>
<para>Return the parameter container responsible for query parameters.</para>
- <para>Returns <classname>Zend\Stdlib\ParametersDescription</classname></para>
+ <para>Returns <classname>Zend\Stdlib\ParametersInterface</classname></para>
</listitem>
</varlistentry>
@@ -253,7 +253,7 @@ $request->post()->set('foo', 'bar');
<methodsynopsis>
<methodname>setPost</methodname>
<methodparam>
- <funcparams>Zend\Stdlib\ParametersDescription $post</funcparams>
+ <funcparams>Zend\Stdlib\ParametersInterface $post</funcparams>
</methodparam>
</methodsynopsis>
<para>
@@ -274,7 +274,7 @@ $request->post()->set('foo', 'bar');
<void/>
</methodsynopsis>
<para>Return the parameter container responsible for post parameters.</para>
- <para>Returns <classname>Zend\Stdlib\ParametersDescription</classname></para>
+ <para>Returns <classname>Zend\Stdlib\ParametersInterface</classname></para>
</listitem>
</varlistentry>
@@ -299,7 +299,7 @@ $request->post()->set('foo', 'bar');
<methodsynopsis>
<methodname>setFile</methodname>
<methodparam>
- <funcparams>Zend\Stdlib\ParametersDescription $files</funcparams>
+ <funcparams>Zend\Stdlib\ParametersInterface $files</funcparams>
</methodparam>
</methodsynopsis>
<para>
@@ -320,7 +320,7 @@ $request->post()->set('foo', 'bar');
<void/>
</methodsynopsis>
<para>Return the parameter container responsible for file parameters</para>
- <para>Returns <classname>Zend\Stdlib\ParametersDescription</classname></para>
+ <para>Returns <classname>Zend\Stdlib\ParametersInterface</classname></para>
</listitem>
</varlistentry>
@@ -330,7 +330,7 @@ $request->post()->set('foo', 'bar');
<methodsynopsis>
<methodname>setServer</methodname>
<methodparam>
- <funcparams>Zend\Stdlib\ParametersDescription $server</funcparams>
+ <funcparams>Zend\Stdlib\ParametersInterface $server</funcparams>
</methodparam>
</methodsynopsis>
<para>
@@ -351,7 +351,7 @@ $request->post()->set('foo', 'bar');
<void/>
</methodsynopsis>
<para>Return the parameter container responsible for server parameters</para>
- <para>Returns <classname>Zend\Stdlib\ParametersDescription</classname></para>
+ <para>Returns <classname>Zend\Stdlib\ParametersInterface</classname></para>
</listitem>
</varlistentry>
@@ -361,7 +361,7 @@ $request->post()->set('foo', 'bar');
<methodsynopsis>
<methodname>setEnv</methodname>
<methodparam>
- <funcparams>Zend\Stdlib\ParametersDescription $env</funcparams>
+ <funcparams>Zend\Stdlib\ParametersInterface $env</funcparams>
</methodparam>
</methodsynopsis>
<para>
@@ -381,7 +381,7 @@ $request->post()->set('foo', 'bar');
<void/>
</methodsynopsis>
<para>Return the parameter container responsible for env parameters</para>
- <para>Returns <classname>Zend\Stdlib\ParametersDescription</classname></para>
+ <para>Returns <classname>Zend\Stdlib\ParametersInterface</classname></para>
</listitem>
</varlistentry>
View
18 documentation/manual/en/module_specs/Zend_Mvc-Controllers.xml
@@ -7,16 +7,16 @@
<para>
Controllers in the MVC layer simply need to be objects implementing
- <classname>Zend\Stdlib\Dispatchable</classname>. That interface
+ <classname>Zend\Stdlib\DispatchableInterface</classname>. That interface
describes a single method:
</para>
<programlisting language="php"><![CDATA[
-use Zend\Stdlib\Dispatchable,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response;
+use Zend\Stdlib\DispatchableInterface,
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response;
-class Foo implements Dispatchable
+class Foo implements DispatchableInterface
{
public function dispatch(Request $request, Response $response = null)
{
@@ -286,7 +286,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
@@ -339,7 +339,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
@@ -439,7 +439,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
@@ -492,7 +492,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
View
2 documentation/manual/en/module_specs/Zend_Mvc-Intro.xml
@@ -40,7 +40,7 @@
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>; all
+ <classname>Zend\Stdlib\DispatchableInterface</classname>; all
"controllers" are simply dispatchable objects
</para>
</listitem>
View
2 documentation/manual/en/module_specs/Zend_Mvc-QuickStart.xml
@@ -232,7 +232,7 @@ class Module implements AutoloaderProvider
<para>
Controllers are simply objects that implement
- <classname>Zend\Stdlib\Dispatchable</classname>. This means they simply
+ <classname>Zend\Stdlib\DispatchableInterface</classname>. This means they simply
need to implement a <methodname>dispatch()</methodname> method that takes
minimally a <classname>Response</classname> object as an argument.
</para>
View
2 documentation/manual/en/module_specs/Zend_Mvc-Routing.xml
@@ -32,7 +32,7 @@
<programlisting language="php"><![CDATA[
namespace Zend\Mvc\Router;
-use zend\Stdlib\RequestDescription as Request;
+use zend\Stdlib\RequestInterface as Request;
interface Route
{
View
2 documentation/manual/en/module_specs/zend.view.quick-start.xml
@@ -208,7 +208,7 @@ return array(
// found" strategy. Basically, this gets triggered if (a) no route
// matches the current request, (b) the controller specified in the
// route match cannot be found in the locator, (c) the controller
- // specified in the route match does not implement the Dispatchable
+ // specified in the route match does not implement the DispatchableInterface
// interface, or (d) if a response from a controller sets the
// response status to 404.
//
View
18 documentation/manual/it/module_specs/Zend_Mvc-Controllers.xml
@@ -7,16 +7,16 @@
<para>
I controller del layer MVC semplicemente devono essere oggetti che
- implementano l'interfaccia <classname>Zend\Stdlib\Dispatchable</classname>.
+ implementano l'interfaccia <classname>Zend\Stdlib\DispatchableInterface</classname>.
Questa interfaccia descrive un singolo metodo:
</para>
<programlisting language="php"><![CDATA[
-use Zend\Stdlib\Dispatchable,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response;
+use Zend\Stdlib\DispatchableInterface,
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response;
-class Foo implements Dispatchable
+class Foo implements DispatchableInterface
{
public function dispatch(Request $request, Response $response = null)
{
@@ -288,7 +288,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
@@ -340,7 +340,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
@@ -439,7 +439,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
@@ -492,7 +492,7 @@ class BarController extends ActionController
<itemizedlist>
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>
+ <classname>Zend\Stdlib\DispatchableInterface</classname>
</para>
</listitem>
View
2 documentation/manual/it/module_specs/Zend_Mvc-Intro.xml
@@ -40,7 +40,7 @@
<listitem>
<para>
- <classname>Zend\Stdlib\Dispatchable</classname>; tutti i "controller"
+ <classname>Zend\Stdlib\DispatchableInterface</classname>; tutti i "controller"
sono semplicemente deglio oggetti eseguibili (dispatchable objects)
</para>
</listitem>
View
2 documentation/manual/it/module_specs/Zend_Mvc-Routing.xml
@@ -27,7 +27,7 @@
<programlisting language="php"><![CDATA[
namespace Zend\Mvc\Router;
-use zend\Stdlib\RequestDescription as Request;
+use zend\Stdlib\RequestInterface as Request;
interface Route
{
View
18 library/Zend/Http/Client.php
@@ -26,10 +26,10 @@
Zend\Http\Header\Cookie,
Zend\Http\Header\SetCookie,
Zend\Stdlib\Parameters,
- Zend\Stdlib\ParametersDescription,
- Zend\Stdlib\Dispatchable,
- Zend\Stdlib\RequestDescription,
- Zend\Stdlib\ResponseDescription;
+ Zend\Stdlib\ParametersInterface,
+ Zend\Stdlib\DispatchableInterface,
+ Zend\Stdlib\RequestInterface,
+ Zend\Stdlib\ResponseInterface;
/**
* Http client
@@ -39,7 +39,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
*/
-class Client implements Dispatchable
+class Client implements DispatchableInterface
{
/**
* @const string Supported HTTP Authentication methods
@@ -732,11 +732,11 @@ public function resetParameters($clearCookies = false)
/**
* Dispatch
*
- * @param RequestDescription $request
- * @param ResponseDescription $response
- * @return ResponseDescription
+ * @param RequestInterface $request
+ * @param ResponseInterface $response
+ * @return ResponseInterface
*/
- public function dispatch(RequestDescription $request, ResponseDescription $response = null)
+ public function dispatch(RequestInterface $request, ResponseInterface $response = null)
{
$response = $this->send($request);
return $response;
View
4 library/Zend/Http/Client/Cookies.php
@@ -20,7 +20,7 @@
namespace Zend\Http\Client;
-use Zend\Stdlib\ParametersDescription,
+use Zend\Stdlib\ParametersInterface,
Zend\Uri,
Zend\Http\Header\Cookie,
Zend\Http\Response;
@@ -48,7 +48,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
*/
-class Cookies //implements ParametersDescription
+class Cookies //implements ParametersInterface
{
/**
* Return cookie(s) as a Zend\Http\Header\Cookie object
View
2 library/Zend/Http/Cookies.php
@@ -2,7 +2,7 @@
namespace Zend\Http;
-use Zend\Stdlib\ParametersDescription,
+use Zend\Stdlib\ParametersInterface,
Zend\Uri,
Zend\Http\Header\Cookie,
Zend\Http\Response;
View
6 library/Zend/Http/PhpEnvironment/Request.php
@@ -6,7 +6,7 @@
Zend\Uri\Http as HttpUri,
Zend\Http\Header\Cookie,
Zend\Stdlib\Parameters,
- Zend\Stdlib\ParametersDescription;
+ Zend\Stdlib\ParametersInterface;
class Request extends HttpRequest
{
@@ -133,10 +133,10 @@ public function getBasePath()
* Provide an alternate Parameter Container implementation for server parameters in this object, (this is NOT the
* primary API for value setting, for that see server())
*
- * @param \Zend\Stdlib\ParametersDescription $server
+ * @param \Zend\Stdlib\ParametersInterface $server
* @return Request
*/
- public function setServer(ParametersDescription $server)
+ public function setServer(ParametersInterface $server)
{
$this->serverParams = $server;
View
46 library/Zend/Http/Request.php
@@ -2,13 +2,13 @@
namespace Zend\Http;
-use Zend\Stdlib\RequestDescription,
+use Zend\Stdlib\RequestInterface,
Zend\Stdlib\Message,
- Zend\Stdlib\ParametersDescription,
+ Zend\Stdlib\ParametersInterface,
Zend\Stdlib\Parameters,
Zend\Uri\Http as HttpUri;
-class Request extends Message implements RequestDescription
+class Request extends Message implements RequestInterface
{
/**#@+
@@ -48,27 +48,27 @@ class Request extends Message implements RequestDescription
protected $version = self::VERSION_11;
/**
- * @var \Zend\Stdlib\ParametersDescription
+ * @var \Zend\Stdlib\ParametersInterface
*/
protected $queryParams = null;
/**
- * @var \Zend\Stdlib\ParametersDescription
+ * @var \Zend\Stdlib\ParametersInterface
*/
protected $postParams = null;
/**
- * @var \Zend\Stdlib\ParametersDescription
+ * @var \Zend\Stdlib\ParametersInterface
*/
protected $fileParams = null;
/**
- * @var \Zend\Stdlib\ParametersDescription
+ * @var \Zend\Stdlib\ParametersInterface
*/
protected $serverParams = null;
/**
- * @var \Zend\Stdlib\ParametersDescription
+ * @var \Zend\Stdlib\ParametersInterface
*/
protected $envParams = null;
@@ -242,10 +242,10 @@ public function getVersion()
* Provide an alternate Parameter Container implementation for query parameters in this object, (this is NOT the
* primary API for value setting, for that see query())
*
- * @param \Zend\Stdlib\ParametersDescription $query
+ * @param \Zend\Stdlib\ParametersInterface $query
* @return Request
*/
- public function setQuery(ParametersDescription $query)
+ public function setQuery(ParametersInterface $query)
{
$this->queryParams = $query;
return $this;
@@ -254,7 +254,7 @@ public function setQuery(ParametersDescription $query)
/**
* Return the parameter container responsible for query parameters
*
- * @return \Zend\Stdlib\ParametersDescription
+ * @return \Zend\Stdlib\ParametersInterface
*/
public function query()
{
@@ -269,10 +269,10 @@ public function query()
* Provide an alternate Parameter Container implementation for post parameters in this object, (this is NOT the
* primary API for value setting, for that see post())
*
- * @param \Zend\Stdlib\ParametersDescription $post
+ * @param \Zend\Stdlib\ParametersInterface $post
* @return Request
*/
- public function setPost(ParametersDescription $post)
+ public function setPost(ParametersInterface $post)
{
$this->postParams = $post;
return $this;
@@ -281,7 +281,7 @@ public function setPost(ParametersDescription $post)
/**
* Return the parameter container responsible for post parameters
*
- * @return \Zend\Stdlib\ParametersDescription
+ * @return \Zend\Stdlib\ParametersInterface
*/
public function post()
{
@@ -307,10 +307,10 @@ public function cookie()
* Provide an alternate Parameter Container implementation for file parameters in this object, (this is NOT the
* primary API for value setting, for that see file())
*
- * @param \Zend\Stdlib\ParametersDescription $files
+ * @param \Zend\Stdlib\ParametersInterface $files
* @return Request
*/
- public function setFile(ParametersDescription $files)
+ public function setFile(ParametersInterface $files)
{
$this->fileParams = $files;
return $this;
@@ -319,7 +319,7 @@ public function setFile(ParametersDescription $files)
/**
* Return the parameter container responsible for file parameters
*
- * @return ParametersDescription
+ * @return ParametersInterface
*/
public function file()
{
@@ -334,10 +334,10 @@ public function file()
* Provide an alternate Parameter Container implementation for server parameters in this object, (this is NOT the
* primary API for value setting, for that see server())
*
- * @param \Zend\Stdlib\ParametersDescription $server
+ * @param \Zend\Stdlib\ParametersInterface $server
* @return Request
*/
- public function setServer(ParametersDescription $server)
+ public function setServer(ParametersInterface $server)
{
$this->serverParams = $server;
return $this;
@@ -347,7 +347,7 @@ public function setServer(ParametersDescription $server)
* Return the parameter container responsible for server parameters
*
* @see http://www.faqs.org/rfcs/rfc3875.html
- * @return \Zend\Stdlib\ParametersDescription
+ * @return \Zend\Stdlib\ParametersInterface
*/
public function server()
{
@@ -362,10 +362,10 @@ public function server()
* Provide an alternate Parameter Container implementation for env parameters in this object, (this is NOT the
* primary API for value setting, for that see env())
*
- * @param \Zend\Stdlib\ParametersDescription $env
+ * @param \Zend\Stdlib\ParametersInterface $env
* @return \Zend\Http\Request
*/
- public function setEnv(ParametersDescription $env)
+ public function setEnv(ParametersInterface $env)
{
$this->envParams = $env;
return $this;
@@ -374,7 +374,7 @@ public function setEnv(ParametersDescription $env)
/**
* Return the parameter container responsible for env parameters
*
- * @return \Zend\Stdlib\ParametersDescription
+ * @return \Zend\Stdlib\ParametersInterface
*/
public function env()
{
View
4 library/Zend/Http/Response.php
@@ -3,9 +3,9 @@
namespace Zend\Http;
use Zend\Stdlib\Message,
- Zend\Stdlib\ResponseDescription;
+ Zend\Stdlib\ResponseInterface;
-class Response extends Message implements ResponseDescription
+class Response extends Message implements ResponseInterface
{
/**#@+
View
8 library/Zend/Mvc/AppContext.php
@@ -4,8 +4,8 @@
use Zend\Di\Locator,
Zend\EventManager\EventManagerAware,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response;
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response;
interface AppContext extends EventManagerAware
{
@@ -20,15 +20,15 @@ public function setLocator(Locator $locator);
/**
* Set request object that will be consumed
*
- * @param Request $request
+ * @param Request $request
* @return AppContext
*/
public function setRequest(Request $request);
/**
* Set response object that will be returned
*
- * @param Response $request
+ * @param Response $request
* @return AppContext
*/
public function setResponse(Response $response);
View
8 library/Zend/Mvc/Application.php
@@ -11,11 +11,11 @@
Zend\Http\PhpEnvironment\Request as PhpHttpRequest,
Zend\Http\PhpEnvironment\Response as PhpHttpResponse,
Zend\Uri\Http as HttpUri,
- Zend\Stdlib\Dispatchable,
+ Zend\Stdlib\DispatchableInterface,
Zend\Stdlib\ArrayUtils,
Zend\Stdlib\Parameters,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response;
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response;
/**
* Main application class for invoking applications
@@ -352,7 +352,7 @@ public function dispatch(MvcEvent $e)
$controller->setLocator($locator);
}
- if (!$controller instanceof Dispatchable) {
+ if (!$controller instanceof DispatchableInterface) {
$error = clone $e;
$error->setError(static::ERROR_CONTROLLER_INVALID)
->setController($controllerName)
View
8 library/Zend/Mvc/Bootstrap.php
@@ -281,11 +281,11 @@ protected function setupView($application)
$createViewModelListener = $locator->get('Zend\Mvc\View\CreateViewModelListener');
$injectTemplateListener = $locator->get('Zend\Mvc\View\InjectTemplateListener');
$injectViewModelListener = $locator->get('Zend\Mvc\View\InjectViewModelListener');
- $staticEvents->attach('Zend\Stdlib\Dispatchable', MvcEvent::EVENT_DISPATCH, array($createViewModelListener, 'createViewModelFromArray'), -80);
- $staticEvents->attach('Zend\Stdlib\Dispatchable', MvcEvent::EVENT_DISPATCH, array($createViewModelListener, 'createViewModelFromNull'), -80);
- $staticEvents->attach('Zend\Stdlib\Dispatchable', MvcEvent::EVENT_DISPATCH, array($injectTemplateListener, 'injectTemplate'), -90);
+ $staticEvents->attach('Zend\Stdlib\DispatchableInterface', MvcEvent::EVENT_DISPATCH, array($createViewModelListener, 'createViewModelFromArray'), -80);
+ $staticEvents->attach('Zend\Stdlib\DispatchableInterface', MvcEvent::EVENT_DISPATCH, array($createViewModelListener, 'createViewModelFromNull'), -80);
+ $staticEvents->attach('Zend\Stdlib\DispatchableInterface', MvcEvent::EVENT_DISPATCH, array($injectTemplateListener, 'injectTemplate'), -90);
$events->attach(MvcEvent::EVENT_DISPATCH_ERROR, array($injectViewModelListener, 'injectViewModel'), -100);
- $staticEvents->attach('Zend\Stdlib\Dispatchable', MvcEvent::EVENT_DISPATCH, array($injectViewModelListener, 'injectViewModel'), -100);
+ $staticEvents->attach('Zend\Stdlib\DispatchableInterface', MvcEvent::EVENT_DISPATCH, array($injectViewModelListener, 'injectViewModel'), -100);
// Inject MVC Event with view model
$mvcEvent = $application->getMvcEvent();
View
16 library/Zend/Mvc/Controller/ActionController.php
@@ -14,15 +14,15 @@
Zend\Mvc\InjectApplicationEvent,
Zend\Mvc\LocatorAware,
Zend\Mvc\MvcEvent,
- Zend\Stdlib\Dispatchable,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response,
+ Zend\Stdlib\DispatchableInterface,
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response,
Zend\View\Model\ViewModel;
/**
* Basic action controller
*/
-abstract class ActionController implements Dispatchable, EventManagerAware, InjectApplicationEvent, LocatorAware, Pluggable
+abstract class ActionController implements DispatchableInterface, EventManagerAware, InjectApplicationEvent, LocatorAware, Pluggable
{
//use \Zend\EventManager\ProvidesEvents;
@@ -128,7 +128,7 @@ public function execute(MvcEvent $e)
/**
* Get the request object
*
- * @return Request
+ * @return RequestInterface
*/
public function getRequest()
{
@@ -138,7 +138,7 @@ public function getRequest()
/**
* Get the response object
*
- * @return Response
+ * @return ResponseInterface
*/
public function getResponse()
{
@@ -152,7 +152,7 @@ public function getResponse()
* Set the event manager instance used by this context
*
* @param EventCollection $events
- * @return AppContext
+ * @return ActionController
*/
public function setEventManager(EventCollection $events)
{
@@ -171,7 +171,7 @@ public function events()
{
if (!$this->events instanceof EventCollection) {
$this->setEventManager(new EventManager(array(
- 'Zend\Stdlib\Dispatchable',
+ 'Zend\Stdlib\DispatchableInterface',
__CLASS__,
get_called_class()
)));
View
4 library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
@@ -2,13 +2,13 @@
namespace Zend\Mvc\Controller\Plugin;
-use Zend\Stdlib\Dispatchable;
+use Zend\Stdlib\DispatchableInterface;
abstract class AbstractPlugin
{
protected $controller;
- public function setController(Dispatchable $controller)
+ public function setController(DispatchableInterface $controller)
{
$this->controller = $controller;
}
View
6 library/Zend/Mvc/Controller/Plugin/Forward.php
@@ -8,7 +8,7 @@
Zend\Mvc\LocatorAware,
Zend\Mvc\MvcEvent,
Zend\Mvc\Router\RouteMatch,
- Zend\Stdlib\Dispatchable;
+ Zend\Stdlib\DispatchableInterface;
class Forward extends AbstractPlugin
{
@@ -30,8 +30,8 @@ public function dispatch($name, array $params = null)
$locator = $this->getLocator();
$controller = $locator->get($name);
- if (!$controller instanceof Dispatchable) {
- throw new Exception\DomainException('Can only forward to Dispatchable classes; class of type ' . get_class($controller) . ' received');
+ if (!$controller instanceof DispatchableInterface) {
+ throw new Exception\DomainException('Can only forward to DispatchableInterface classes; class of type ' . get_class($controller) . ' received');
}
if ($controller instanceof InjectApplicationEvent) {
$controller->setEvent($event);
View
10 library/Zend/Mvc/Controller/PluginBroker.php
@@ -3,7 +3,7 @@
namespace Zend\Mvc\Controller;
use Zend\Loader\PluginBroker as PluginBrokerBase,
- Zend\Stdlib\Dispatchable;
+ Zend\Stdlib\DispatchableInterface;
class PluginBroker extends PluginBrokerBase
{
@@ -13,17 +13,17 @@ class PluginBroker extends PluginBrokerBase
protected $defaultClassLoader = 'Zend\Mvc\Controller\PluginLoader';
/**
- * @var Dispatchable
+ * @var DispatchableInterface
*/
protected $controller;
/**
* Set controller object
*
- * @param Dispatchable $controller
+ * @param DispatchableInterface $controller
* @return PluginBroker
*/
- public function setController(Dispatchable $controller)
+ public function setController(DispatchableInterface $controller)
{
$this->controller = $controller;
return $this;
@@ -32,7 +32,7 @@ public function setController(Dispatchable $controller)
/**
* Retrieve controller instance
*
- * @return null|Dispatchable
+ * @return null|DispatchableInterface
*/
public function getController()
{
View
40 library/Zend/Mvc/Controller/RestfulController.php
@@ -11,9 +11,9 @@
Zend\Http\PhpEnvironment\Response as HttpResponse,
Zend\Loader\Broker,
Zend\Loader\Pluggable,
- Zend\Stdlib\Dispatchable,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response,
+ Zend\Stdlib\DispatchableInterface,
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response,
Zend\Mvc\Exception,
Zend\Mvc\InjectApplicationEvent,
Zend\Mvc\LocatorAware,
@@ -22,15 +22,39 @@
/**
* Abstract RESTful controller
*/
-abstract class RestfulController implements Dispatchable, EventManagerAware, InjectApplicationEvent, LocatorAware, Pluggable
+abstract class RestfulController implements DispatchableInterface, EventManagerAware, InjectApplicationEvent, LocatorAware, Pluggable
{
+ /**
+ * @var Broker
+ */
protected $broker;
+
+ /**
+ * @var Request
+ */
protected $request;
+
+ /**
+ * @var Response
+ */
protected $response;
+
+ /**
+ * @var Event
+ */
protected $event;
+
+ /**
+ * @var EventCollection
+ */
protected $events;
/**
+ * @var Locator
+ */
+ protected $locator;
+
+ /**
* Return list of resources
*
* @return mixed
@@ -189,7 +213,7 @@ public function execute(MvcEvent $e)
/**
* Get request object
*
- * @return Request
+ * @return RequestInterface
*/
public function getRequest()
{
@@ -202,7 +226,7 @@ public function getRequest()
/**
* Get response object
*
- * @return Response
+ * @return ResponseInterface
*/
public function getResponse()
{
@@ -216,7 +240,7 @@ public function getResponse()
* Set the event manager instance used by this context
*
* @param EventCollection $events
- * @return AppContext
+ * @return RestfulController
*/
public function setEventManager(EventCollection $events)
{
@@ -235,7 +259,7 @@ public function events()
{
if (!$this->events) {
$this->setEventManager(new EventManager(array(
- 'Zend\Stdlib\Dispatchable',
+ 'Zend\Stdlib\DispatchableInterface',
__CLASS__,
get_called_class(),
)));
View
26 library/Zend/Mvc/MvcEvent.php
@@ -3,8 +3,8 @@
namespace Zend\Mvc;
use Zend\EventManager\Event,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response,
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response,
Zend\View\Model as ViewModel;
class MvcEvent extends Event
@@ -51,23 +51,45 @@ public function setRouteMatch(Router\RouteMatch $matches)
return $this;
}
+ /**
+ * Get request
+ *
+ * @return Request
+ */
public function getRequest()
{
return $this->getParam('request');
}
+ /**
+ * Set request
+ *
+ * @param Request $request
+ * @return MvcEvent
+ */
public function setRequest(Request $request)
{
$this->setParam('request', $request);
$this->request = $request;
return $this;
}
+ /**
+ * Get response
+ *
+ * @return Response
+ */
public function getResponse()
{
return $this->getParam('response');
}
+ /**
+ * Set response
+ *
+ * @param Response $response
+ * @return MvcEvent
+ */
public function setResponse(Response $response)
{
$this->setParam('response', $response);
View
2 library/Zend/Mvc/Router/Http/Hostname.php
@@ -23,7 +23,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface as Request,
Zend\Mvc\Router\Exception;
/**
View
2 library/Zend/Mvc/Router/Http/Literal.php
@@ -23,7 +23,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface as Request,
Zend\Mvc\Router\Exception;
/**
View
6 library/Zend/Mvc/Router/Http/Part.php
@@ -23,7 +23,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface,
Zend\Mvc\Router\RouteBroker,
Zend\Mvc\Router\Exception,
Zend\Mvc\Router\PriorityList;
@@ -128,11 +128,11 @@ public static function factory($options = array())
* match(): defined by Route interface.
*
* @see Route::match()
- * @param Request $request
+ * @param RequestInterface $request
* @param int|null $pathOffset
* @return RouteMatch|null
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(RequestInterface $request, $pathOffset = null)
{
if ($pathOffset === null) {
$pathOffset = 0;
View
6 library/Zend/Mvc/Router/Http/Query.php
@@ -25,7 +25,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface,
Zend\Mvc\Router\Exception;
/**
@@ -92,11 +92,11 @@ public static function factory($options = array())
* match(): defined by Route interface.
*
* @see Route::match()
- * @param Request $request
+ * @param RequestInterface $request
* @param int|null $pathOffset
* @return RouteMatch
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(RequestInterface $request, $pathOffset = null)
{
$matches = array();
View
6 library/Zend/Mvc/Router/Http/Regex.php
@@ -23,7 +23,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface,
Zend\Mvc\Router\Exception;
/**
@@ -117,10 +117,10 @@ public static function factory($options = array())
* match(): defined by Route interface.
*
* @see Route::match()
- * @param Request $request
+ * @param RequestInterface $request
* @return RouteMatch
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(RequestInterface $request, $pathOffset = null)
{
if (!method_exists($request, 'uri')) {
return null;
View
6 library/Zend/Mvc/Router/Http/Scheme.php
@@ -23,7 +23,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface,
Zend\Mvc\Router\Exception;
/**
@@ -94,10 +94,10 @@ public static function factory($options = array())
* match(): defined by Route interface.
*
* @see Route::match()
- * @param Request $request
+ * @param RequestInterface $request
* @return RouteMatch
*/
- public function match(Request $request)
+ public function match(RequestInterface $request)
{
if (!method_exists($request, 'uri')) {
return null;
View
6 library/Zend/Mvc/Router/Http/Segment.php
@@ -23,7 +23,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface,
Zend\Mvc\Router\Exception;
/**
@@ -312,10 +312,10 @@ protected function buildPath(array $parts, array $mergedParams, $isOptional, $ha
* match(): defined by Route interface.
*
* @see Route::match()
- * @param Request $request
+ * @param RequestInterface $request
* @return RouteMatch
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(RequestInterface $request, $pathOffset = null)
{
if (!method_exists($request, 'uri')) {
return null;
View
6 library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -27,7 +27,7 @@
Zend\Mvc\Router\SimpleRouteStack,
Zend\Mvc\Router\Route as BaseRoute,
Zend\Mvc\Router\Http\Route,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface,
Zend\Uri\Http as HttpUri;
/**
@@ -134,10 +134,10 @@ protected function routeFromArray($specs)
* match(): defined by BaseRoute interface.
*
* @see BaseRoute::match()
- * @param Request $request
+ * @param RequestInterface $request
* @return RouteMatch
*/
- public function match(Request $request)
+ public function match(RequestInterface $request)
{
if (!method_exists($request, 'uri')) {
return null;
View
6 library/Zend/Mvc/Router/Http/Wildcard.php
@@ -23,7 +23,7 @@
use Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request,
+ Zend\Stdlib\RequestInterface,
Zend\Mvc\Router\Exception;
/**
@@ -114,11 +114,11 @@ public static function factory($options = array())
* match(): defined by Route interface.
*
* @see Route::match()
- * @param Request $request
+ * @param RequestInterface $request
* @param int|null $pathOffset
* @return RouteMatch
*/
- public function match(Request $request, $pathOffset = null)
+ public function match(RequestInterface $request, $pathOffset = null)
{
if (!method_exists($request, 'uri')) {
return null;
View
6 library/Zend/Mvc/Router/Route.php
@@ -20,7 +20,7 @@
namespace Zend\Mvc\Router;
-use Zend\Stdlib\RequestDescription as Request;
+use Zend\Stdlib\RequestInterface;
/**
* Route interface.
@@ -49,10 +49,10 @@ public static function factory($options = array());
/**
* Match a given request.
*
- * @param Request $request
+ * @param RequestInterface $request
* @return RouteMatch
*/
- public function match(Request $request);
+ public function match(RequestInterface $request);
/**
* Assemble the route.
View
6 library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -24,7 +24,7 @@
ArrayIterator,
Traversable,
Zend\Stdlib\ArrayUtils,
- Zend\Stdlib\RequestDescription as Request;
+ Zend\Stdlib\RequestInterface;
/**
* Simple route stack implementation.
@@ -259,10 +259,10 @@ protected function routeFromArray($specs)
* match(): defined by Route interface.
*
* @see Route::match()
- * @param Request $request
+ * @param RequestInterface $request
* @return RouteMatch|null
*/
- public function match(Request $request)
+ public function match(RequestInterface $request)
{
foreach ($this->routes as $name => $route) {
if (($match = $route->match($request)) instanceof RouteMatch) {
View
6 library/Zend/Mvc/View/DefaultRenderingStrategy.php
@@ -24,7 +24,7 @@
use Zend\EventManager\EventCollection,
Zend\EventManager\ListenerAggregate,
Zend\Mvc\MvcEvent,
- Zend\Stdlib\ResponseDescription as Response,
+ Zend\Stdlib\ResponseInterface,
Zend\View\Model as ViewModel,
Zend\View\View;
@@ -118,12 +118,12 @@ public function getLayoutTemplate()
* Render the view
*
* @param MvcEvent $e
- * @return Response
+ * @return ResponseInterface
*/
public function render(MvcEvent $e)
{
$result = $e->getResult();
- if ($result instanceof Response) {
+ if ($result instanceof ResponseInterface) {
return $result;
}
View
4 library/Zend/Mvc/View/ExceptionStrategy.php
@@ -26,7 +26,7 @@
Zend\Http\Response as HttpResponse,
Zend\Mvc\Application,
Zend\Mvc\MvcEvent,
- Zend\Stdlib\ResponseDescription as Response,
+ Zend\Stdlib\ResponseInterface,
Zend\View\Model as ViewModel;
/**
@@ -146,7 +146,7 @@ public function prepareExceptionViewModel(MvcEvent $e)
// Do nothing if the result is a response object
$result = $e->getResult();
- if ($result instanceof Response) {
+ if ($result instanceof ResponseInterface) {
return;
}
View
4 library/Zend/Mvc/View/RouteNotFoundStrategy.php
@@ -26,7 +26,7 @@
Zend\Http\Response as HttpResponse,
Zend\Mvc\Application,
Zend\Mvc\MvcEvent,
- Zend\Stdlib\ResponseDescription as Response,
+ Zend\Stdlib\ResponseInterface,
Zend\View\Model as ViewModel;
/**
@@ -207,7 +207,7 @@ public function detectNotFoundError(MvcEvent $e)
public function prepareNotFoundViewModel(MvcEvent $e)
{
$vars = $e->getResult();
- if ($vars instanceof Response) {
+ if ($vars instanceof ResponseInterface) {
// Already have a response as the result
return;
}
View
7 library/Zend/Stdlib/Dispatchable.php
@@ -1,7 +0,0 @@
-<?php
-namespace Zend\Stdlib;
-
-interface Dispatchable
-{
- public function dispatch(RequestDescription $request, ResponseDescription $response = null);
-}
View
7 library/Zend/Stdlib/DispatchableInterface.php
@@ -0,0 +1,7 @@
+<?php
+namespace Zend\Stdlib;
+
+interface DispatchableInterface
+{
+ public function dispatch(RequestInterface $request, ResponseInterface $response = null);
+}
View
7 library/Zend/Stdlib/Exception.php
@@ -1,7 +0,0 @@
-<?php
-
-namespace Zend\Stdlib;
-
-interface Exception
-{
-}
View
4 library/Zend/Stdlib/Exception/BadMethodCallException.php
@@ -20,7 +20,7 @@
namespace Zend\Stdlib\Exception;
-use Zend\Stdlib\Exception;
+use Zend\Stdlib\Exception\ExceptionInterface;
/**
* Bad method call exception
@@ -31,6 +31,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class BadMethodCallException extends \BadMethodCallException
- implements Exception
+ implements ExceptionInterface
{
}
View
4 library/Zend/Stdlib/Exception/DomainException.php
@@ -2,8 +2,8 @@
namespace Zend\Stdlib\Exception;
-use Zend\Stdlib\Exception;
+use Zend\Stdlib\Exception\ExceptionInterface;
-class DomainException extends \DomainException implements Exception
+class DomainException extends \DomainException implements ExceptionInterface
{
}
View
7 library/Zend/Stdlib/Exception/ExceptionInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\Stdlib\Exception;
+
+interface ExceptionInterface
+{
+}
View
4 library/Zend/Stdlib/Exception/InvalidArgumentException.php
@@ -2,10 +2,10 @@
namespace Zend\Stdlib\Exception;
-use Zend\Stdlib\Exception;
+use Zend\Stdlib\Exception\ExceptionInterface;
class InvalidArgumentException
extends \InvalidArgumentException
- implements Exception
+ implements ExceptionInterface
{
}
View
4 library/Zend/Stdlib/Exception/InvalidCallbackException.php
@@ -20,7 +20,7 @@
namespace Zend\Stdlib\Exception;
-use Zend\Stdlib\Exception;
+use Zend\Stdlib\Exception\ExceptionInterface;
/**
* Invalid callback exception
@@ -34,6 +34,6 @@
*/
class InvalidCallbackException
extends DomainException
- implements Exception
+ implements ExceptionInterface
{
}
View
4 library/Zend/Stdlib/Exception/LogicException.php
@@ -20,7 +20,7 @@
namespace Zend\Stdlib\Exception;
-use Zend\Stdlib\Exception;
+use Zend\Stdlib\Exception\ExceptionInterface;
/**
* logic exception
@@ -30,6 +30,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
*/
-class LogicException extends \LogicException implements Exception
+class LogicException extends \LogicException implements ExceptionInterface
{
}
View
2 library/Zend/Stdlib/Message.php
@@ -4,7 +4,7 @@
use Traversable;
-class Message implements MessageDescription
+class Message implements MessageInterface
{
/**
* @var array
View
2 library/Zend/Stdlib/MessageDescription.php → library/Zend/Stdlib/MessageInterface.php
@@ -2,7 +2,7 @@
namespace Zend\Stdlib;
-interface MessageDescription
+interface MessageInterface
{
public function setMetadata($spec, $value = null);
public function getMetadata($key = null);
View
2 library/Zend/Stdlib/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
View
2 library/Zend/Stdlib/ParameterObject.php → .../Zend/Stdlib/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
View
2 library/Zend/Stdlib/Parameters.php
@@ -4,7 +4,7 @@
use ArrayObject;
-class Parameters extends ArrayObject implements ParametersDescription
+class Parameters extends ArrayObject implements ParametersInterface
{
/**
* Constructor
View
2 ...ary/Zend/Stdlib/ParametersDescription.php → library/Zend/Stdlib/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);
View
2 library/Zend/Stdlib/Request.php
@@ -2,7 +2,7 @@
namespace Zend\Stdlib;
-class Request extends Message implements RequestDescription
+class Request extends Message implements RequestInterface
{
// generic request implementation
}
View
7 library/Zend/Stdlib/RequestDescription.php
@@ -1,7 +0,0 @@
-<?php
-
-namespace Zend\Stdlib;
-
-interface RequestDescription extends MessageDescription
-{
-}
View
7 library/Zend/Stdlib/RequestInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Zend\Stdlib;
+
+interface RequestInterface extends MessageInterface
+{
+}
View
2 library/Zend/Stdlib/Response.php
@@ -2,7 +2,7 @@
namespace Zend\Stdlib;
-class Response extends Message implements ResponseDescription
+class Response extends Message implements ResponseInterface
{
// generic response implementation
}
View
8 library/Zend/Stdlib/ResponseDescription.php
@@ -1,8 +0,0 @@
-<?php
-
-namespace Zend\Stdlib;
-
-interface ResponseDescription extends MessageDescription
-{
-
-}
View
8 library/Zend/Stdlib/ResponseInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Zend\Stdlib;
+
+interface ResponseInterface extends MessageInterface
+{
+
+}
View
4 library/Zend/View/View.php
@@ -24,8 +24,8 @@
Zend\EventManager\EventManager,
Zend\EventManager\EventManagerAware,
Zend\Mvc\MvcEvent,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response;
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response;
/**
* @category Zend
View
5 library/Zend/View/ViewEvent.php
@@ -21,8 +21,9 @@
namespace Zend\View;
use Zend\EventManager\Event,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response;
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response,
+ ArrayAccess;
/**
* @category Zend
View
2 tests/Zend/Mvc/Controller/ActionControllerTest.php
@@ -95,7 +95,7 @@ public function testEventManagerListensOnDispatchableInterfaceByDefault()
$response = new Response();
$response->setContent('short circuited!');
$events = new SharedEventManager();
- $events->attach('Zend\Stdlib\Dispatchable', 'dispatch', function($e) use ($response) {
+ $events->attach('Zend\Stdlib\DispatchableInterface', 'dispatch', function($e) use ($response) {
return $response;
}, 10);
$this->controller->events()->setSharedCollections($events);
View
2 tests/Zend/Mvc/Controller/Plugin/ForwardTest.php
@@ -69,7 +69,7 @@ public function testDispatchRaisesDomainExceptionIfDiscoveredControllerIsNotDisp
$locator->add('bogus', function() {
return new stdClass;
});
- $this->setExpectedException('Zend\Mvc\Exception\DomainException', 'Dispatchable');
+ $this->setExpectedException('Zend\Mvc\Exception\DomainException', 'DispatchableInterface');
$this->plugin->dispatch('bogus');
}
View
2 tests/Zend/Mvc/Controller/RestfulControllerTest.php
@@ -134,7 +134,7 @@ public function testEventManagerListensOnDispatchableInterfaceByDefault()
$response = new Response();
$response->setContent('short circuited!');
$events = new SharedEventManager();
- $events->attach('Zend\Stdlib\Dispatchable', 'dispatch', function($e) use ($response) {
+ $events->attach('Zend\Stdlib\DispatchableInterface', 'dispatch', function($e) use ($response) {
return $response;
}, 10);
$this->controller->events()->setSharedCollections($events);
View
8 tests/Zend/Mvc/Controller/TestAsset/UneventfulController.php
@@ -2,11 +2,11 @@
namespace ZendTest\Mvc\Controller\TestAsset;
-use Zend\Stdlib\Dispatchable,
- Zend\Stdlib\RequestDescription as Request,
- Zend\Stdlib\ResponseDescription as Response;
+use Zend\Stdlib\DispatchableInterface,
+ Zend\Stdlib\RequestInterface as Request,
+ Zend\Stdlib\ResponseInterface as Response;
-class UneventfulController implements Dispatchable
+class UneventfulController implements DispatchableInterface
{
public function dispatch(Request $request, Response $response = null)
{
View
8 tests/Zend/Mvc/Controller/TestAsset/UnlocatableEventfulController.php
@@ -4,11 +4,11 @@
use Zend\EventManager\EventDescription as Event,