Skip to content

Commit

Permalink
Update license, simplify and clean up composer.json
Browse files Browse the repository at this point in the history
  • Loading branch information
bradjones1 committed May 24, 2016
1 parent 723a7e7 commit 8958de3
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 23 deletions.
14 changes: 14 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Original Copyright (c) 2015, Ivan Novakov <[email protected]>
Portions Copyright (c) 2016, Brad Jones <[email protected]>
All rights reserved.

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

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

2. 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.

3. Neither the name of the copyright holder 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 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ The library has been tested successfully with the following identity providers:

## Requirements

* Zend Framework >= 2.2.1

## Documentation

* [API docs](http://debug.cz/apidoc/php-openid-connect-client/)
* Zend Framework >= 2.2.1 (resolved in composer.json)

## Installation

Expand Down Expand Up @@ -229,8 +225,7 @@ OAuth2:

## License

- [BSD-3-Clause](http://debug.cz/license/bsd-3-clause)

- BSD 3-Clause

## Author

Expand Down
28 changes: 12 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"description" : "OAuth2/OpenID Connect client library",
"type": "library",
"license": "BSD-3-Clause",
"homepage": "https://github.com/ivan-novakov/php-openid-connect-client",
"homepage": "https://github.com/bradjonesllc/php-openid-connect-client",

"keywords": [
"oauth2",
"openid connect",
Expand All @@ -15,17 +15,14 @@
"zf2",
"zend framework"
],

"authors": [{
"name": "Ivan Novakov",
"homepage": "http://novakov.cz/"
}],

"repositories": [{
"type": "composer",
"url": "https://packages.zendframework.com/"
}],


"authors": [
{
"name": "Ivan Novakov",
"homepage": "http://novakov.cz/"
}
],

"require" : {
"php" : ">=5.3.3",
"zendframework/zend-eventmanager" : ">=2.2.1",
Expand All @@ -35,7 +32,7 @@
"zendframework/zend-session" : ">=2.2.1",
"zendframework/zend-json" : ">=2.2.1"
},

"require-dev": {
"phpunit/phpunit": "~4.4"
},
Expand All @@ -45,5 +42,4 @@
"InoOicClient\\" : "src/"
}
}

}
}

0 comments on commit 8958de3

Please sign in to comment.