Skip to content

Commit

Permalink
Merge branch '3.2.x-merge-up-into-4.0.x_5fd7df28cda903.31182351' into…
Browse files Browse the repository at this point in the history
… 4.0.x
  • Loading branch information
Xerkus committed Apr 9, 2021
2 parents 150e0b4 + 88da720 commit 9510e9f
Show file tree
Hide file tree
Showing 21 changed files with 288 additions and 235 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: docs-build

on:
push:
branches:
- master
release:
types: [published]
repository_dispatch:
types: docs-build

Expand All @@ -14,4 +13,5 @@ jobs:
- name: Build Docs
uses: laminas/documentation-theme/github-actions/docs@master
env:
DOCS_DEPLOY_KEY: ${{ secrets.DOCS_DEPLOY_KEY }}
"DOCS_DEPLOY_KEY": ${{ secrets.DOCS_DEPLOY_KEY }}
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
71 changes: 71 additions & 0 deletions .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Alternate workflow example.
# This one is identical to the one in release-on-milestone.yml, with one change:
# the Release step uses the ORGANIZATION_ADMIN_TOKEN instead, to allow it to
# trigger a release workflow event. This is useful if you have other actions
# that intercept that event.

name: "Automatic Releases"

on:
milestone:
types:
- "closed"

jobs:
release:
name: "GIT tag, release & create merge-up PR"
runs-on: ubuntu-latest

steps:
- name: "Checkout"
uses: "actions/checkout@v2"

- name: "Release"
uses: "laminas/automatic-releases@v1"
with:
command-name: "laminas:automatic-releases:release"
env:
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Create Merge-Up Pull Request"
uses: "laminas/automatic-releases@v1"
with:
command-name: "laminas:automatic-releases:create-merge-up-pull-request"
env:
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Create and/or Switch to new Release Branch"
uses: "laminas/automatic-releases@v1"
with:
command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
env:
"GITHUB_TOKEN": ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Bump Changelog Version On Originating Release Branch"
uses: "laminas/automatic-releases@v1"
with:
command-name: "laminas:automatic-releases:bump-changelog"
env:
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: "Create new milestones"
uses: "laminas/automatic-releases@v1"
with:
command-name: "laminas:automatic-releases:create-milestones"
env:
"GITHUB_TOKEN": ${{ secrets.GITHUB_TOKEN }}
"SIGNING_SECRET_KEY": ${{ secrets.SIGNING_SECRET_KEY }}
"GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,27 @@ matrix:
- php: 7.3
env:
- DEPS=latest
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.4
env:
- DEPS=lowest
- php: 7.4
env:
- DEPS=latest
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 8.0
env:
- DEPS=lowest
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
- php: 8.0
env:
- DEPS=latest
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"

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

install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
Expand Down
33 changes: 24 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,41 @@ All notable changes to this project will be documented in this file, in reverse

- Nothing.

## 3.2.0 - TBD
## 3.2.0 - 2020-12-14

### Added

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

### Deprecated

- Nothing.
- [#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

### Removed

- Nothing.
- [#69](https://github.com/laminas/laminas-mvc/pull/69) Removes PHP support prior 7.3.0


-----

### Release Notes for [3.2.0](https://github.com/laminas/laminas-mvc/milestone/1)

### Fixed

- Nothing.

### 3.2.0

- Total issues resolved: **0**
- Total pull requests resolved: **2**
- Total contributors: **2**

#### Enhancement

- [69: PHP 8.0 support](https://github.com/laminas/laminas-mvc/pull/69) thanks to @snapshotpl

- [51: Deprecate middleware listener](https://github.com/laminas/laminas-mvc/pull/51) thanks to @Xerkus

## 3.1.1 - 2017-11-24

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

### Fixed

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

Expand Down Expand Up @@ -575,7 +590,7 @@ for full details on how to migrate your v2 application.
emitted by `ServiceLocatorAware` initializers; in particular, all
`AbstractController` implementations were raising a deprecation wen first
pulled from the `ControllerManager`.

At this time, notices are now only raised in the following conditions:

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

## 2.6.0 - 2015-09-22

Expand Down
12 changes: 5 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"extra": {
},
"require": {
"php": "^7.3",
"php": "^7.3 || ~8.0.0",
"laminas/laminas-eventmanager": "^3.2",
"laminas/laminas-http": "^2.11.2",
"laminas/laminas-modulemanager": "^2.8.2",
Expand All @@ -33,27 +33,25 @@
},
"require-dev": {
"http-interop/http-middleware": "^0.4.1",
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-coding-standard": "^1.0.0",
"laminas/laminas-json": "^2.6.1 || ^3.0",
"laminas/laminas-psr7bridge": "^1.2.2",
"laminas/laminas-stratigility": ">=2.0.1 <2.2",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.1.4"
"phpunit/phpunit": "^9.4.2"
},
"suggest": {
"http-interop/http-middleware": "^0.4.1 to be used together with laminas-stratigility",
"laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
"laminas/laminas-log": "^2.9.1 To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager",
"laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application",
"laminas/laminas-mvc-i18n": "laminas-mvc-i18n provides integration with laminas-i18n, including a translation bridge and translatable route segments",
"laminas/laminas-mvc-middleware": "To dispatch middleware in your laminas-mvc application",
"laminas/laminas-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads",
"laminas/laminas-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests",
"laminas/laminas-mvc-plugin-identity": "To access the authenticated identity (per laminas-authentication) in controllers",
"laminas/laminas-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers",
"laminas/laminas-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager",
"laminas/laminas-psr7bridge": "(^0.2) To consume PSR-7 middleware within the MVC workflow",
"laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application",
"laminas/laminas-stratigility": "(>=2.0.1 <2.2) laminas-stratigility is required to use middleware pipes in the MiddlewareListener"
"laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 9510e9f

Please sign in to comment.