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

Commit 8d0cf75

Browse files
weierophinneyweierophinney
committed
Merging release-2.0.0 to develop
Conflicts: CHANGELOG.md
2 parents 5d7ff0a + 84572c1 commit 8d0cf75

23 files changed

+726
-558
lines changed

‎.docheader

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/**
22
* @see https://github.com/zendframework/zend-expressive-zendviewrenderer for the canonical source repository
3-
* @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (http://www.zend.com)
3+
* @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (https://www.zend.com)
44
* @license https://github.com/zendframework/zend-expressive-zendviewrenderer/blob/master/LICENSE.md New BSD License
55
*/
6+
7+
declare(strict_types=1);

‎.travis.yml

Lines changed: 1 addition & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,6 @@ env:
1313

1414
matrix:
1515
include:
16-
- php: 5.6
17-
env:
18-
- DEPS=lowest
19-
- php: 5.6
20-
env:
21-
- DEPS=locked
22-
- LEGACY_DEPS="phpunit/phpunit"
23-
- php: 5.6
24-
env:
25-
- DEPS=locked
26-
- LEGACY_DEPS="phpunit/phpunit"
27-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
28-
- php: 5.6
29-
env:
30-
- DEPS=locked
31-
- LEGACY_DEPS="phpunit/phpunit"
32-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
33-
- php: 5.6
34-
env:
35-
- DEPS=latest
36-
- php: 7
37-
env:
38-
- DEPS=lowest
39-
- php: 7
40-
env:
41-
- DEPS=locked
42-
- LEGACY_DEPS="phpunit/phpunit"
43-
- php: 7
44-
env:
45-
- DEPS=locked
46-
- LEGACY_DEPS="phpunit/phpunit"
47-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
48-
- php: 7
49-
env:
50-
- DEPS=locked
51-
- LEGACY_DEPS="phpunit/phpunit"
52-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
53-
- php: 7
54-
env:
55-
- DEPS=latest
5616
- php: 7.1
5717
env:
5818
- DEPS=lowest
@@ -61,14 +21,6 @@ matrix:
6121
- DEPS=locked
6222
- CS_CHECK=true
6323
- TEST_COVERAGE=true
64-
- php: 7.1
65-
env:
66-
- DEPS=locked
67-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
68-
- php: 7.1
69-
env:
70-
- DEPS=locked
71-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
7224
- php: 7.1
7325
env:
7426
- DEPS=latest
@@ -78,14 +30,6 @@ matrix:
7830
- php: 7.2
7931
env:
8032
- DEPS=locked
81-
- php: 7.2
82-
env:
83-
- DEPS=locked
84-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
85-
- php: 7.2
86-
env:
87-
- DEPS=locked
88-
- HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
8933
- php: 7.2
9034
env:
9135
- DEPS=latest
@@ -94,11 +38,9 @@ before_install:
9438
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
9539

9640
install:
97-
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
98-
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
41+
- travis_retry composer install $COMPOSER_ARGS
9942
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
10043
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
101-
- if [[ $HELPER_DEPS != '' ]]; then travis_retry composer require $COMPOSER_ARGS --update-with-dependencies $HELPER_DEPS ; fi
10244
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
10345
- stty cols 120 && composer show
10446

‎CHANGELOG.md

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,61 @@
22

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

5-
## 1.5.0 - TBD
5+
## 2.0.0 - 2018-03-15
66

77
### Added
88

9-
- Nothing.
9+
- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46) and
10+
[#52](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/52)
11+
add support for the zend-expressive-template v2 series,
12+
zend-expressive-router v3 series, and zend-expressive-helpers v5 series.
13+
14+
- [#47](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/47)
15+
adds a `ConfigProvider` class with default service wiring and configuration
16+
for the component. It also updates `composer.json` to add
17+
`extra.zf.config-provider` configuration to notify zend-component-installer
18+
of the shipped `ConfigProvider` class, allowing the plugin to inject the
19+
`ConfigProvider` in your application configuration during initial
20+
installation.
1021

1122
### Changed
1223

13-
- Nothing.
24+
- [#37](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/37)
25+
adds support for PSR-11. All exception types that previously extended from
26+
container-interop exceptions now extend from PSR-11 exception interfaces,
27+
and factories typehint against the PSR-11 `ContainerInterface`.
28+
29+
- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
30+
updates all classes to use scalar and return type hints, including nullable
31+
and void types. If you were extending classes from this package, you may need
32+
to update signatures of methods you override.
33+
34+
- [#45](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/45)
35+
updates the `ExceptionInterface` to extend from the `ExceptionInterface`
36+
provided in zend-expressive-template.
1437

1538
### Deprecated
1639

1740
- Nothing.
1841

1942
### Removed
2043

21-
- Nothing.
44+
- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
45+
removes support for PHP versions prior to PHP 7.1.
46+
47+
- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
48+
removes support for zend-expressive-template versions prior to v2.
49+
50+
- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
51+
removes support for zend-expressive-router versions prior to v3.
52+
53+
- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
54+
removes support for zend-expressive-helpers versions prior to v5.
2255

2356
### Fixed
2457

25-
- Nothing.
58+
- [#53](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/53)
59+
adds the missing default layout.
2660

2761
## 1.4.2 - 2018-03-15
2862

@@ -297,7 +331,7 @@ First stable release.
297331
- [#11](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/11)
298332
adds a factory for providing the `HelperPluginManager`, and support in the
299333
`ZendViewRendererFactory` for injecting the `HelperPluginManager` service
300-
(using its FQCN) instead of instantiating one directly.
334+
(using its FQCN) instead of instantiating one directly.
301335
- [#13](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/13)
302336
adds `zendframework/zend-expressive-helpers` as a dependency, in order to
303337
consume its `UrlHelper` and `ServerUrlHelper` implementations.

‎composer.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,23 @@
2020
"forum": "https://discourse.zendframework.com/c/questions/expressive"
2121
},
2222
"require": {
23-
"php": "^5.6 || ^7.0",
24-
"container-interop/container-interop": "^1.2",
23+
"php": "^7.1",
24+
"psr/container": "^1.0",
2525
"psr/http-message": "^1.0.1",
26-
"zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0",
27-
"zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
28-
"zendframework/zend-expressive-template": "^1.0.4",
26+
"zendframework/zend-expressive-helpers": "^5.0",
27+
"zendframework/zend-expressive-router": "^3.0",
28+
"zendframework/zend-expressive-template": "^2.0",
2929
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
3030
"zendframework/zend-view": "^2.8.1"
3131
},
3232
"require-dev": {
3333
"malukenho/docheader": "^0.1.5",
34-
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
34+
"phpunit/phpunit": "^7.0.2",
3535
"zendframework/zend-coding-standard": "~1.0.0"
3636
},
37+
"conflict": {
38+
"container-interop/container-interop": "<1.2.0"
39+
},
3740
"autoload": {
3841
"psr-4": {
3942
"Zend\\Expressive\\ZendView\\": "src/"
@@ -49,9 +52,11 @@
4952
},
5053
"extra": {
5154
"branch-alias": {
52-
"dev-master": "1.4.x-dev",
53-
"dev-develop": "1.5.x-dev",
54-
"dev-release-2.0.0": "2.0.x-dev"
55+
"dev-master": "2.0.x-dev",
56+
"dev-develop": "2.1.x-dev"
57+
},
58+
"zf": {
59+
"config-provider": "Zend\\Expressive\\ZendView\\ConfigProvider"
5560
}
5661
},
5762
"scripts": {

0 commit comments

Comments
 (0)