Move middleware into more relevant packages.

Put middleware classes closer to the packages they interact with. This lets us reduce the number of inter-package dependencies we have. Both Error and Routing are not standalone packages yet, while I'd like cake/http to be standalone.
cakephp · May 4, 2016 · 4de7bae · 4de7bae
1 parent cc9271b
commit 4de7bae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...ttp/Middleware/ErrorHandlerMiddleware.php → ...ror/Middleware/ErrorHandlerMiddleware.php b/...ttp/Middleware/ErrorHandlerMiddleware.php → ...ror/Middleware/ErrorHandlerMiddleware.php
@@ -12,7 +12,7 @@
  * @since         3.3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Http\Middleware;
+namespace Cake\Error\Middleware;
 
 use Cake\Core\App;
 use Cake\Http\ResponseTransformer;

diff --git a/src/Http/Middleware/RoutingMiddleware.php → src/Routing/Middleware/RoutingMiddleware.php b/src/Http/Middleware/RoutingMiddleware.php → src/Routing/Middleware/RoutingMiddleware.php
@@ -12,7 +12,7 @@
  * @since         3.3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Http\Middleware;
+namespace Cake\Routing\Middleware;
 
 use Cake\Routing\Exception\RedirectException;
 use Cake\Routing\Router;

diff --git a/...Middleware/ErrorHandlerMiddlewareTest.php → ...Middleware/ErrorHandlerMiddlewareTest.php b/...Middleware/ErrorHandlerMiddlewareTest.php → ...Middleware/ErrorHandlerMiddlewareTest.php
@@ -12,10 +12,10 @@
  * @since         3.3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Http\Middleware;
+namespace Cake\Test\TestCase\Error\Middleware;
 
 use Cake\Core\Configure;
-use Cake\Http\Middleware\ErrorHandlerMiddleware;
+use Cake\Error\Middleware\ErrorHandlerMiddleware;
 use Cake\Http\ServerRequestFactory;
 use Cake\Network\Response as CakeResponse;
 use Cake\TestSuite\TestCase;

diff --git a/...Http/Middleware/RoutingMiddlewareTest.php → ...ting/Middleware/RoutingMiddlewareTest.php b/...Http/Middleware/RoutingMiddlewareTest.php → ...ting/Middleware/RoutingMiddlewareTest.php
@@ -12,9 +12,9 @@
  * @since         3.3.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Http\Middleware;
+namespace Cake\Test\TestCase\Routing\Middleware;
 
-use Cake\Http\Middleware\RoutingMiddleware;
+use Cake\Routing\Middleware\RoutingMiddleware;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 use Zend\Diactoros\Request;