From 8071b0b5db77888a0ebb746d2776477f1aaf520a Mon Sep 17 00:00:00 2001
From: PJ Dietz <pjdietz@gmail.com>
Date: Sun, 10 May 2015 11:21:55 -0400
Subject: [PATCH] Move MiddlewareInterface to the root namespace.

---
 src/Dispatching/DispatchStackInterface.php             | 2 +-
 src/Dispatching/Dispatcher.php                         | 2 +-
 src/{Routing => }/MiddlewareInterface.php              | 2 +-
 src/Routing/Hook/ContentLengthHook.php                 | 2 +-
 src/Routing/Hook/HeadHook.php                          | 2 +-
 src/Routing/MethodMap.php                              | 1 +
 src/Routing/MethodMapInterface.php                     | 2 ++
 src/Routing/Route/RouteInterface.php                   | 2 +-
 src/Routing/RouterInterface.php                        | 2 ++
 test/tests/unit/Routing/Dispatching/DispatcherTest.php | 2 +-
 test/tests/unit/Routing/MethodMapTest.php              | 6 +++---
 11 files changed, 15 insertions(+), 10 deletions(-)
 rename src/{Routing => }/MiddlewareInterface.php (92%)

diff --git a/src/Dispatching/DispatchStackInterface.php b/src/Dispatching/DispatchStackInterface.php
index 936972a..af20cc6 100644
--- a/src/Dispatching/DispatchStackInterface.php
+++ b/src/Dispatching/DispatchStackInterface.php
@@ -4,7 +4,7 @@ namespace WellRESTed\Dispatching;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use WellRESTed\Routing\MiddlewareInterface;
+use WellRESTed\MiddlewareInterface;
 
 interface DispatchStackInterface extends MiddlewareInterface
 {
diff --git a/src/Dispatching/Dispatcher.php b/src/Dispatching/Dispatcher.php
index b56a40d..3b8f671 100644
--- a/src/Dispatching/Dispatcher.php
+++ b/src/Dispatching/Dispatcher.php
@@ -4,7 +4,7 @@ namespace WellRESTed\Dispatching;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use WellRESTed\Routing\MiddlewareInterface;
+use WellRESTed\MiddlewareInterface;
 
 class Dispatcher implements DispatcherInterface
 {
diff --git a/src/Routing/MiddlewareInterface.php b/src/MiddlewareInterface.php
similarity index 92%
rename from src/Routing/MiddlewareInterface.php
rename to src/MiddlewareInterface.php
index ebfab84..eb54eff 100644
--- a/src/Routing/MiddlewareInterface.php
+++ b/src/MiddlewareInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Routing;
+namespace WellRESTed;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/Routing/Hook/ContentLengthHook.php b/src/Routing/Hook/ContentLengthHook.php
index 3f42233..3ec892f 100644
--- a/src/Routing/Hook/ContentLengthHook.php
+++ b/src/Routing/Hook/ContentLengthHook.php
@@ -4,7 +4,7 @@ namespace WellRESTed\Routing\Hook;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use WellRESTed\Routing\MiddlewareInterface;
+use WellRESTed\MiddlewareInterface;
 
 /**
  * Adds a Content-length header to the response when all of these are true:
diff --git a/src/Routing/Hook/HeadHook.php b/src/Routing/Hook/HeadHook.php
index 6cd4341..76bf6f8 100644
--- a/src/Routing/Hook/HeadHook.php
+++ b/src/Routing/Hook/HeadHook.php
@@ -5,7 +5,7 @@ namespace WellRESTed\Routing\Hook;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use WellRESTed\Message\NullStream;
-use WellRESTed\Routing\MiddlewareInterface;
+use WellRESTed\MiddlewareInterface;
 
 /**
  * Removes the body of a response to a HEAD request.
diff --git a/src/Routing/MethodMap.php b/src/Routing/MethodMap.php
index 3dfd9c4..9d13776 100644
--- a/src/Routing/MethodMap.php
+++ b/src/Routing/MethodMap.php
@@ -6,6 +6,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use WellRESTed\Dispatching\Dispatcher;
 use WellRESTed\Dispatching\DispatcherInterface;
+use WellRESTed\MiddlewareInterface;
 
 class MethodMap implements MiddlewareInterface, MethodMapInterface
 {
diff --git a/src/Routing/MethodMapInterface.php b/src/Routing/MethodMapInterface.php
index 3392f0a..f68942e 100644
--- a/src/Routing/MethodMapInterface.php
+++ b/src/Routing/MethodMapInterface.php
@@ -2,6 +2,8 @@
 
 namespace WellRESTed\Routing;
 
+use WellRESTed\MiddlewareInterface;
+
 interface MethodMapInterface extends MiddlewareInterface
 {
     /**
diff --git a/src/Routing/Route/RouteInterface.php b/src/Routing/Route/RouteInterface.php
index 01c28be..2c6e94a 100644
--- a/src/Routing/Route/RouteInterface.php
+++ b/src/Routing/Route/RouteInterface.php
@@ -2,8 +2,8 @@
 
 namespace WellRESTed\Routing\Route;
 
+use WellRESTed\MiddlewareInterface;
 use WellRESTed\Routing\MethodMapInterface;
-use WellRESTed\Routing\MiddlewareInterface;
 
 interface RouteInterface extends MiddlewareInterface
 {
diff --git a/src/Routing/RouterInterface.php b/src/Routing/RouterInterface.php
index ca73fd1..aba7c80 100644
--- a/src/Routing/RouterInterface.php
+++ b/src/Routing/RouterInterface.php
@@ -2,6 +2,8 @@
 
 namespace WellRESTed\Routing;
 
+use WellRESTed\MiddlewareInterface;
+
 interface RouterInterface extends MiddlewareInterface
 {
     /**
diff --git a/test/tests/unit/Routing/Dispatching/DispatcherTest.php b/test/tests/unit/Routing/Dispatching/DispatcherTest.php
index 501de7d..d09fc27 100644
--- a/test/tests/unit/Routing/Dispatching/DispatcherTest.php
+++ b/test/tests/unit/Routing/Dispatching/DispatcherTest.php
@@ -6,7 +6,7 @@ use Prophecy\Argument;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use WellRESTed\Dispatching\Dispatcher;
-use WellRESTed\Routing\MiddlewareInterface;
+use WellRESTed\MiddlewareInterface;
 
 /**
  * @covers WellRESTed\Dispatching\Dispatcher
diff --git a/test/tests/unit/Routing/MethodMapTest.php b/test/tests/unit/Routing/MethodMapTest.php
index 6db07c2..051b57b 100644
--- a/test/tests/unit/Routing/MethodMapTest.php
+++ b/test/tests/unit/Routing/MethodMapTest.php
@@ -26,7 +26,7 @@ class MethodMapTest extends \PHPUnit_Framework_TestCase
         $this->next = function ($request, $response) {
             return $response;
         };
-        $this->middleware = $this->prophesize('WellRESTed\Routing\MiddlewareInterface');
+        $this->middleware = $this->prophesize('WellRESTed\MiddlewareInterface');
         $this->middleware->dispatch(Argument::cetera())->willReturn();
     }
 
@@ -63,10 +63,10 @@ class MethodMapTest extends \PHPUnit_Framework_TestCase
     {
         $this->request->getMethod()->willReturn("get");
 
-        $middlewareUpper = $this->prophesize('WellRESTed\Routing\MiddlewareInterface');
+        $middlewareUpper = $this->prophesize('WellRESTed\MiddlewareInterface');
         $middlewareUpper->dispatch(Argument::cetera())->willReturn();
 
-        $middlewareLower = $this->prophesize('WellRESTed\Routing\MiddlewareInterface');
+        $middlewareLower = $this->prophesize('WellRESTed\MiddlewareInterface');
         $middlewareLower->dispatch(Argument::cetera())->willReturn();
 
         $map = new MethodMap();