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

Router rewrite for PSR-7 #40

Open
wants to merge 47 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
cbc7fc8
Bump minimum php to 7.1
Xerkus Oct 12, 2017
eecaa4f
Add strict types declaration
Xerkus Feb 3, 2018
0fd81c3
Remove unneeded composer conflict
Xerkus Nov 18, 2017
055d799
Fix or suppress type errors
Xerkus Oct 12, 2017
ec527bf
Bumped to next dev version (4.0.0)
Xerkus Feb 3, 2018
61bf30d
Add CHANGELOG for #44
Xerkus Feb 3, 2018
d00b9d4
Be strict about unintentional coverage
Xerkus Nov 18, 2017
db83d16
Drop zend-http and add diactoros
Xerkus Feb 3, 2018
17c0468
Drop deprecated Wildcard route
Xerkus Feb 3, 2018
afa0528
Move TreeRouteStack one namespace up
Xerkus Mar 3, 2018
94408c8
Introduce RouteResult, deprecate RouteMatch
Xerkus Mar 4, 2018
627a9d9
Change RouteInterface to PSR-7
Xerkus Mar 3, 2018
497abca
Route stack refactor stub
Xerkus Mar 4, 2018
1de5477
Drop translator aware route stack
Xerkus Mar 4, 2018
6dce941
Rename Zend\Router\Http namespace to Zend\Router\Route: move files
Xerkus Mar 4, 2018
a25f0c5
Rename Zend\Router\Http namespace to Zend\Router\Route
Xerkus Mar 4, 2018
81d4529
Add PartialRouteTrait for common match() implementation
Xerkus Mar 5, 2018
8d80862
Add helper class and traits for route testing
Xerkus Mar 6, 2018
b83e9fc
Refactor Literal route for PSR-7
Xerkus Mar 6, 2018
0f7b74f
Refactor Hostname route for PSR-7
Xerkus Mar 6, 2018
880cbc4
Delete child route match
Xerkus Mar 6, 2018
354e5dd
Refactor Method route for PSR-7
Xerkus Mar 6, 2018
c2df89b
Refactor Scheme route for PSR-7
Xerkus Mar 6, 2018
0ad59c3
Refactor Segment route for PSR-7
Xerkus Mar 7, 2018
5721438
Refactor Regex route for PSR-7
Xerkus Mar 7, 2018
1e31a6f
Update PartialRouteResult and add allowed methods for successful match
Xerkus Mar 7, 2018
296764a
Make Method route provide allowed methods on match
Xerkus Mar 7, 2018
5855c61
Refactor Part route for PSR-7
Xerkus Mar 7, 2018
a5e4f70
Refactor Chain route for PSR-7
Xerkus Mar 7, 2018
e4a8cc7
Remove now redundant HttpRouterFactory
Xerkus Mar 7, 2018
01e3aad
Add route definitions to RoutePluginManager and update factory
Xerkus Mar 8, 2018
6b16272
Initial implementation for route config factory
Xerkus Mar 12, 2018
e0561e7
Move chain workaround to chain route factory
Xerkus Mar 12, 2018
94b1a5d
Add psr container to direct dependencies
Xerkus Mar 14, 2018
4ce4729
Remove prototypes from factory and accept as extra parameter instead
Xerkus Mar 14, 2018
1b52b4b
Add Router class and its factory
Xerkus Mar 14, 2018
d2634f9
Reintroduce TranslatorAwareRouteStackDecorator inplace of dropped tre…
Xerkus Mar 14, 2018
8196c4e
Drop unused RouterFactory
Xerkus Mar 14, 2018
af430fd
Improve tests for route plugin manager factory
Xerkus Mar 14, 2018
f2aa83c
Increment assertion count for test not doing assertions by intention
Xerkus Mar 14, 2018
2c2bad5
Remove service manager v2 support in RouteInvokableFactory
Xerkus Mar 14, 2018
d11ff0f
Remove unused test assets
Xerkus Mar 14, 2018
7c95e06
Comment out and keep test for ambiguous use case having less desired …
Xerkus Mar 14, 2018
c342542
Remove obsolete RouterConfigTrait
Xerkus Mar 14, 2018
14a1b51
Apply cs fixes
Xerkus Mar 14, 2018
f889b95
Update copyright headers
Xerkus Mar 14, 2018
08f6307
Add RouteConfigFactory factory
Xerkus Mar 29, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,6 @@ env:

matrix:
include:
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 5.6
env:
- DEPS=latest
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
Expand All @@ -58,8 +38,7 @@ 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
- travis_retry composer install $COMPOSER_ARGS
- 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
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

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

## 4.0.0 - TBD

### Added

- Nothing.

### Changed

- Nothing.

### Deprecated

- Nothing.

### Removed

- [#44](https://github.com/zendframework/zend-router/pull/44) removes support
for PHP versions prior to PHP 7.1.

### Fixed

- Nothing.

## 3.1.0 - TBD

### Added
Expand Down
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,20 @@ request and responses, and provides capabilities around:
Additionally, it supports combinations of different route types in tree
structures, allowing for fast, b-tree lookups.

- File issues at https://github.com/zendframework/zend-router/issues
- Documentation is at https://docs.zendframework.com/zend-router
## Installation

Run the following to install this library:

```bash
$ composer require zendframework/zend-router
```

## Documentation

Documentation is [in the doc tree](docs/book/), and can be compiled using [mkdocs](http://www.mkdocs.org):

```bash
$ mkdocs build
```

You may also [browse the documentation online](https://docs.zendframework.com/zend-router/).
16 changes: 7 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"zf",
"zend",
"zendframework",
"mvc",
"routing"
],
"support": {
Expand All @@ -18,20 +17,19 @@
"forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
"php": "^5.6 || ^7.0",
"php": "^7.1",
"container-interop/container-interop": "^1.2",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can use psr/container (PSR-11), or we need first SMv4?

"zendframework/zend-http": "^2.6",
"zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
"zendframework/zend-stdlib": "^2.7.7 || ^3.1"
"psr/container": "^1.0",
"psr/http-message": "^1.0",
"zendframework/zend-diactoros": "^1.7",
"zendframework/zend-servicemanager": "^3.3",
"zendframework/zend-stdlib": "^3.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.22 || ^6.4.1",
"phpunit/phpunit": "^7.0",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-i18n": "^2.7.4"
},
"conflict": {
"zendframework/zend-mvc": "<3.0.0"
},
"suggest": {
"zendframework/zend-i18n": "^2.7.4, if defining translatable HTTP path segments"
},
Expand Down
Loading