Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Prepare skeleton for 2.2 release #239

Merged
merged 2 commits into from
Mar 12, 2018
Merged

Prepare skeleton for 2.2 release #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8105b9d
Prepare skeleton for 2.2 release
weierophinney Mar 12, 2018
7680183
Fixes ProjectSandboxTrait to follow expressive 2.2 conventions
weierophinney Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"roave/security-advisories": "dev-master",
"zendframework/zend-component-installer": "^1.0",
"zendframework/zend-config-aggregator": "^1.0",
"zendframework/zend-expressive": "^2.0.5",
"zendframework/zend-expressive": "^2.2",
"zendframework/zend-expressive-helpers": "^4.0",
"zendframework/zend-stdlib": "^3.1"
},
Expand All @@ -32,11 +32,11 @@
"squizlabs/php_codesniffer": "^2.8.1",
"xtreamwayz/pimple-container-interop": "^1.0",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-expressive-aurarouter": "^2.0",
"zendframework/zend-expressive-fastroute": "^2.0",
"zendframework/zend-expressive-aurarouter": "^2.2",
"zendframework/zend-expressive-fastroute": "^2.2",
"zendframework/zend-expressive-platesrenderer": "^1.3",
"zendframework/zend-expressive-twigrenderer": "^1.4",
"zendframework/zend-expressive-zendrouter": "^2.0.1",
"zendframework/zend-expressive-zendrouter": "^2.2",
"zendframework/zend-expressive-zendviewrenderer": "^1.4",
"zendframework/zend-servicemanager": "^3.3",
"zfcampus/zf-development-mode": "^3.1"
Expand Down
2 changes: 2 additions & 0 deletions config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
];

$aggregator = new ConfigAggregator([
Zend\Expressive\ConfigProvider::class,
Zend\Expressive\Router\ConfigProvider::class,
// Include cache configuration
new ArrayProvider($cacheConfig),

Expand Down
10 changes: 6 additions & 4 deletions config/pipeline.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

use Zend\Expressive\Helper\ServerUrlMiddleware;
use Zend\Expressive\Helper\UrlHelperMiddleware;
use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
use Zend\Expressive\Router\Middleware\DispatchMiddleware;
use Zend\Expressive\Router\Middleware\ImplicitHeadMiddleware;
use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
use Zend\Expressive\Router\Middleware\RouteMiddleware;
use Zend\Expressive\Middleware\NotFoundHandler;
use Zend\Stratigility\Middleware\ErrorHandler;

Expand Down Expand Up @@ -36,7 +38,7 @@
// - $app->pipe('/files', $filesMiddleware);

// Register the routing middleware in the middleware pipeline
$app->pipeRoutingMiddleware();
$app->pipe(RouteMiddleware::class);
$app->pipe(ImplicitHeadMiddleware::class);
$app->pipe(ImplicitOptionsMiddleware::class);
$app->pipe(UrlHelperMiddleware::class);
Expand All @@ -49,7 +51,7 @@
// - etc.

// Register the dispatch middleware in the middleware pipeline
$app->pipeDispatchMiddleware();
$app->pipe(DispatchMiddleware::class);

// At this point, if no Response is returned by any middleware, the
// NotFoundHandler kicks in; alternately, you can provide other fallback
Expand Down
6 changes: 3 additions & 3 deletions src/ExpressiveInstaller/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
'aura/di' => '^3.2',
'filp/whoops' => '^2.1.7',
'xtreamwayz/pimple-container-interop' => '^1.0',
'zendframework/zend-expressive-aurarouter' => '^2.0',
'zendframework/zend-expressive-fastroute' => '^2.0',
'zendframework/zend-expressive-aurarouter' => '^2.2',
'zendframework/zend-expressive-fastroute' => '^2.2',
'zendframework/zend-expressive-platesrenderer' => '^1.3.1',
'zendframework/zend-expressive-twigrenderer' => '^1.4',
'zendframework/zend-expressive-zendrouter' => '^2.0.1',
'zendframework/zend-expressive-zendrouter' => '^2.2',
'zendframework/zend-expressive-zendviewrenderer' => '^1.4',
'zendframework/zend-servicemanager' => '^3.3',
],
Expand Down
10 changes: 6 additions & 4 deletions test/ExpressiveInstallerTest/ProjectSandboxTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
use Zend\Expressive\Application;
use Zend\Expressive\Helper\ServerUrlMiddleware;
use Zend\Expressive\Helper\UrlHelperMiddleware;
use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
use Zend\Expressive\Middleware\NotFoundHandler;
use Zend\Expressive\Router\Middleware\DispatchMiddleware;
use Zend\Expressive\Router\Middleware\ImplicitHeadMiddleware;
use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
use Zend\Expressive\Router\Middleware\RouteMiddleware;
use Zend\Stratigility\Middleware\ErrorHandler;

trait ProjectSandboxTrait
Expand Down Expand Up @@ -210,11 +212,11 @@ protected function getAppResponse($path = '/', $setupRoutes = true)
// Import programmatic/declarative middleware pipeline and routing configuration statements
$app->pipe(ErrorHandler::class);
$app->pipe(ServerUrlMiddleware::class);
$app->pipeRoutingMiddleware();
$app->pipe(RouteMiddleware::class);
$app->pipe(ImplicitHeadMiddleware::class);
$app->pipe(ImplicitOptionsMiddleware::class);
$app->pipe(UrlHelperMiddleware::class);
$app->pipeDispatchMiddleware();
$app->pipe(DispatchMiddleware::class);
$app->pipe(NotFoundHandler::class);

if ($setupRoutes === true && $container->has(HomePageAction::class)) {
Expand Down