Skip to content

Commit

Permalink
Rewriting as Laminas Project package
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Dec 31, 2019
1 parent 2a8417a commit b0b2cdb
Show file tree
Hide file tree
Showing 116 changed files with 749 additions and 3,733 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Expand Up @@ -2,7 +2,6 @@
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/composer.lock export-ignore
/docs/ export-ignore
/mkdocs.yml export-ignore
/phpcs.xml export-ignore
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
@@ -1,8 +1,9 @@
/.phpunit.result.cache
/clover.xml
/composer.lock
/coveralls-upload.json
/docs/html/
/laminas-mkdoc-theme.tgz
/laminas-mkdoc-theme/
/phpunit.xml
/vendor/
/zf-mkdoc-theme.tgz
/zf-mkdoc-theme/
13 changes: 2 additions & 11 deletions .travis.yml
Expand Up @@ -10,34 +10,25 @@ env:
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
fast_finish: true
include:
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- DEPS=latest
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPS=latest
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=locked
- php: 7.2
env:
- DEPS=latest
- php: 7.3
env:
- DEPS=lowest
- php: 7.3
env:
- DEPS=locked
- php: 7.3
env:
- DEPS=latest
Expand Down
116 changes: 58 additions & 58 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions COPYRIGHT.md
@@ -0,0 +1,2 @@
Copyright (c) 2019, Laminas Foundation.
All rights reserved. (https://getlaminas.org/)
18 changes: 9 additions & 9 deletions LICENSE.md
@@ -1,19 +1,19 @@
Copyright (c) 2017-2019, Zend Technologies USA, Inc.
Copyright (c) 2019, Laminas Foundation
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

- Neither the name of Zend Technologies USA, Inc. nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
- Neither the name of Laminas Foundation nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Expand Down
20 changes: 10 additions & 10 deletions README.md
@@ -1,9 +1,9 @@
# OAuth2 server middleware for Expressive and PSR-7 applications
# OAuth2 server middleware for Mezzio and PSR-7 applications

[![Build Status](https://secure.travis-ci.org/zendframework/zend-expressive-authentication-oauth2.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-expressive-authentication-oauth2)
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-expressive-authentication-oauth2/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-expressive-authentication-oauth2?branch=master)
[![Build Status](https://travis-ci.org/mezzio/mezzio-authentication-oauth2.svg?branch=master)](https://travis-ci.org/mezzio/mezzio-authentication-oauth2)
[![Coverage Status](https://coveralls.io/repos/github/mezzio/mezzio-authentication-oauth2/badge.svg?branch=master)](https://coveralls.io/github/mezzio/mezzio-authentication-oauth2?branch=master)

Zend-expressive-authentication-oauth2 is middleware for [Expressive](https://github.com/zendframework/zend-expressive)
Laminas-mezzio-authentication-oauth2 is middleware for [Mezzio](https://github.com/mezzio/mezzio)
and [PSR-7](http://www.php-fig.org/psr/psr-7/) applications providing an OAuth2
server for authentication.

Expand All @@ -19,19 +19,19 @@ types:

## Installation

You can install the *zend-expressive-authentication-oauth2* library with
You can install the *mezzio-authentication-oauth2* library with
composer:

```bash
$ composer require zendframework/zend-expressive-authentication-oauth2
$ composer require mezzio/mezzio-authentication-oauth2
```

## Documentation

Browse the documentation online at https://docs.zendframework.com/zend-expressive-authentication-oauth2/
Browse the documentation online at https://docs.mezzio.dev/mezzio-authentication-oauth2/

## Support

* [Issues](https://github.com/zendframework/zend-expressive-authentication-oauth2/issues/)
* [Chat](https://zendframework-slack.herokuapp.com/)
* [Forum](https://discourse.zendframework.com/)
* [Issues](https://github.com/mezzio/mezzio-authentication-oauth2/issues/)
* [Chat](https://laminas.dev/chat/)
* [Forum](https://discourse.laminas.dev/)
6 changes: 3 additions & 3 deletions bin/generate-oauth2-keys
Expand Up @@ -3,10 +3,10 @@

declare(strict_types=1);
/*
* @see https://github.com/zendframework/zend-expressive-authentication-oauth2 for the canonical source repository
* @see https://github.com/mezzio/mezzio-authentication-oauth2 for the canonical source repository
*
* @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-expressive-authentication-oauth2/blob/master/LICENSE.md
* @copyright Copyright (c) 2017 Laminas (https://www.zend.com)
* @license https://github.com/mezzio/mezzio-authentication-oauth2/blob/master/LICENSE.md
* New BSD License
*/

Expand Down
69 changes: 36 additions & 33 deletions composer.json
@@ -1,63 +1,63 @@
{
"name": "zendframework/zend-expressive-authentication-oauth2",
"description": "OAuth2 (server) authentication middleware for Expressive and PSR-7 applications.",
"name": "mezzio/mezzio-authentication-oauth2",
"description": "OAuth2 (server) authentication middleware for Mezzio and PSR-7 applications.",
"license": "BSD-3-Clause",
"keywords": [
"laminas",
"mezzio",
"authentication",
"expressive",
"http",
"middleware",
"oauth2",
"psr-7",
"zendframework",
"zf"
"psr-7"
],
"homepage": "https://mezzio.dev",
"support": {
"docs": "https://docs.zendframework.com/zend-expressive-authentication-oauth2/",
"issues": "https://github.com/zendframework/zend-expressive-authentication-oauth2/issues",
"source": "https://github.com/zendframework/zend-expressive-authentication-oauth2",
"rss": "https://github.com/zendframework/zend-expressive-authentication-oauth2/releases.atom",
"chat": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/expressive"
"docs": "https://docs.mezzio.dev/mezzio-authentication-oauth2/",
"issues": "https://github.com/mezzio/mezzio-authentication-oauth2/issues",
"source": "https://github.com/mezzio/mezzio-authentication-oauth2",
"rss": "https://github.com/mezzio/mezzio-authentication-oauth2/releases.atom",
"chat": "https://laminas.dev/chat",
"forum": "https://discourse.laminas.dev"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev",
"dev-develop": "2.1.x-dev"
},
"laminas": {
"config-provider": "Mezzio\\Authentication\\OAuth2\\ConfigProvider"
}
},
"require": {
"php": "^7.1",
"laminas/laminas-zendframework-bridge": "^1.0",
"league/oauth2-server": "^8.0.0",
"mezzio/mezzio-authentication": "^1.0",
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
"psr/http-server-middleware": "^1.0",
"zendframework/zend-expressive-authentication": "^1.0"
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^7.5.15 || ^8.3.4",
"roave/security-advisories": "dev-master",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-diactoros": "^1.4.0 || ^2.0",
"zendframework/zend-servicemanager": "^3.0.0"
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-diactoros": "^1.4.0 || ^2.0",
"laminas/laminas-servicemanager": "^3.0.0",
"phpunit/phpunit": "^7.5.15 || ^8.3.4"
},
"conflict": {
"container-interop/container-interop": "<1.2.0"
},
"autoload": {
"psr-4": {
"Zend\\Expressive\\Authentication\\OAuth2\\": "src/"
"Mezzio\\Authentication\\OAuth2\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"ZendTest\\Expressive\\Authentication\\OAuth2\\": "test/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev",
"dev-develop": "2.1.x-dev"
},
"zf": {
"config-provider": "Zend\\Expressive\\Authentication\\OAuth2\\ConfigProvider"
"MezzioTest\\Authentication\\OAuth2\\": "test/"
}
},
"bin": [
Expand All @@ -72,5 +72,8 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-expressive-authentication-oauth2": "self.version"
}
}

0 comments on commit b0b2cdb

Please sign in to comment.