Merge branch 'hotfix/486'

Close #486

Author: weierophinney

doc/book/cookbook/custom-404-page-handling.md

@@ -5,7 +5,7 @@
 > This recipe is deprecated with the release of Expressive 2.0, as that release
 > now expects and requires that you provide innermost middleware that will
 > return a response, and provides `Zend\Expressive\Middleware\NotFoundHandler`
-> as a default implementation. Please see the [error handling chapter](../error-handling.md#page-not-found)
+> as a default implementation. Please see the [error handling chapter](../features/error-handling.md)
 > for more information.
 
 In some cases, you may want to handle 404 errors separately from the
@@ -28,7 +28,7 @@ Your 404 handler can take one of two approaches:
 In the first approach, the `NotFound` middleware can be as simple as this:
 
 ```php
-namespace Application;
+namespace App;
 
 class NotFound
 {
@@ -56,7 +56,7 @@ In our example here, we will render a specific template, and use this to seed
 and return a response.
 
 ```php
-namespace Application;
+namespace App;
 
 use Zend\Expressive\Template\TemplateRendererInterface;
 
@@ -85,7 +85,7 @@ that does not rely on the final handler.
 
 ## Registering custom 404 handlers
 
-We can register either `Application\NotFound` class above as service in the
+We can register either `App\NotFound` class above as service in the
 [service container](../features/container/intro.md). In the case of the second approach,
 you would also need to provide a factory for creating the middleware (to ensure
 you inject the template renderer).
@@ -109,7 +109,7 @@ configuration, after the dispatch middleware:
         'priority' => 1,
     ],
     [
-        'middleware' => 'Application\NotFound',
+        'middleware' => 'App\NotFound',
         'priority' => -1,
     ],
     /* ... */
@@ -123,7 +123,7 @@ To manually add the middleware, you will need to pipe it to the application
 instance:
 
 ```php
-$app->pipe($container->get('Application\NotFound'));
+$app->pipe($container->get('App\NotFound'));
 ```
 
 This must be done *after*:

doc/book/features/container/aura-di.md

@@ -25,7 +25,7 @@ $ composer require aura/di
 Aura.Di can help you to organize your code better with
 [ContainerConfig classes](http://auraphp.com/packages/Aura.Di/config.html) and
 [two step configuration](http://auraphp.com/blog/2014/04/07/two-stage-config/).
-In this example, we'll put that in `config/services.php`:
+In this example, we'll put that in `config/container.php`:
 
 ```php
 <?php
@@ -129,7 +129,7 @@ Your bootstrap (typically `public/index.php`) will then look like this:
 ```php
 chdir(dirname(__DIR__));
 require 'vendor/autoload.php';
-$container = require 'config/services.php';
+$container = require 'config/container.php';
 $app = $container->get(Zend\Expressive\Application::class);
 require 'config/pipeline.php';
 require 'config/routes.php';

doc/book/features/container/pimple.md

@@ -26,7 +26,7 @@ $ composer require xtreamwayz/pimple-container-interop
 
 To configure Pimple, instantiate it, and then add the factories desired. We
 recommend doing this in a dedicated script that returns the Pimple instance; in
-this example, we'll have that in `config/services.php`.
+this example, we'll have that in `config/container.php`.
 
 ```php
 use Xtreamwayz\Pimple\Container as Pimple;
@@ -51,10 +51,10 @@ $container['Zend\Expressive\Router\RouterInterface'] = function ($container) {
 // Expressive 2.X: We'll provide a default delegate:
 $delegateFactory = new Container\NotFoundDelegateFactory();
 $container['Zend\Expressive\Delegate\DefaultDelegate'] = $delegateFactory;
-$container['Zend\Expressive\Delegate\NotFoundDelegate'] = $delegateFactory;
+$container[Zend\Expressive\Delegate\NotFoundDelegate::class] = $delegateFactory;
 
 // Expressive 2.X: We'll provide a not found handler:
-$container['Zend\Expressive\Middleware\NotFoundHandler'] = new Container\NotFoundHandlerFactory();
+$container[Zend\Expressive\Middleware\NotFoundHandler::class] = new Container\NotFoundHandlerFactory();
 
 // Templating
 // In most cases, you can instantiate the template renderer you want to use
@@ -80,13 +80,13 @@ $container['Zend\Expressive\Middleware\ErrorHandler'] = new Container\ErrorHandl
 // - Expressive 1.X:
 $container['Zend\Expressive\FinalHandler'] = new Container\WhoopsErrorHandlerFactory();
 // - Expressive 2.X:
-$container['Zend\Expressive\Middleware\ErrorResponseGenerator'] = new Container\WhoopsErrorResponseGeneratorFactory();
+$container[Zend\Expressive\Middleware\ErrorResponseGenerator::class] = new Container\WhoopsErrorResponseGeneratorFactory();
 
 // If in production:
 // - Expressive 1.X:
 $container['Zend\Expressive\FinalHandler'] = new Container\TemplatedErrorHandlerFactory();
 // - Expressive 2.X:
-$container['Zend\Expressive\Middleware\ErrorResponseGenerator'] = new Container\ErrorResponseGeneratorFactory();
+$container[Zend\Expressive\Middleware\ErrorResponseGenerator::class] = new Container\ErrorResponseGeneratorFactory();
 
 return $container;
 ```
@@ -95,8 +95,8 @@ Your bootstrap (typically `public/index.php`) will then look like this:
 
 ```php
 chdir(dirname(__DIR__));
-$container = require 'config/services.php';
-$app = $container->get('Zend\Expressive\Application');
+$container = require 'config/container.php';
+$app = $container->get(Zend\Expressive\Application::class);
 
 // In Expressive 2.X:
 require 'config/pipeline.php';

doc/book/features/container/zend-servicemanager.md

@@ -71,7 +71,7 @@ For this example, we'll assume your application configuration (used by several
 factories to configure instances) is in `config/config.php`, and that that file
 returns an array.
 
-We'll create a `config/services.php` file that creates and returns a
+We'll create a `config/container.php` file that creates and returns a
 `Zend\ServiceManager\ServiceManager` instance as follows:
 
 ```php
@@ -82,24 +82,24 @@ $container = new ServiceManager();
 // Application and configuration
 $container->setService('config', include 'config/config.php');
 $container->setFactory(
-    'Zend\Expressive\Application',
-    'Zend\Expressive\Container\ApplicationFactory'
+    Zend\Expressive\Application::class,
+    Zend\Expressive\Container\ApplicationFactory::class
 );
 
 // Routing
 // In most cases, you can instantiate the router you want to use without using a
 // factory:
 $container->setInvokableClass(
-    'Zend\Expressive\Router\RouterInterface',
-    'Zend\Expressive\Router\AuraRouter'
+    Zend\Expressive\Router\RouterInterface::class,
+    Zend\Expressive\Router\AuraRouter::class
 );
 
 // Templating
 // In most cases, you can instantiate the template renderer you want to use
 // without using a factory:
 $container->setInvokableClass(
-    'Zend\Expressive\Template\TemplateRendererInterface',
-    'Zend\Expressive\Plates\PlatesRenderer'
+    Zend\Expressive\Template\TemplateRendererInterface::class,
+    Zend\Expressive\Plates\PlatesRenderer::class
 );
 
 // These next two can be added in any environment; they won't be used unless
@@ -108,43 +108,43 @@ $container->setInvokableClass(
 // ErrorResponseGenerator implementation (Expressive 2.X):
 $container->setFactory(
     'Zend\Expressive\Whoops',
-    'Zend\Expressive\Container\WhoopsFactory'
+    Zend\Expressive\Container\WhoopsFactory::class
 );
 $container->setFactory(
     'Zend\Expressive\WhoopsPageHandler',
-    'Zend\Expressive\Container\WhoopsPageHandlerFactory'
+    Zend\Expressive\Container\WhoopsPageHandlerFactory::class
 );
 
 // Error Handling
 
 // - Expressive 2.X, all environments:
 $container->setFactory(
-    'Zend\Expressive\Middleware\ErrorHandler',
-    'Zend\Expressive\Container\ErrorHandlerFactory'
+    Zend\Expressive\Middleware\ErrorHandler::class,
+    Zend\Expressive\Container\ErrorHandlerFactory::class
 );
 
 // If in development:
 // - Expressive 1.X:
 $container->setFactory(
     'Zend\Expressive\FinalHandler',
-    'Zend\Expressive\Container\WhoopsErrorHandlerFactory'
+    Zend\Expressive\Container\WhoopsErrorHandlerFactory::class
 );
 // - Expressive 2.X:
 $container->setFactory(
-    'Zend\Expressive\Middleware\ErrorResponseGenerator',
-    'Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory'
+    Zend\Expressive\Middleware\ErrorResponseGenerator::class,
+    Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory::class
 );
 
 // If in production:
 // - Expressive 1.X:
 $container->setFactory(
     'Zend\Expressive\FinalHandler',
-    'Zend\Expressive\Container\TemplatedErrorHandlerFactory'
+    Zend\Expressive\Container\TemplatedErrorHandlerFactory::class
 );
 // - Expressive 2.X:
 $container->setFactory(
-    'Zend\Expressive\Middleware\ErrorResponseGenerator',
-    'Zend\Expressive\Container\ErrorResponseGeneratorFactory'
+    Zend\Expressive\Middleware\ErrorResponseGenerator::class,
+    Zend\Expressive\Container\ErrorResponseGeneratorFactory::class
 );
 
 return $container;
@@ -155,8 +155,8 @@ Your bootstrap (typically `public/index.php`) will then look like this:
 ```php
 chdir(dirname(__DIR__));
 require 'vendor/autoload.php';
-$container = require 'config/services.php';
-$app = $container->get('Zend\Expressive\Application');
+$container = require 'config/container.php';
+$app = $container->get(\Zend\Expressive\Application::class);
 
 // Expressive 2.X:
 require 'config/pipeline.php';
@@ -170,7 +170,7 @@ $app->run();
 
 Alternately, you can use a configuration file to define the container. As
 before, we'll define our configuration in `config/config.php`, and our
-`config/services.php` file will still return our service manager instance; we'll
+`config/container.php` file will still return our service manager instance; we'll
 define the service configuration in `config/dependencies.php`:
 
 ```php
@@ -183,23 +183,23 @@ return [
         'Zend\Expressive\Delegate\DefaultDelegate' => 'Zend\Expressive\Delegate\NotFoundDelegate',
     ],
     'invokables' => [
-        'Zend\Expressive\Router\RouterInterface'     => 'Zend\Expressive\Router\AuraRouter',
-        'Zend\Expressive\Template\TemplateRendererInterface' => 'Zend\Expressive\Plates\PlatesRenderer'
+        Zend\Expressive\Router\RouterInterface::class     => Zend\Expressive\Router\AuraRouter::class,
+        Zend\Expressive\Template\TemplateRendererInterface::class => 'Zend\Expressive\Plates\PlatesRenderer::class
     ],
     'factories' => [
-        'Zend\Expressive\Application'       => 'Zend\Expressive\Container\ApplicationFactory',
-        'Zend\Expressive\Whoops'            => 'Zend\Expressive\Container\WhoopsFactory',
-        'Zend\Expressive\WhoopsPageHandler' => 'Zend\Expressive\Container\WhoopsPageHandlerFactory',
+        Zend\Expressive\Application::class       => Zend\Expressive\Container\ApplicationFactory::class,
+        'Zend\Expressive\Whoops'            => Zend\Expressive\Container\WhoopsFactory::class,
+        'Zend\Expressive\WhoopsPageHandler' => Zend\Expressive\Container\WhoopsPageHandlerFactory::class,
 
         // Expressive 2.0:
-        'Zend\Expressive\Middleware\ErrorHandler'    => 'Zend\Expressive\Container\ErrorHandlerFactory',
-        'Zend\Expressive\Delegate\NotFoundDelegate'  => 'Zend\Expressive\Container\NotFoundDelegateFactory',
-        'Zend\Expressive\Middleware\NotFoundHandler' => 'Zend\Expressive\Container\NotFoundHandlerFactory',
+        Zend\Stratigility\Middleware\ErrorHandler::class    => Zend\Expressive\Container\ErrorHandlerFactory::class,
+        Zend\Expressive\Delegate\NotFoundDelegate::class  => Zend\Expressive\Container\NotFoundDelegateFactory::class,
+        Zend\Expressive\Middleware\NotFoundHandler::class => Zend\Expressive\Container\NotFoundHandlerFactory::class,
     ],
 ];
 ```
 
-`config/services.php` becomes:
+`config/container.php` becomes:
 
 ```php
 use Zend\ServiceManager\Config;
@@ -216,40 +216,40 @@ You have two choices on how to approach this:
 - Define the final handler service in an environment specific file and use file
   globbing to merge files.
 
-In the first case, you would change the `config/services.php` example to look
+In the first case, you would change the `config/container.php` example to look
 like this:
 
 ```php
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\ServiceManager;
 
-$container = new ServiceManager(new Config(include 'config/services.php'));
+$container = new ServiceManager(new Config(include 'config/container.php'));
 switch ($variableOrConstantIndicatingEnvironment) {
     case 'development':
         // Expressive 1.X:
         $container->setFactory(
             'Zend\Expressive\FinalHandler',
-            'Zend\Expressive\Container\WhoopsErrorHandlerFactory'
+            Zend\Expressive\Container\WhoopsErrorHandlerFactory::class
         );
 
         // Expressive 2.X:
         $container->setFactory(
-            'Zend\Expressive\Middleware\ErrorResponseGenerator',
-            'Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory'
+            Zend\Expressive\Middleware\ErrorResponseGenerator::class,
+            Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory::class
         );
         break;
     case 'production':
     default:
         // Expressive 1.X:
         $container->setFactory(
             'Zend\Expressive\FinalHandler',
-            'Zend\Expressive\Container\TemplatedErrorHandlerFactory'
+            Zend\Expressive\Container\TemplatedErrorHandlerFactory::class
         );
 
         // Expressive 2.X:
         $container->setFactory(
-            'Zend\Expressive\Middleware\ErrorResponseGenerator',
-            'Zend\Expressive\Container\ErrorResponseGeneratorFactory'
+            Zend\Expressive\Middleware\ErrorResponseGenerator::class,
+            Zend\Expressive\Container\ErrorResponseGeneratorFactory::class
         );
 }
 return $container;
@@ -285,25 +285,25 @@ return [
     ],
     'aliases' => [
         // Expressive 2.0:
-        'Zend\Expressive\Delegate\DefaultDelegate' => 'Zend\Expressive\Delegate\NotFoundDelegate',
+        'Zend\Expressive\Delegate\DefaultDelegate' => Zend\Expressive\Delegate\NotFoundDelegate::class,
     ],
     'invokables' => [
-        'Zend\Expressive\Router\RouterInterface'     => 'Zend\Expressive\Router\AuraRouter',
-        'Zend\Expressive\Template\TemplateRendererInterface' => 'Zend\Expressive\Plates\PlatesRenderer'
+        Zend\Expressive\Router\RouterInterface::class     => Zend\Expressive\Router\AuraRouter::class,
+        Zend\Expressive\Template\TemplateRendererInterface::class => 'Zend\Expressive\Plates\PlatesRenderer::class
     ],
     'factories' => [
-        'Zend\Expressive\Application'       => 'Zend\Expressive\Container\ApplicationFactory',
-        'Zend\Expressive\Whoops'            => 'Zend\Expressive\Container\WhoopsFactory',
-        'Zend\Expressive\WhoopsPageHandler' => 'Zend\Expressive\Container\WhoopsPageHandlerFactory',
+        Zend\Expressive\Application::class       => Zend\Expressive\Container\ApplicationFactory::class,
+        'Zend\Expressive\Whoops'            => Zend\Expressive\Container\WhoopsFactory::class,
+        'Zend\Expressive\WhoopsPageHandler' => Zend\Expressive\Container\WhoopsPageHandlerFactory::class,
 
         // Expressive 1.X:
-        'Zend\Expressive\FinalHandler'      => 'Zend\Expressive\Container\TemplatedErrorHandlerFactory',
+        'Zend\Expressive\FinalHandler'      => Zend\Expressive\Container\TemplatedErrorHandlerFactory::class,
 
         // Expressive 2.X:
-        'Zend\Expressive\Middleware\ErrorResponseGenerator' => 'Zend\Expressive\Container\ErrorResponseGeneratorFactory',
-        'Zend\Expressive\Middleware\ErrorHandler'    => 'Zend\Expressive\Container\ErrorHandlerFactory',
-        'Zend\Expressive\Delegate\NotFoundDelegate'  => 'Zend\Expressive\Container\NotFoundDelegateFactory',
-        'Zend\Expressive\Middleware\NotFoundHandler' => 'Zend\Expressive\Container\NotFoundHandlerFactory',
+        Zend\Expressive\Middleware\ErrorResponseGenerator::class => Zend\Expressive\Container\ErrorResponseGeneratorFactory::class,
+        Zend\Stratigility\Middleware\ErrorHandler::class    => Zend\Expressive\Container\ErrorHandlerFactory::class,
+        'Zend\Expressive\Delegate\NotFoundDelegate'  => Zend\Expressive\Container\NotFoundDelegateFactory::class,
+        Zend\Expressive\Middleware\NotFoundHandler::class => Zend\Expressive\Container\NotFoundHandlerFactory::class,
     ],
 ];
 ```
@@ -314,14 +314,14 @@ like this:
 ```php
 return [
     'factories' => [
-        'Zend\Expressive\Whoops'            => 'Zend\Expressive\Container\WhoopsFactory',
-        'Zend\Expressive\WhoopsPageHandler' => 'Zend\Expressive\Container\WhoopsPageHandlerFactory',
+        'Zend\Expressive\Whoops'            => Zend\Expressive\Container\WhoopsFactory::class,
+        'Zend\Expressive\WhoopsPageHandler' => Zend\Expressive\Container\WhoopsPageHandlerFactory::class,
 
         // Expressive 1.X:
-        'Zend\Expressive\FinalHandler'      => 'Zend\Expressive\Container\WhoopsErrorHandlerFactory',
+        'Zend\Expressive\FinalHandler'      => Zend\Expressive\Container\WhoopsErrorHandlerFactory::class,
 
         // Expressive 2.X:
-        'Zend\Expressive\Middleware\ErrorResponseGenerator' => 'Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory',
+        Zend\Expressive\Middleware\ErrorResponseGenerator::class => 'Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory::class,
     ],
 ];
 ```