Skip to content

Commit 98afab5

Browse files
committed
Merge branch 'hotfix/17-remove-router-requirement' into release-1.0.0
Forward port #17 Conflicts: composer.json composer.lock src/AuthorizationMiddlewareFactory.php
2 parents 5bf72d5 + afe1782 commit 98afab5

File tree

4 files changed

+128
-183
lines changed

4 files changed

+128
-183
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017, Zend Technologies USA, Inc.
1+
Copyright (c) 2017-2018, Zend Technologies USA, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"http-interop/http-server-middleware": "^1.0.1",
2424
"psr/container": "^1.0",
2525
"psr/http-message": "^1.0.1",
26-
"zendframework/zend-expressive-authentication": "^1.0.0-dev",
27-
"zendframework/zend-expressive-router": "^3.0.0-dev"
26+
"zendframework/zend-expressive-authentication": "^1.0.0-dev"
2827
},
2928
"require-dev": {
3029
"phpunit/phpunit": "^6.5.3",

0 commit comments

Comments
 (0)