Skip to content

Commit

Permalink
Merge branch 'hotfix/17-remove-router-requirement'
Browse files Browse the repository at this point in the history
Close #17
  • Loading branch information
weierophinney committed Feb 7, 2018
2 parents 8baf929 + afe1782 commit 9d4dcb4
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 149 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
@@ -1,4 +1,4 @@
Copyright (c) 2017, Zend Technologies USA, Inc.
Copyright (c) 2017-2018, Zend Technologies USA, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Expand Up @@ -24,8 +24,7 @@
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
"webimpress/http-middleware-compatibility": "^0.1.1",
"zendframework/zend-expressive-authentication": "^0.2 || ^1.0",
"zendframework/zend-expressive-router": "^2.2"
"zendframework/zend-expressive-authentication": "^0.2 || ^1.0"
},
"require-dev": {
"phpunit/phpunit": "^6.4.3",
Expand Down
183 changes: 40 additions & 143 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions src/AuthorizationMiddlewareFactory.php
@@ -1,15 +1,13 @@
<?php
/**
* @see https://github.com/zendframework/zend-expressive-authorization for the canonical source repository
* @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2017-2018 Zend Technologies USA Inc. (https://www.zend.com)
* @license https://github.com/zendframework/zend-expressive-authorization/blob/master/LICENSE.md New BSD License
*/

namespace Zend\Expressive\Authorization;

use Psr\Container\ContainerInterface;
use Psr\Http\Message\ResponseInterface;
use Zend\Diactoros\Response;
use Zend\Expressive\Authentication\ResponsePrototypeTrait;

class AuthorizationMiddlewareFactory
Expand Down

0 comments on commit 9d4dcb4

Please sign in to comment.