From 64628c4065cf6015b30c302a6e2350f0e45833d6 Mon Sep 17 00:00:00 2001
From: PJ Dietz <pjdietz@gmail.com>
Date: Fri, 22 Jun 2018 15:17:07 -0400
Subject: [PATCH] Move MethodMap to Route namespace

---
 src/Routing/{ => Route}/MethodMap.php                 | 2 +-
 src/Routing/Route/Route.php                           | 1 -
 src/Routing/Route/RouteFactory.php                    | 1 -
 test/tests/unit/Routing/{ => Route}/MethodMapTest.php | 4 ++--
 test/tests/unit/Routing/Route/PrefixRouteTest.php     | 2 +-
 test/tests/unit/Routing/Route/RegexRouteTest.php      | 2 +-
 test/tests/unit/Routing/Route/RouteTest.php           | 2 +-
 test/tests/unit/Routing/Route/StaticRouteTest.php     | 2 +-
 test/tests/unit/Routing/Route/TemplateRouteTest.php   | 2 +-
 9 files changed, 8 insertions(+), 10 deletions(-)
 rename src/Routing/{ => Route}/MethodMap.php (99%)
 rename test/tests/unit/Routing/{ => Route}/MethodMapTest.php (98%)

diff --git a/src/Routing/MethodMap.php b/src/Routing/Route/MethodMap.php
similarity index 99%
rename from src/Routing/MethodMap.php
rename to src/Routing/Route/MethodMap.php
index 20c5134..11a2188 100644
--- a/src/Routing/MethodMap.php
+++ b/src/Routing/Route/MethodMap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WellRESTed\Routing;
+namespace WellRESTed\Routing\Route;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/Routing/Route/Route.php b/src/Routing/Route/Route.php
index 3cb2173..2cbe7ca 100644
--- a/src/Routing/Route/Route.php
+++ b/src/Routing/Route/Route.php
@@ -4,7 +4,6 @@ namespace WellRESTed\Routing\Route;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use WellRESTed\Routing\MethodMap;
 
 abstract class Route implements RouteInterface
 {
diff --git a/src/Routing/Route/RouteFactory.php b/src/Routing/Route/RouteFactory.php
index ca16c59..d1bd2ca 100644
--- a/src/Routing/Route/RouteFactory.php
+++ b/src/Routing/Route/RouteFactory.php
@@ -3,7 +3,6 @@
 namespace WellRESTed\Routing\Route;
 
 use WellRESTed\Dispatching\DispatcherInterface;
-use WellRESTed\Routing\MethodMap;
 
 /**
  * Class for creating routes
diff --git a/test/tests/unit/Routing/MethodMapTest.php b/test/tests/unit/Routing/Route/MethodMapTest.php
similarity index 98%
rename from test/tests/unit/Routing/MethodMapTest.php
rename to test/tests/unit/Routing/Route/MethodMapTest.php
index cd6da23..080a4ff 100644
--- a/test/tests/unit/Routing/MethodMapTest.php
+++ b/test/tests/unit/Routing/Route/MethodMapTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace WellRESTed\Test\Unit\Routing;
+namespace WellRESTed\Test\Unit\Routing\Route;
 
 use WellRESTed\Dispatching\Dispatcher;
 use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
-use WellRESTed\Routing\MethodMap;
+use WellRESTed\Routing\Route\MethodMap;
 use WellRESTed\Test\Doubles\MiddlewareMock;
 use WellRESTed\Test\Doubles\NextMock;
 use WellRESTed\Test\TestCase;
diff --git a/test/tests/unit/Routing/Route/PrefixRouteTest.php b/test/tests/unit/Routing/Route/PrefixRouteTest.php
index 05c6359..ef47262 100644
--- a/test/tests/unit/Routing/Route/PrefixRouteTest.php
+++ b/test/tests/unit/Routing/Route/PrefixRouteTest.php
@@ -2,7 +2,7 @@
 
 namespace WellRESTed\Test\Unit\Routing\Route;
 
-use WellRESTed\Routing\MethodMap;
+use WellRESTed\Routing\Route\MethodMap;
 use WellRESTed\Routing\Route\PrefixRoute;
 use WellRESTed\Routing\Route\RouteInterface;
 use WellRESTed\Test\TestCase;
diff --git a/test/tests/unit/Routing/Route/RegexRouteTest.php b/test/tests/unit/Routing/Route/RegexRouteTest.php
index a3a72ae..532851d 100644
--- a/test/tests/unit/Routing/Route/RegexRouteTest.php
+++ b/test/tests/unit/Routing/Route/RegexRouteTest.php
@@ -4,7 +4,7 @@ namespace WellRESTed\Test\Unit\Routing\Route;
 
 use PHPUnit\Framework\Error\Notice;
 use PHPUnit\Framework\Error\Warning;
-use WellRESTed\Routing\MethodMap;
+use WellRESTed\Routing\Route\MethodMap;
 use WellRESTed\Routing\Route\RegexRoute;
 use WellRESTed\Routing\Route\RouteInterface;
 use WellRESTed\Test\TestCase;
diff --git a/test/tests/unit/Routing/Route/RouteTest.php b/test/tests/unit/Routing/Route/RouteTest.php
index 1195845..b5bfc91 100644
--- a/test/tests/unit/Routing/Route/RouteTest.php
+++ b/test/tests/unit/Routing/Route/RouteTest.php
@@ -6,7 +6,7 @@ use Prophecy\Argument;
 use Psr\Http\Server\RequestHandlerInterface;
 use WellRESTed\Message\Response;
 use WellRESTed\Message\ServerRequest;
-use WellRESTed\Routing\MethodMap;
+use WellRESTed\Routing\Route\MethodMap;
 use WellRESTed\Routing\Route\StaticRoute;
 use WellRESTed\Test\TestCase;
 
diff --git a/test/tests/unit/Routing/Route/StaticRouteTest.php b/test/tests/unit/Routing/Route/StaticRouteTest.php
index 66032b2..1ff3654 100644
--- a/test/tests/unit/Routing/Route/StaticRouteTest.php
+++ b/test/tests/unit/Routing/Route/StaticRouteTest.php
@@ -2,7 +2,7 @@
 
 namespace WellRESTed\Test\Unit\Routing\Route;
 
-use WellRESTed\Routing\MethodMap;
+use WellRESTed\Routing\Route\MethodMap;
 use WellRESTed\Routing\Route\RouteInterface;
 use WellRESTed\Routing\Route\StaticRoute;
 use WellRESTed\Test\TestCase;
diff --git a/test/tests/unit/Routing/Route/TemplateRouteTest.php b/test/tests/unit/Routing/Route/TemplateRouteTest.php
index 7dc1492..6b2676c 100644
--- a/test/tests/unit/Routing/Route/TemplateRouteTest.php
+++ b/test/tests/unit/Routing/Route/TemplateRouteTest.php
@@ -2,7 +2,7 @@
 
 namespace WellRESTed\Test\Unit\Routing\Route;
 
-use WellRESTed\Routing\MethodMap;
+use WellRESTed\Routing\Route\MethodMap;
 use WellRESTed\Routing\Route\RouteInterface;
 use WellRESTed\Routing\Route\TemplateRoute;
 use WellRESTed\Test\TestCase;