Merge branch 'v4.0.0-WIP' into develop

Conflicts:
	.gitignore
	.travis.yml
	README.md
	composer.json
	phpunit.xml
	sql/mysql.sql
	src/League/OAuth2/Server/Grant/RefreshToken.php
	src/League/OAuth2/Server/Resource.php
	src/League/OAuth2/Server/Storage/SessionInterface.php
	src/League/OAuth2/Server/Util/Request.php
	src/Util/KeyAlgorithm/DefaultAlgorithm.php
	tests/resource/ResourceServerTest.php
	tests/util/RedirectUriTest.php
	tests/util/RequestTest.php
	tests/util/SecureKeyTest.php
This commit is contained in:
Alex Bilbie
2014-08-06 09:21:56 +01:00
117 changed files with 8086 additions and 4034 deletions

View File

@@ -1,26 +1,39 @@
{
"name": "league/oauth2-server",
"description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.",
"version": "3.2",
"homepage": "https://github.com/php-loep/oauth2-server",
"license": "MIT",
"require": {
"php": ">=5.4.0"
"php": ">=5.4.0",
"symfony/http-foundation": "~2.1",
"league/event": "0.2.0"
},
"require-dev": {
"mockery/mockery": ">=0.7.2",
"league/phpunit-coverage-listener": "~1.0"
"phpunit/phpunit": "~4.0",
"mockery/mockery": "~0.9",
"league/phpunit-coverage-listener": "~1.0",
"squizlabs/php_codesniffer": "1.*",
"codeception/codeception": "2.0.*",
"alexbilbie/fizzfuzz": "dev-develop"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/thephpleague/oauth2-server.git"
},{
"type": "git",
"url": "https://github.com/alexbilbie/fizzfuzz.git"
}
],
"keywords": [
"oauth",
"oauth2",
"oauth 2",
"oauth 2.0",
"server",
"auth",
"authorization",
"authorisation",
"authentication",
"resource",
"api",
@@ -37,14 +50,17 @@
}
],
"replace": {
"lncd/oauth2": "*"
"lncd/oauth2": "*",
"league/oauth2server": "*"
},
"autoload": {
"psr-0": {
"League\\OAuth2\\Server": "src/"
"psr-4": {
"League\\OAuth2\\Server\\": "src/"
}
},
"suggest": {
"autoload-dev": {
"psr-4": {
"LeagueTests\\": "tests/unit/"
}
}
}