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

Commit

Permalink
Merge branch 'feature/zendviewrenderer-delegator'
Browse files Browse the repository at this point in the history
Close #25
  • Loading branch information
weierophinney committed Dec 3, 2015
2 parents 1c56e59 + 68da2f0 commit 99e5a97
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ Third release candidate.
the ability to specify a "minimal" install; when selected, the installer will
install modified configuration, omit some files, and remove the default
middleware and public assets.
- [#25](https://github.com/zendframework/zend-expressive-skeleton/pull/25)
updates the configuration for zend-view to include the `UrlHelperFactory` and
registration of the `ApplicationUrlDelegatorFactory` (as well as information
on how to configure Pimple to provide the same functionality as the delegator
factory).

### Deprecated

Expand All @@ -32,6 +37,8 @@ Third release candidate.
- [#21](https://github.com/zendframework/zend-expressive-skeleton/pull/21)
updates `require` statements in generated configuration files to use the
`__DIR__` constant to ensure files are located relative to the origin file.
- [#25](https://github.com/zendframework/zend-expressive-skeleton/pull/25)
updates minimum versions for each router and template implementation.

## 1.0.0rc2 - 2015-10-20

Expand Down
3 changes: 2 additions & 1 deletion composer.json
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
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
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

0 comments on commit 99e5a97

Please sign in to comment.