From 2ba40c219588953d9ff23e8af7778e154e6e25cd Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Sat, 10 Oct 2015 22:47:28 -0500 Subject: [PATCH] Updated to zend-expressive 0.5 Updates to zend-expressive 0.5, which separates the various routers and template renderers into dedicated packages. This patch also updates the composer installer to reference the new packages to ensure installation works as expected. Initial smoke tests show the approach works! --- composer.json | 2 +- .../Resources/config/templates-plates.php | 2 +- .../Resources/config/templates-twig.php | 2 +- .../Resources/config/templates-zend-view.php | 2 +- src/Composer/config.php | 40 ++++++++----------- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index b3ffae8..22d0773 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "roave/security-advisories": "dev-master", - "zendframework/zend-expressive": "^0.4" + "zendframework/zend-expressive": "^0.5" }, "require-dev": { "composer/composer": ">=1.0.0-alpha10", diff --git a/src/Composer/Resources/config/templates-plates.php b/src/Composer/Resources/config/templates-plates.php index 5c9b349..d2a7e1e 100644 --- a/src/Composer/Resources/config/templates-plates.php +++ b/src/Composer/Resources/config/templates-plates.php @@ -7,7 +7,7 @@ Zend\Expressive\Container\TemplatedErrorHandlerFactory::class, Zend\Expressive\Template\TemplateRendererInterface::class => - Zend\Expressive\Container\Template\PlatesRendererFactory::class, + Zend\Expressive\Plates\PlatesRendererFactory::class, ], ], diff --git a/src/Composer/Resources/config/templates-twig.php b/src/Composer/Resources/config/templates-twig.php index 06bfc2d..34ba515 100644 --- a/src/Composer/Resources/config/templates-twig.php +++ b/src/Composer/Resources/config/templates-twig.php @@ -7,7 +7,7 @@ Zend\Expressive\Container\TemplatedErrorHandlerFactory::class, Zend\Expressive\Template\TemplateRendererInterface::class => - Zend\Expressive\Container\Template\TwigRendererFactory::class, + Zend\Expressive\Twig\TwigRendererFactory::class, ], ], diff --git a/src/Composer/Resources/config/templates-zend-view.php b/src/Composer/Resources/config/templates-zend-view.php index 67e461d..5752b23 100644 --- a/src/Composer/Resources/config/templates-zend-view.php +++ b/src/Composer/Resources/config/templates-zend-view.php @@ -7,7 +7,7 @@ Zend\Expressive\Container\TemplatedErrorHandlerFactory::class, Zend\Expressive\Template\TemplateRendererInterface::class => - Zend\Expressive\Container\Template\ZendViewRendererFactory::class, + Zend\Expressive\ZendView\ZendViewRendererFactory::class, ], ], diff --git a/src/Composer/config.php b/src/Composer/config.php index d510297..19535cb 100644 --- a/src/Composer/config.php +++ b/src/Composer/config.php @@ -2,20 +2,17 @@ return [ 'packages' => [ - 'aura/di' => '3.0.*@beta', - 'aura/router' => '^2.3', - 'filp/whoops' => '^1.1', - 'league/plates' => '^3.1', - 'mouf/pimple-interop' => '^1.0', - 'nikic/fast-route' => '^0.6.0', - 'ocramius/proxy-manager' => '^1.0', - 'twig/twig' => '^1.21', - 'zendframework/zend-filter' => '^2.5', - 'zendframework/zend-i18n' => '^2.5', - 'zendframework/zend-mvc' => '^2.5', - 'zendframework/zend-psr7bridge' => '^0.1.0', - 'zendframework/zend-servicemanager' => '^2.5', - 'zendframework/zend-view' => '^2.5', + 'aura/di' => '3.0.*@beta', + 'filp/whoops' => '^1.1', + 'mouf/pimple-interop' => '^1.0', + 'ocramius/proxy-manager' => '^1.0', + 'zendframework/zend-expressive-aurarouter' => '^0.1', + 'zendframework/zend-expressive-fastroute' => '^0.1', + 'zendframework/zend-expressive-platesrenderer' => '^0.1', + 'zendframework/zend-expressive-twigrenderer' => '^0.1', + 'zendframework/zend-expressive-zendrouter' => '^0.1', + 'zendframework/zend-expressive-zendviewrenderer' => '^0.1', + 'zendframework/zend-servicemanager' => '^2.5', ], 'require-dev' => [ @@ -36,7 +33,7 @@ 1 => [ 'name' => 'Aura.Router', 'packages' => [ - 'aura/router', + 'zendframework/zend-expressive-aurarouter', ], 'copy-files' => [ // Copy source file to target: '' => '' @@ -46,7 +43,7 @@ 2 => [ 'name' => 'FastRoute', 'packages' => [ - 'nikic/fast-route', + 'zendframework/zend-expressive-fastroute', ], 'copy-files' => [ '/Resources/config/routes-fast-route.php' => '/config/autoload/routes.global.php', @@ -55,8 +52,7 @@ 3 => [ 'name' => 'Zend Router', 'packages' => [ - 'zendframework/zend-mvc', - 'zendframework/zend-psr7bridge', + 'zendframework/zend-expressive-zendrouter', ], 'copy-files' => [ '/Resources/config/routes-zf2-router.php' => '/config/autoload/routes.global.php', @@ -112,7 +108,7 @@ 1 => [ 'name' => 'Plates', 'packages' => [ - 'league/plates', + 'zendframework/zend-expressive-platesrenderer', ], 'copy-files' => [ '/Resources/config/templates-plates.php' => '/config/autoload/templates.global.php', @@ -125,7 +121,7 @@ 2 => [ 'name' => 'Twig', 'packages' => [ - 'twig/twig', + 'zendframework/zend-expressive-twigrenderer', ], 'copy-files' => [ '/Resources/config/templates-twig.php' => '/config/autoload/templates.global.php', @@ -138,10 +134,8 @@ 3 => [ 'name' => 'Zend View installs Zend ServiceManager', 'packages' => [ - 'zendframework/zend-view', - 'zendframework/zend-filter', + 'zendframework/zend-expressive-zendviewrenderer', 'zendframework/zend-i18n', - 'zendframework/zend-servicemanager', ], 'copy-files' => [ '/Resources/config/templates-zend-view.php' => '/config/autoload/templates.global.php',