Merge branch 'hotfix/352'

Close #403
Fixes #352

Author: weierophinney

.docheader

@@ -1,5 +1,5 @@
 /**
  * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) 2015-%year% Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) %regexp:(20\d{2}-)?%%year% Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */

composer.json

@@ -32,7 +32,7 @@
         "zendframework/zend-expressive-fastroute": "^1.0",
         "zendframework/zend-expressive-zendrouter": "^1.0",
         "zendframework/zend-servicemanager": "^2.6",
-        "malukenho/docheader": "^0.1.0"
+        "malukenho/docheader": "^0.1.5"
     },
     "autoload": {
       "psr-4": {

composer.lock

@@ -40,11 +40,31 @@ final class AppFactory
      * @param null|Router\RouterInterface $router Router implementation to use;
      *     defaults to the FastRoute router bridge.
      * @return Application
+     * @throws Exception\MissingDependencyException if the container was not
+     *     provided and the ServiceManager class is not present.
+     * @throws Exception\MissingDependencyException if the router was not
+     *     provided and the Router\FastRouteRouter class is not present.
      */
     public static function create(
         ContainerInterface $container = null,
         Router\RouterInterface $router = null
     ) {
+        if (! $container && ! class_exists(ServiceManager::class)) {
+            throw new Exception\MissingDependencyException(sprintf(
+                '%s requires a container, but none was provided and %s is not installed',
+                __CLASS__,
+                ServiceManager::class
+            ));
+        }
+
+        if (! $router && ! class_exists(Router\FastRouteRouter::class)) {
+            throw new Exception\MissingDependencyException(sprintf(
+                '%s requires a router, but none was provided and %s is not installed',
+                __CLASS__,
+                Router\FastRouteRouter::class
+            ));
+        }
+
         $container = $container ?: new ServiceManager();
         $router    = $router    ?: new Router\FastRouteRouter();
         $emitter   = new Emitter\EmitterStack();

src/AppFactory.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive\Exception;
+
+use RuntimeException;
+
+class MissingDependencyException extends RuntimeException implements ExceptionInterface
+{
+}