Merge branch '2.0' of github.com:picklesphp/pickles into 2.0

This commit is contained in:
Josh Sherman 2014-10-20 05:16:33 -04:00
commit 80a36aee99

174
composer.lock generated
View file

@ -4,160 +4,35 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "65e330b4eb2873d61093fc36aa624d0f",
"hash": "f90250145c5046194b1c3187fc90513a",
"packages": [
{
"name": "league/event",
"version": "1.0.0",
"name": "bshaffer/oauth2-server-php",
"version": "v1.5",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/event.git",
"reference": "06adb7ce55b93346be43a3ba677ac613bbf288a2"
"url": "https://github.com/bshaffer/oauth2-server-php.git",
"reference": "74fcc75e47614c1417c750e907a44567d9ceee1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/event/zipball/06adb7ce55b93346be43a3ba677ac613bbf288a2",
"reference": "06adb7ce55b93346be43a3ba677ac613bbf288a2",
"url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/74fcc75e47614c1417c750e907a44567d9ceee1f",
"reference": "74fcc75e47614c1417c750e907a44567d9ceee1f",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
"php": ">=5.3.9"
},
"require-dev": {
"henrikbjorn/phpspec-code-coverage": "1.0.*@dev",
"phpspec/phpspec": "2.0.*@dev"
"suggest": {
"aws/aws-sdk-php": "Required to use the DynamoDB storage engine",
"predis/predis": "Required to use the Redis storage engine",
"thobbs/phpcassa": "Required to use the Cassandra storage engine"
},
"type": "library",
"autoload": {
"psr-4": {
"League\\Event\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Frank de Jonge",
"email": "info@frenky.net"
}
],
"description": "Event package",
"keywords": [
"emitter",
"event",
"listener"
],
"time": "2014-09-09 14:40:43"
},
{
"name": "league/oauth2-server",
"version": "dev-develop",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth2-server.git",
"reference": "6333a975f8fb51111b447a7e85806e4519fb52b9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/6333a975f8fb51111b447a7e85806e4519fb52b9",
"reference": "6333a975f8fb51111b447a7e85806e4519fb52b9",
"shasum": ""
},
"require": {
"league/event": "1.0.*",
"php": ">=5.4.0",
"symfony/http-foundation": "~2.1"
},
"replace": {
"league/oauth2server": "*",
"lncd/oauth2": "*"
},
"require-dev": {
"alexbilbie/fizzfuzz": "dev-develop",
"codeception/codeception": "2.0.*",
"league/phpunit-coverage-listener": "~1.0",
"mockery/mockery": "~0.9",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~1.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-develop": "4.0.x-dev"
}
},
"autoload": {
"psr-4": {
"League\\OAuth2\\Server\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alex Bilbie",
"email": "hello@alexbilbie.com",
"homepage": "http://www.alexbilbie.com",
"role": "Developer"
}
],
"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.",
"homepage": "http://oauth2.thephpleague.com/",
"keywords": [
"Authentication",
"api",
"auth",
"authorisation",
"authorization",
"oauth",
"oauth 2",
"oauth 2.0",
"oauth2",
"protect",
"resource",
"secure",
"server"
],
"time": "2014-10-03 13:42:01"
},
{
"name": "symfony/http-foundation",
"version": "dev-master",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
"reference": "c24942a7ec2d8409d1f60d02c4460ca8317e885a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/c24942a7ec2d8409d1f60d02c4460ca8317e885a",
"reference": "c24942a7ec2d8409d1f60d02c4460ca8317e885a",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"symfony/expression-language": "~2.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
}
},
"autoload": {
"psr-0": {
"Symfony\\Component\\HttpFoundation\\": ""
},
"classmap": [
"Symfony/Component/HttpFoundation/Resources/stubs"
]
"OAuth2": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -165,17 +40,19 @@
],
"authors": [
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
"name": "Brent Shaffer",
"email": "bshafs@gmail.com",
"homepage": "http://brentertainment.com"
}
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com",
"time": "2014-10-07 14:06:18"
"description": "OAuth2 Server for PHP",
"homepage": "http://github.com/bshaffer/oauth2-server-php",
"keywords": [
"auth",
"oauth",
"oauth2"
],
"time": "2014-08-28 02:13:42"
}
],
"packages-dev": [
@ -1434,7 +1311,6 @@
"aliases": [],
"minimum-stability": "dev",
"stability-flags": {
"league/oauth2-server": 20,
"phpunit/phpunit": 20,
"satooshi/php-coveralls": 20
},