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

Commit

Permalink
Merge branch 'feature/backports-and-refactors' into develop
Browse files Browse the repository at this point in the history
Close #581
weierophinney committed Mar 12, 2018
2 parents fbe8be6 + 8e467db commit 073a4d6
Showing 48 changed files with 2,389 additions and 1,580 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ matrix:
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit symfony/debug"
- LEGACY_DEPS="phpunit/phpunit symfony/console symfony/debug symfony/finder"
- php: 7
env:
- DEPS=latest
@@ -65,7 +65,9 @@ install:
- 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
- if [[ $TEST_COVERAGE == 'true' ]]; then cp phpunit.xml.dist-coverage phpunit.xml.dist ; fi
- stty cols 120 && composer show
- cat phpunit.xml.dist

script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
108 changes: 108 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,114 @@

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

## 2.2.0 - 2018-03-12

### Added

- [#581](https://github.com/zendframework/zend-expressive/pull/581) adds the
class `Zend\Expressive\ConfigProvider`, and exposes it to the
zend-component-installer Composer plugin. We recommend updating your
`config/config.php` to reference it, as well as the
`Zend\Expressive\Router\ConfigProvider` shipped with zend-expressive-router
versions 2.4 and up.

- [#581](https://github.com/zendframework/zend-expressive/pull/581) adds the
class `Zend\Expressive\Container\ApplicationConfigInjectionDelegator`. The
class can act as a delegator factory, and, when enabled, will inject routes
and pipeline middleware defined in configuration.

Additionally, the class exposes two static methods:

- `injectPipelineFromConfig(Application $app, array $config)`
- `injectRoutesFromConfig(Application $app, array $config)`

These may be called to modify an `Application` instance based on an array of
configuration. See thd documentation for more details.

- [#581](https://github.com/zendframework/zend-expressive/pull/581) adds the
class `Zend\Expressive\Handler\NotFoundHandler`; the class takes over the
functionality previously provided in `Zend\Expressive\Delegate\NotFoundDelegate`.

### Changed

- [#581](https://github.com/zendframework/zend-expressive/pull/581) updates the
minimum supported zend-stratigility version to 2.2.0.

- [#581](https://github.com/zendframework/zend-expressive/pull/581) updates the
minimum supported zend-expressive-router version to 2.4.0.

### Deprecated

- [#581](https://github.com/zendframework/zend-expressive/pull/581) deprecates
the following classes and traits:

- `Zend\Expressive\AppFactory`: if you are using this, you will need to switch
to direct usage of `Zend\Expressive\Application` or a
`Zend\Stratigility\MiddlewarePipe` instance.

- `Zend\Expressive\ApplicationConfigInjectionTrait`: if you are using it, it is
marked internal, and deprecated; it will be removed in version 3.

- `Zend\Expressive\Container\NotFoundDelegateFactory`: the `NotFoundDelegate`
will be renamed to `Zend\Expressive\Handler\NotFoundHandler` in version 3,
making this factory obsolete.

- `Zend\Expressive\Delegate\NotFoundDelegate`: this class becomes
`Zend\Expressive\Handler\NotFoundHandler` in v3, and the new class is added in
version 2.2 as well.

- `Zend\Expressive\Emitter\EmitterStack`: the emitter concept is extracted from
zend-diactoros to a new component, zend-httphandlerrunner. This latter
component is used in version 3, and defines the `EmitterStack` class. Unless
you are extending it or interacting with it directly, this change should not
affect you; the `Zend\Diactoros\Response\EmitterInterface` service will be
directed to the new class in that version.

- `Zend\Expressive\IsCallableInteropMiddlewareTrait`: if you are using it, it is
marked internal, and deprecated; it will be removed in version 3.

- `Zend\Expressive\MarshalMiddlewareTrait`: if you are using it, it is marked
internal, and deprecated; it will be removed in version 3.

- `Zend\Expressive\Middleware\DispatchMiddleware`: this functionality has been
moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
namespace.

- `Zend\Expressive\Middleware\ImplicitHeadMiddleware`: this functionality has been
moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
namespace.

- `Zend\Expressive\Middleware\ImplicitOptionsMiddleware`: this functionality has been
moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
namespace.

- `Zend\Expressive\Middleware\NotFoundHandler`: this will be removed in
version 3, where you can instead pipe `Zend\Expressive\Handler\NotFoundHandler`
directly instead.

- `Zend\Expressive\Middleware\RouteMiddleware`: this functionality has been
moved to zend-expressive-router, under the `Zend\Expressive\Router\Middleware`
namespace.

- [#581](https://github.com/zendframework/zend-expressive/pull/581) deprecates
the following methods from `Zend\Expressive\Application`:
- `pipeRoutingMiddleware()`
- `pipeDispatchMiddleware()`
- `getContainer()`: this method is removed in version 3; container access will only be via the bootstrap.
- `getDefaultDelegate()`: the concept of a default delegate is removed in version 3.
- `getEmitter()`: emitters move to a different collaborator in version 3.
- `injectPipelineFromConfig()` andd `injectRoutesFromConfig()` are methods
defined by the `ApplicationConfigInjectionTrait`, which will be removed in
version 3. Use the `ApplicationConfigInjectionDelegator` instead.

### Removed

- Nothing.

### Fixed

- Nothing.

## 2.1.1 - 2018-03-09

### Added
13 changes: 8 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -27,19 +27,19 @@
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
"zendframework/zend-diactoros": "^1.3.10",
"zendframework/zend-expressive-router": "^2.1",
"zendframework/zend-expressive-router": "^2.4.1",
"zendframework/zend-expressive-template": "^1.0.4",
"zendframework/zend-stratigility": "^2.0.1"
"zendframework/zend-stratigility": "^2.2.0"
},
"require-dev": {
"filp/whoops": "^2.1.6 || ^1.1.10",
"malukenho/docheader": "^0.1.5",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-expressive-aurarouter": "^2.0",
"zendframework/zend-expressive-fastroute": "^2.0",
"zendframework/zend-expressive-zendrouter": "^2.0.1",
"zendframework/zend-expressive-aurarouter": "^2.2",
"zendframework/zend-expressive-fastroute": "^2.2",
"zendframework/zend-expressive-zendrouter": "^2.2",
"zendframework/zend-servicemanager": "^3.3 || ^2.7.8"
},
"conflict": {
@@ -74,6 +74,9 @@
"dev-master": "2.1.x-dev",
"dev-develop": "2.2.x-dev",
"dev-release-3.0.0": "3.0.x-dev"
},
"zf": {
"config-provider": "Zend\\Expressive\\ConfigProvider"
}
},
"bin": [
Loading

0 comments on commit 073a4d6

Please sign in to comment.