Skip to content

Commit

Permalink
new staff from pipe line
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleksandar committed Apr 24, 2017
1 parent 34d6533 commit efa56c4
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 15 deletions.
29 changes: 16 additions & 13 deletions config/autoload/middlewares.global.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,33 @@
'middleware_pipeline' => [
'always' => [
'middleware' => [
// Add more middleware here that you want to execute on
// every request:
// - bootstrapping
// - pre-conditions
// - modifications to outgoing responses
Helper\ServerUrlMiddleware::class,
// Execute on every request: bootstrapping, pre-conditions, modifications to outgoing responses etc.
\Zend\Stratigility\Middleware\OriginalMessages::class,
\Zend\Stratigility\Middleware\ErrorHandler::class,
\Zend\Expressive\Helper\ServerUrlMiddleware::class
],
'priority' => 10000,
],

'routing' => [
'middleware' => [
Zend\Expressive\Container\ApplicationFactory::ROUTING_MIDDLEWARE,
Helper\UrlHelperMiddleware::class,
Web\Middleware\Layout::class, // change layout dynamically per packages

// Add more middleware here that needs to introspect the routing
// results; this might include:
// - route-based authentication
// - route-based validation
// - etc.
\Zend\Expressive\Middleware\ImplicitHeadMiddleware::class,
\Zend\Expressive\Middleware\ImplicitOptionsMiddleware::class,
\Zend\Expressive\Helper\UrlHelperMiddleware::class,
\Web\Middleware\Layout::class,
// Introspect the routing results; this might include: route-based authentication and validation etc.

Zend\Expressive\Container\ApplicationFactory::DISPATCH_MIDDLEWARE,
],
'priority' => 1,
],

//'error' => [
// 'middleware' => [\Zend\Expressive\Middleware\NotFoundHandler::class],
// 'error' => true,
// 'priority' => -1,
//],
],
];
44 changes: 44 additions & 0 deletions config/autoload/programmatic-pipeline.global.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php
/**
* Expressive programmatic pipeline configuration
*/

use Zend\Expressive\Container\ErrorHandlerFactory;
use Zend\Expressive\Container\ErrorResponseGeneratorFactory;
use Zend\Expressive\Container\NotFoundDelegateFactory;
use Zend\Expressive\Container\NotFoundHandlerFactory;
use Zend\Expressive\Delegate\NotFoundDelegate;
use Zend\Expressive\Middleware\ErrorResponseGenerator;
use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
use Zend\Expressive\Middleware\NotFoundHandler;
use Zend\Stratigility\Middleware\ErrorHandler;
use Zend\Stratigility\Middleware\OriginalMessages;

return [
'dependencies' => [
'aliases' => [
// Override the following to provide an alternate default delegate.
'Zend\Expressive\Delegate\DefaultDelegate' => NotFoundDelegate::class,
],
'invokables' => [
ImplicitHeadMiddleware::class => ImplicitHeadMiddleware::class,
ImplicitOptionsMiddleware::class => ImplicitOptionsMiddleware::class,
OriginalMessages::class => OriginalMessages::class,
],
'factories' => [
ErrorHandler::class => ErrorHandlerFactory::class,
// Override the following in a local config file to use
// Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory
// in order to use Whoops for development error handling.
ErrorResponseGenerator::class => ErrorResponseGeneratorFactory::class,
// Override the following to use an alternate "not found" delegate.
NotFoundDelegate::class => NotFoundDelegateFactory::class,
NotFoundHandler::class => NotFoundHandlerFactory::class,
],
],
'zend-expressive' => [
'programmatic_pipeline' => false,
'raise_throwables' => true,
],
];
7 changes: 5 additions & 2 deletions src/Core/ConfigProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ public function __invoke()
],

'error404' => [
'middleware' => [Middleware\ErrorNotFound::class],
'middleware' => [
Middleware\ErrorNotFound::class,
\Zend\Expressive\Middleware\NotFoundHandler::class
],
'priority' => -10,
],

//'error' => [
//'error' => [
// 'middleware' => [Middleware\Error::class],
// 'error' => true,
// 'priority' => -1,
Expand Down

0 comments on commit efa56c4

Please sign in to comment.