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

Commit 87e12a1

Browse files
committed
Merge branch 'hotfix/route-result-observer'
Close #12
2 parents 6bf85fb + 449348d commit 87e12a1

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 0.3.1 - TBD
5+
## 0.3.1 - 2015-12-03
66

77
### Added
88

@@ -18,7 +18,12 @@ All notable changes to this project will be documented in this file, in reverse
1818

1919
### Fixed
2020

21-
- Nothing.
21+
- [#12](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/12)
22+
updates the `UrlHelper` to implement the `Zend\Expressive\RouteResultObserverInterface`
23+
from the zendframework/zend-expressive package, instead of
24+
`Zend\Expressive\Router\RouteResultObserverInterface` from the
25+
zendframework/zend-expressive-router package (as it is now
26+
[deprecated](https://github.com/zendframework/zend-expressive-router/pull/3).
2227

2328
## 0.3.0 - 2015-12-02
2429

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818
},
1919
"require": {
20-
"php": ">=5.5",
20+
"php": "^5.5 || ^7.0",
2121
"container-interop/container-interop": "^1.1",
2222
"psr/http-message": "^1.0",
2323
"zendframework/zend-expressive-router": "^1.0",
@@ -31,7 +31,7 @@
3131
"phpunit/phpunit": "^4.7",
3232
"squizlabs/php_codesniffer": "^2.3",
3333
"zendframework/zend-diactoros": "^1.2",
34-
"zendframework/zend-expressive": "~1.0.0-dev@dev"
34+
"zendframework/zend-expressive": "~1.0.0-dev@dev || ^1.0"
3535
},
3636
"autoload": {
3737
"psr-4": {

src/UrlHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Zend\Expressive\Router\Exception\RuntimeException;
1111
use Zend\Expressive\Router\RouterInterface;
1212
use Zend\Expressive\Router\RouteResult;
13-
use Zend\Expressive\Router\RouteResultObserverInterface;
13+
use Zend\Expressive\RouteResultObserverInterface;
1414
use Zend\Expressive\Template\Exception\RenderingException;
1515
use Zend\View\Helper\AbstractHelper;
1616

test/UrlHelperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Zend\Expressive\Router\Exception\RuntimeException;
1515
use Zend\Expressive\Router\RouterInterface;
1616
use Zend\Expressive\Router\RouteResult;
17-
use Zend\Expressive\Router\RouteResultObserverInterface;
17+
use Zend\Expressive\RouteResultObserverInterface;
1818
use Zend\Expressive\Template\Exception;
1919
use Zend\Expressive\ZendView\UrlHelper;
2020

0 commit comments

Comments
 (0)