Skip to content

Commit 9510e9f

Browse files
committed
Merge branch '3.2.x-merge-up-into-4.0.x_5fd7df28cda903.31182351' into 4.0.x
2 parents 150e0b4 + 88da720 commit 9510e9f

21 files changed

+288
-235
lines changed

.github/workflows/docs-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: docs-build
22

33
on:
4-
push:
5-
branches:
6-
- master
4+
release:
5+
types: [published]
76
repository_dispatch:
87
types: docs-build
98

@@ -14,4 +13,5 @@ jobs:
1413
- name: Build Docs
1514
uses: laminas/documentation-theme/github-actions/docs@master
1615
env:
17-
DOCS_DEPLOY_KEY: ${{ secrets.DOCS_DEPLOY_KEY }}
16+
"DOCS_DEPLOY_KEY": ${{ secrets.DOCS_DEPLOY_KEY }}
17+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Alternate workflow example.
2+
# This one is identical to the one in release-on-milestone.yml, with one change:
3+
# the Release step uses the ORGANIZATION_ADMIN_TOKEN instead, to allow it to
4+
# trigger a release workflow event. This is useful if you have other actions
5+
# that intercept that event.
6+
7+
name: "Automatic Releases"
8+
9+
on:
10+
milestone:
11+
types:
12+
- "closed"
13+
14+
jobs:
15+
release:
16+
name: "GIT tag, release & create merge-up PR"
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: "Checkout"
21+
uses: "actions/checkout@v2"
22+
23+
- name: "Release"
24+
uses: "laminas/automatic-releases@v1"
25+
with:
26+
command-name: "laminas:automatic-releases:release"
27+
env:
28+
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
29+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
30+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
31+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
32+
33+
- name: "Create Merge-Up Pull Request"
34+
uses: "laminas/automatic-releases@v1"
35+
with:
36+
command-name: "laminas:automatic-releases:create-merge-up-pull-request"
37+
env:
38+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
39+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
40+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
41+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
42+
43+
- name: "Create and/or Switch to new Release Branch"
44+
uses: "laminas/automatic-releases@v1"
45+
with:
46+
command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
47+
env:
48+
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
49+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
50+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
51+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
52+
53+
- name: "Bump Changelog Version On Originating Release Branch"
54+
uses: "laminas/automatic-releases@v1"
55+
with:
56+
command-name: "laminas:automatic-releases:bump-changelog"
57+
env:
58+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
59+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
60+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
61+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
62+
63+
- name: "Create new milestones"
64+
uses: "laminas/automatic-releases@v1"
65+
with:
66+
command-name: "laminas:automatic-releases:create-milestones"
67+
env:
68+
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
69+
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
70+
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
71+
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,27 @@ matrix:
1818
- php: 7.3
1919
env:
2020
- DEPS=latest
21-
- CS_CHECK=true
22-
- TEST_COVERAGE=true
2321
- php: 7.4
2422
env:
2523
- DEPS=lowest
2624
- php: 7.4
2725
env:
2826
- DEPS=latest
27+
- CS_CHECK=true
28+
- TEST_COVERAGE=true
29+
- php: 8.0
30+
env:
31+
- DEPS=lowest
32+
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
33+
- php: 8.0
34+
env:
35+
- DEPS=latest
36+
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
2937

3038
before_install:
3139
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
3240

3341
install:
34-
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
35-
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
3642
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
3743
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
3844
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi

CHANGELOG.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,41 @@ All notable changes to this project will be documented in this file, in reverse
2424

2525
- Nothing.
2626

27-
## 3.2.0 - TBD
27+
## 3.2.0 - 2020-12-14
2828

2929
### Added
3030

31-
- [zendframework/zend-mvc#297](https://github.com/zendframework/zend-mvc/pull/297) adds support for PHP 7.3.
31+
- [#69](https://github.com/laminas/laminas-mvc/pull/69) Adds PHP 8.0 support
3232
- [zendframework/zend-mvc#282](https://github.com/zendframework/zend-mvc/pull/282) Adds a full
3333
controller namespace as additional event manager identifier for
3434
implementations of AbstractController
3535

3636
### Deprecated
3737

38-
- Nothing.
38+
- [#51](https://github.com/laminas/laminas-mvc/pull/51) Deprecates MiddlewareListener. Optional support for dispatching middleware, middleware pipes and handlers is moved to laminas/laminas-mvc-middleware package
3939

4040
### Removed
4141

42-
- Nothing.
42+
- [#69](https://github.com/laminas/laminas-mvc/pull/69) Removes PHP support prior 7.3.0
43+
44+
45+
-----
46+
47+
### Release Notes for [3.2.0](https://github.com/laminas/laminas-mvc/milestone/1)
4348

44-
### Fixed
4549

46-
- Nothing.
50+
51+
### 3.2.0
52+
53+
- Total issues resolved: **0**
54+
- Total pull requests resolved: **2**
55+
- Total contributors: **2**
56+
57+
#### Enhancement
58+
59+
- [69: PHP 8.0 support](https://github.com/laminas/laminas-mvc/pull/69) thanks to @snapshotpl
60+
61+
- [51: Deprecate middleware listener](https://github.com/laminas/laminas-mvc/pull/51) thanks to @Xerkus
4762

4863
## 3.1.1 - 2017-11-24
4964

@@ -121,7 +136,7 @@ All notable changes to this project will be documented in this file, in reverse
121136

122137
### Fixed
123138

124-
- [zendframework/zend-mvc#210](https://github.com/zendframework/zend-mvc/pull/210) copies the
139+
- [zendframework/zend-mvc#210](https://github.com/zendframework/zend-mvc/pull/210) copies the
125140
`RouteMatch` and its parameters to the PSR-7 `ServerRequest` object so that
126141
they are available to middleware.
127142

@@ -575,7 +590,7 @@ for full details on how to migrate your v2 application.
575590
emitted by `ServiceLocatorAware` initializers; in particular, all
576591
`AbstractController` implementations were raising a deprecation wen first
577592
pulled from the `ControllerManager`.
578-
593+
579594
At this time, notices are now only raised in the following conditions:
580595

581596
- When a non-controller, non-plugin manager, `ServiceLocatorAware` instance
@@ -742,7 +757,7 @@ for full details on how to migrate your v2 application.
742757
`HydratorPluginManager` will be pulled from laminas-hydrator, by updating your
743758
typehints to use the laminas-hydrator classes instead of those from laminas-stdlib;
744759
the instances returned from the laminas-stdlib `HydratorPluginManager`, because
745-
they extend those from laminas-hydrator, remain compatible.
760+
they extend those from laminas-hydrator, remain compatible.
746761

747762
## 2.6.0 - 2015-09-22
748763

composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"extra": {
2222
},
2323
"require": {
24-
"php": "^7.3",
24+
"php": "^7.3 || ~8.0.0",
2525
"laminas/laminas-eventmanager": "^3.2",
2626
"laminas/laminas-http": "^2.11.2",
2727
"laminas/laminas-modulemanager": "^2.8.2",
@@ -33,27 +33,25 @@
3333
},
3434
"require-dev": {
3535
"http-interop/http-middleware": "^0.4.1",
36-
"laminas/laminas-coding-standard": "~1.0.0",
36+
"laminas/laminas-coding-standard": "^1.0.0",
3737
"laminas/laminas-json": "^2.6.1 || ^3.0",
3838
"laminas/laminas-psr7bridge": "^1.2.2",
3939
"laminas/laminas-stratigility": ">=2.0.1 <2.2",
4040
"phpspec/prophecy-phpunit": "^2.0",
41-
"phpunit/phpunit": "^9.1.4"
41+
"phpunit/phpunit": "^9.4.2"
4242
},
4343
"suggest": {
44-
"http-interop/http-middleware": "^0.4.1 to be used together with laminas-stratigility",
4544
"laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
4645
"laminas/laminas-log": "^2.9.1 To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager",
4746
"laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application",
4847
"laminas/laminas-mvc-i18n": "laminas-mvc-i18n provides integration with laminas-i18n, including a translation bridge and translatable route segments",
48+
"laminas/laminas-mvc-middleware": "To dispatch middleware in your laminas-mvc application",
4949
"laminas/laminas-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads",
5050
"laminas/laminas-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests",
5151
"laminas/laminas-mvc-plugin-identity": "To access the authenticated identity (per laminas-authentication) in controllers",
5252
"laminas/laminas-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers",
5353
"laminas/laminas-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager",
54-
"laminas/laminas-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow",
55-
"laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application",
56-
"laminas/laminas-stratigility": "(>=2.0.1 <2.2) laminas-stratigility is required to use middleware pipes in the MiddlewareListener"
54+
"laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application"
5755
},
5856
"autoload": {
5957
"psr-4": {

0 commit comments

Comments
 (0)