Merging develop to master in preparation for 3.1.0 release.

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.1.0 - 2018-06-05
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- [#76](https://github.com/zendframework/zend-expressive-router/pull/76) modifies the `RouteMiddlewareFactory` to allow specifying a string
+ `$routererviceName` to its constructor. This change allows having discrete
+ factory instances for generating route middleware that use different router
+ instances.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 3.0.4 - TBD
 
 ### Added

composer.json

@@ -51,8 +51,8 @@
  },
  "extra": {
  "branch-alias": {
- "dev-master": "3.0.x-dev",
- "dev-develop": "3.1.x-dev"
+ "dev-master": "3.1.x-dev",
+ "dev-develop": "3.2.x-dev"
  },
  "zf": {
  "config-provider": "Zend\\Expressive\\Router\\ConfigProvider"

composer.lock

@@ -23,19 +23,41 @@
  */
 class RouteMiddlewareFactory
 {
+ /** @var string */
+ private $routerServiceName;
+
+ /**
+ * Allow serialization
+ */
+ public static function __set_state(array $data) : self
+ {
+ return new self(
+ $data['routerServiceName'] ?? RouterInterface::class
+ );
+ }
+
+ /**
+ * Provide the name of the router service to use when creating the route
+ * middleware.
+ */
+ public function __construct(string $routerServiceName = RouterInterface::class)
+ {
+ $this->routerServiceName = $routerServiceName;
+ }
+
  /**
  * @throws MissingDependencyException if the RouterInterface service is
  * missing.
  */
  public function __invoke(ContainerInterface $container) : RouteMiddleware
  {
- if (! $container->has(RouterInterface::class)) {
+ if (! $container->has($this->routerServiceName)) {
  throw MissingDependencyException::dependencyForService(
- RouterInterface::class,
+ $this->routerServiceName,
  RouteMiddleware::class
  );
  }
 
- return new RouteMiddleware($container->get(RouterInterface::class));
+ return new RouteMiddleware($container->get($this->routerServiceName));
  }
 }

src/Middleware/RouteMiddlewareFactory.php

@@ -49,4 +49,27 @@ public function testFactoryProducesRouteMiddlewareWhenAllDependenciesPresent()
 
  $this->assertInstanceOf(RouteMiddleware::class, $middleware);
  }
+
+ public function testFactoryAllowsSpecifyingRouterServiceViaConstructor()
+ {
+ $router = $this->prophesize(RouterInterface::class)->reveal();
+ $this->container->has(Router::class)->willReturn(true);
+ $this->container->get(Router::class)->willReturn($router);
+
+ $factory = new RouteMiddlewareFactory(Router::class);
+
+ $middleware = $factory($this->container->reveal());
+
+ $this->assertInstanceOf(RouteMiddleware::class, $middleware);
+ $this->assertAttributeSame($router, 'router', $middleware);
+ }
+
+ public function testFactoryIsSerializable()
+ {
+ $factory = RouteMiddlewareFactory::__set_state([
+ 'routerServiceName' => Router::class,
+ ]);
+
+ $this->assertAttributeSame(Router::class, 'routerServiceName', $factory);
+ }
 }