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

Prepare for RouteResultObserver updates #25

Merged
merged 4 commits into from
Dec 3, 2015
Merged

Prepare for RouteResultObserver updates #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e874f6a
Prepare for RouteResultObserver updates
weierophinney Nov 30, 2015
3473ae0
Updated dependency constraints
weierophinney Dec 1, 2015
b47fcfc
Updated version constraints for all implementation packages
weierophinney Dec 3, 2015
d1f3e31
Use ^0.3.1 for twigrenderer
weierophinney Dec 3, 2015
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
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
}
],
"require": {
"php": "^5.5 || ^7.0",
"roave/security-advisories": "dev-master",
"zendframework/zend-expressive": "1.0.0rc2",
"zendframework/zend-expressive": "~1.0.0-dev@dev",
"zendframework/zend-stdlib": "~2.7"
},
"require-dev": {
Expand Down
18 changes: 18 additions & 0 deletions src/Composer/Resources/config/templates-zend-view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,28 @@

return [
'dependencies' => [
/*
* Note: delegator_factories only work with zend-servicemanager.
*
* To get equivalent functionality with Pimple, add the following to your
* config/container.php file:
*
* $container->extend(Zend\Expressive\Application::class, function ($app, $container) {
* $app->attachRouteResultObserver($container->get(Zend\Expressive\ZendView\UrlHelper::class));
* return $app;
* });
*/
'delegator_factories' => [
Zend\Expressive\Application::class => [
Zend\Expressive\ZendView\ApplicationUrlDelegatorFactory::class,
],
],
'factories' => [
'Zend\Expressive\FinalHandler' =>
Zend\Expressive\Container\TemplatedErrorHandlerFactory::class,

Zend\Expressive\ZendView\UrlHelper::class => Zend\Expressive\ZendView\UrlHelperFactory::class,

Zend\Expressive\Template\TemplateRendererInterface::class =>
Zend\Expressive\ZendView\ZendViewRendererFactory::class,
],
Expand Down
12 changes: 6 additions & 6 deletions src/Composer/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
'filp/whoops' => '^1.1',
'mouf/pimple-interop' => '^1.0',
'ocramius/proxy-manager' => '^1.0',
'zendframework/zend-expressive-aurarouter' => '^0.2',
'zendframework/zend-expressive-fastroute' => '^0.2',
'zendframework/zend-expressive-platesrenderer' => '^0.2',
'zendframework/zend-expressive-twigrenderer' => '^0.2',
'zendframework/zend-expressive-zendrouter' => '^0.2',
'zendframework/zend-expressive-zendviewrenderer' => '^0.2',
'zendframework/zend-expressive-aurarouter' => '^0.3',
'zendframework/zend-expressive-fastroute' => '^0.3',
'zendframework/zend-expressive-platesrenderer' => '^0.3',
'zendframework/zend-expressive-twigrenderer' => '^0.3.1',
'zendframework/zend-expressive-zendrouter' => '^0.3',
'zendframework/zend-expressive-zendviewrenderer' => '^0.3.1',
'zendframework/zend-servicemanager' => '^2.5',
],

Expand Down