Merge branch 'develop'

Merge develop to master for 0.2.0 release.

Author: weierophinney

CHANGELOG.md

@@ -2,9 +2,34 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 0.1.1 - 2015-09-03
+## 0.2.0 - TBD
 
-Initial tagged release.
+### Added
+
+- [#116](https://github.com/zendframework/zend-expressive/pull/116) adds
+  `Application::any()` to complement the various HTTP-specific routing methods;
+  it has the same signature as `get()`, `post()`, `patch()`, et al, but allows
+  any HTTP method.
+- [#120](https://github.com/zendframework/zend-expressive/pull/120) renames the
+  router classes for easier discoverability, to better reflect their usage, and
+  for better naming consistency. `Aura` becomes `AuraRouter`, `FastRoute`
+  becomes `FastRouteRouter` and `Zf2` becomes `Zf2Router`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#120](https://github.com/zendframework/zend-expressive/pull/120) removes the
+  classes `Zend\Expressive\Router\Aura`, `Zend\Expressive\Router\FastRoute`, and
+  `Zend\Expressive\Router\Zf`, per the "Added" section above.
+
+### Fixed
+
+- Nothing.
+
+## 0.1.1 - 2015-09-03
 
 ### Added
 

doc/book/application.md

@@ -116,9 +116,9 @@ where:
 This method is typically only used if you want a single middleware to handle
 multiple HTTP request methods.
 
-### get(), post(), put(), patch(), delete()
+### get(), post(), put(), patch(), delete(), any()
 
-Each of the methods `get()`, `post()`, `put()`, `patch()`, and `delete()`
+Each of the methods `get()`, `post()`, `put()`, `patch()`, `delete()`, and `any()`
 proxies to `route()` and has the signature:
 
 ```php

doc/book/router/aura.md

@@ -46,27 +46,27 @@ $ composer require aura/router
 
 ## Quick Start
 
-At its simplest, you can instantiate a `Zend\Expressive\Router\Aura` instance
+At its simplest, you can instantiate a `Zend\Expressive\Router\AuraRouter` instance
 with no arguments; it will create the underlying Aura.Router objects required
 and compose them for you:
 
 ```php
-use Zend\Expressive\Router\Aura;
+use Zend\Expressive\Router\AuraRouter;
 
-$router = new Aura();
+$router = new AuraRouter();
 ```
 
 ## Programmatic Creation
 
 If you need greater control over the Aura.Router setup and configuration, you
 can create the instances necessary and inject them into
-`Zend\Expressive\Router\Aura` during instantiation.
+`Zend\Expressive\Router\AuraRouter` during instantiation.
 
 ```php
 <?php
 use Aura\Router\RouterFactory;
 use Zend\Expressive\AppFactory;
-use Zend\Expressive\Router\Aura as AuraBridge;
+use Zend\Expressive\Router\AuraRouter as AuraBridge;
 
 $auraRouter = (new RouterFactory())->newInstance();
 $auraRouter->setSecure(true);
@@ -98,7 +98,7 @@ two strategies for creating your Aura.Router implementation.
 ### Basic Router
 
 If you don't need to provide any setup or configuration, you can simply
-instantiate and return an instance of `Zend\Expressive\Router\Aura` for the
+instantiate and return an instance of `Zend\Expressive\Router\AuraRouter` for the
 service name `Zend\Expressive\Router\RouterInterface`.
 
 A factory would look like this:
@@ -108,17 +108,17 @@ A factory would look like this:
 namespace Application\Container;
 
 use Interop\Container\ContainerInterface;
-use Zend\Expressive\Router\Aura;
+use Zend\Expressive\Router\AuraRouter;
 
 class RouterFactory
 {
     /**
      * @param ContainerInterface $container
-     * @return Aura
+     * @return AuraRouter
      */
     public function __invoke(ContainerInterface $container)
     {
-        return new Aura();
+        return new AuraRouter();
     }
 }
 ```
@@ -144,7 +144,7 @@ class as an invokable:
 ```php
 $container->setInvokableClass(
     'Zend\Expressive\Router\RouterInterface',
-    'Zend\Expressive\Router\Aura'
+    'Zend\Expressive\Router\AuraRouter'
 );
 ```
 
@@ -155,7 +155,7 @@ example, we will be defining two factories:
 
 - A factory to register as and generate an `Aura\Router\Router` instance.
 - A factory registered as `Zend\Expressive\Router\RouterInterface`, which
-  creates and returns a `Zend\Expressive\Router\Aura` instance composing the
+  creates and returns a `Zend\Expressive\Router\AuraRouter` instance composing the
   `Aura\Router\Router` instance.
 
 Sound difficult? It's not; we've essentially done it above already!
@@ -189,7 +189,7 @@ class AuraRouterFactory
 namespace Application\Container;
 
 use Interop\Container\ContainerInterface;
-use Zend\Expressive\Router\Aura as AuraBridge;
+use Zend\Expressive\Router\AuraRouter as AuraBridge;
 
 class RouterFactory
 {

doc/book/router/fast-route.md

@@ -10,9 +10,9 @@ dispatcher to match incoming requests against routes.
 
 If you wish to use a different combination — e.g., to use the Group Position
 Based route matcher — you will need to create your own instances and inject them
-into the `Zend\Expressive\Router\FastRoute` class, at instantiation.
+into the `Zend\Expressive\Router\FastRouteRouter` class, at instantiation.
 
-The `FastRoute` bridge class accepts two arguments at instantiation:
+The `FastRouteRouter` bridge class accepts two arguments at instantiation:
 
 - A `FastRoute\RouteCollector` instance
 - A callable that will return a `FastRoute\Dispatcher\RegexBasedAbstract`
@@ -31,7 +31,7 @@ $ composer require nikic/fast-route
 
 ## Quick Start
 
-At its simplest, you can instantiate a `Zend\Expressive\Router\FastRoute` instance
+At its simplest, you can instantiate a `Zend\Expressive\Router\FastRouteRouter` instance
 with no arguments; it will create the underlying FastRoute objects required
 and compose them for you:
 
@@ -45,11 +45,11 @@ $router = new FastRoute();
 
 If you need greater control over the FastRoute setup and configuration, you
 can create the instances necessary and inject them into
-`Zend\Expressive\Router\FastRoute` during instantiation.
+`Zend\Expressive\Router\FastRouteRouter` during instantiation.
 
 To do so, you will need to setup your `RouteCollector` instance and/or
 optionally callable to return your `RegexBasedAbstract` instance manually,
-inject them in your `Zend\Expressive\Router\FastRoute` instance, and inject use
+inject them in your `Zend\Expressive\Router\FastRouteRouter` instance, and inject use
 that when creating your `Application` instance.
 
 ```php
@@ -60,7 +60,7 @@ use FastRoute\RouteCollector;
 use FastRoute\RouteGenerator;
 use FastRoute\RouteParser\Std as RouteParser;
 use Zend\Expressive\AppFactory;
-use Zend\Expressive\Router\FastRoute as FastRouteBridge;
+use Zend\Expressive\Router\FastRouteRouter as FastRouteBridge;
 
 $fastRoute = new RouteCollector(
     new RouteParser(),
@@ -95,7 +95,7 @@ two strategies for creating your FastRoute implementation.
 ### Basic Router
 
 If you don't need to provide any setup or configuration, you can simply
-instantiate and return an instance of `Zend\Expressive\Router\FastRoute` for the
+instantiate and return an instance of `Zend\Expressive\Router\FastRouteRouter` for the
 service name `Zend\Expressive\Router\RouterInterface`.
 
 A factory would look like this:
@@ -105,17 +105,17 @@ A factory would look like this:
 namespace Application\Container;
 
 use Interop\Container\ContainerInterface;
-use Zend\Expressive\Router\FastRoute;
+use Zend\Expressive\Router\FastRouteRouter;
 
 class RouterFactory
 {
     /**
      * @param ContainerInterface $container
-     * @return FastRoute
+     * @return FastRouteRouter
      */
     public function __invoke(ContainerInterface $container)
     {
-        return new FastRoute();
+        return new FastRouteRouter();
     }
 }
 ```
@@ -141,7 +141,7 @@ class as an invokable:
 ```php
 $container->setInvokableClass(
     'Zend\Expressive\Router\RouterInterface',
-    'Zend\Expressive\Router\FastRoute'
+    'Zend\Expressive\Router\FastRouteRouter'
 );
 ```
 
@@ -154,7 +154,7 @@ example, we will be defining three factories:
 - A factory to register as `FastRoute\DispatcherFactory` and return a callable
   factory that returns a `RegexBasedAbstract` instance.
 - A factory registered as `Zend\Expressive\Router\RouterInterface`, which
-  creates and returns a `Zend\Expressive\Router\FastRoute` instance composing the
+  creates and returns a `Zend\Expressive\Router\FastRouteRouter` instance composing the
   two services.
 
 Sound difficult? It's not; we've essentially done it above already!
@@ -208,7 +208,7 @@ class FastRouteDispatcherFactory
 namespace Application\Container;
 
 use Interop\Container\ContainerInterface;
-use Zend\Expressive\Router\FastRoute as FastRouteBridge;
+use Zend\Expressive\Router\FastRouteRouter as FastRouteBridge;
 
 class RouterFactory
 {

doc/book/router/zf2.md

@@ -5,7 +5,7 @@ implementation; for HTTP applications, the default used in ZF2 applications is
 `Zend\Mvc\Router\Http\TreeRouteStack`, which can compose a number of different
 routes of differing types in order to perform routing.
 
-The ZF2 bridge we provide, `Zend\Expressive\Router\Zf`, uses the
+The ZF2 bridge we provide, `Zend\Expressive\Router\Zf2Router`, uses the
 `TreeRouteStack`, and injects `Segment` routes to it; these are in turn injected
 with `Method` routes, and a special "method not allowed" route at negative
 priority to enable us to distinguish between failure to match the path and
@@ -16,7 +16,7 @@ If you instantiate it with no arguments, it will create an empty
 
 ```php
 use Zend\Expressive\AppFactory;
-use Zend\Expressive\Router\Zf2 as Zf2Router;
+use Zend\Expressive\Router\Zf2Router;
 
 $app = AppFactory(null, new Zf2Router());
 ```
@@ -52,14 +52,14 @@ $ composer require zendframework/zend-mvc zendframework/zend-psr7bridge
 
 ## Quick Start
 
-At its simplest, you can instantiate a `Zend\Expressive\Router\Zf2` instance
+At its simplest, you can instantiate a `Zend\Expressive\Router\Zf2Router` instance
 with no arguments; it will create the underlying zend-mvc routing objects
 required and compose them for you:
 
 ```php
-use Zend\Expressive\Router\Zf2;
+use Zend\Expressive\Router\Zf2Router;
 
-$router = new Zf2();
+$router = new Zf2Router();
 ```
 
 ## Programmatic Creation
@@ -70,7 +70,7 @@ you can create the instances necessary and inject them into
 
 ```php
 use Zend\Expressive\AppFactory;
-use Zend\Expressive\Router\Zf2 as Zf2Bridge;
+use Zend\Expressive\Router\Zf2Router as Zf2Bridge;
 use Zend\Mvc\Router\Http\TreeRouteStack;
 
 $zf2Router = new TreeRouteStack();
@@ -101,7 +101,7 @@ two strategies for creating your zend-mvc router implementation.
 ### Basic Router
 
 If you don't need to provide any setup or configuration, you can simply
-instantiate and return an instance of `Zend\Expressive\Router\Zf2` for the
+instantiate and return an instance of `Zend\Expressive\Router\Zf2Router` for the
 service name `Zend\Expressive\Router\RouterInterface`.
 
 A factory would look like this:
@@ -111,17 +111,17 @@ A factory would look like this:
 namespace Application\Container;
 
 use Interop\Container\ContainerInterface;
-use Zend\Expressive\Router\Zf2;
+use Zend\Expressive\Router\Zf2Router;
 
 class RouterFactory
 {
     /**
      * @param ContainerInterface $container
-     * @return Zf2
+     * @return Zf2Router
      */
     public function __invoke(ContainerInterface $container)
     {
-        return new Zf2();
+        return new Zf2Router();
     }
 }
 ```
@@ -147,7 +147,7 @@ class as an invokable:
 ```php
 $container->setInvokableClass(
     'Zend\Expressive\Router\RouterInterface',
-    'Zend\Expressive\Router\Zf2'
+    'Zend\Expressive\Router\Zf2Router'
 );
 ```
 
@@ -159,7 +159,7 @@ example, we will be defining two factories:
 - A factory to register as and generate an `Zend\Mvc\Router\Http\TreeRouteStack`
   instance.
 - A factory registered as `Zend\Expressive\Router\RouterInterface`, which
-  creates and returns a `Zend\Expressive\Router\Zf2` instance composing the
+  creates and returns a `Zend\Expressive\Router\Zf2Router` instance composing the
   `Zend\Mvc\Router\Http\TreeRouteStack` instance.
 
 Sound difficult? It's not; we've essentially done it above already!
@@ -191,7 +191,7 @@ class TreeRouteStackFactory
 namespace Application\Container;
 
 use Interop\Container\ContainerInterface;
-use Zend\Expressive\Router\Zf2 as Zf2Bridge;
+use Zend\Expressive\Router\Zf2Router as Zf2Bridge;
 
 class RouterFactory
 {

src/AppFactory.php

@@ -48,7 +48,7 @@ public static function create(
         Router\RouterInterface $router = null
     ) {
         $container = $container ?: new ServiceManager();
-        $router    = $router    ?: new Router\Aura();
+        $router    = $router    ?: new Router\AuraRouter();
         $emitter   = new Emitter\EmitterStack();
         $emitter->push(new SapiEmitter());
 

src/Application.php

@@ -155,6 +155,17 @@ public function __call($method, $args)
         return call_user_func_array([$this, 'route'], $args);
     }
 
+    /**
+     * @param string|Router\Route $path
+     * @param callable|string     $middleware Middleware (or middleware service name) to associate with route.
+     * @param null|string         $name the name of the route
+     * @return Router\Route
+     */
+    public function any($path, $middleware, $name = null)
+    {
+        return $this->route($path, $middleware, null, $name);
+    }
+
     /**
      * Overload pipe() operation.
      *

src/Container/ApplicationFactory.php

@@ -11,11 +11,9 @@
 
 use Interop\Container\ContainerInterface;
 use Zend\Diactoros\Response\EmitterInterface;
-use Zend\Diactoros\Response\SapiEmitter;
 use Zend\Expressive\Application;
-use Zend\Expressive\Emitter\EmitterStack;
 use Zend\Expressive\Exception;
-use Zend\Expressive\Router\Aura as AuraRouter;
+use Zend\Expressive\Router\AuraRouter;
 use Zend\Expressive\Router\Route;
 use Zend\Expressive\Router\RouterInterface;
 

src/Router/Aura.php renamed to src/Router/AuraRouter.php

@@ -19,7 +19,7 @@
 /**
  * Router implementation bridging the Aura.Router.
  */
-class Aura implements RouterInterface
+class AuraRouter implements RouterInterface
 {
     /**
      * Aura router

src/Router/FastRoute.php renamed to src/Router/FastRouteRouter.php

@@ -19,7 +19,7 @@
 /**
  * Router implementation bridging nikic/fast-route.
  */
-class FastRoute implements RouterInterface
+class FastRouteRouter implements RouterInterface
 {
     /**
      * @var callable A factory callback that can return a dispatcher.