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

@@ -5,14 +5,25 @@ php:
- 5.5
- 5.6
- hhvm
matrix:
allow_failures:
- php: hhvm
before_script: composer install --prefer-source
script: phpunit --configuration phpunit.xml.dist
cache:
directories:
- vendor
before_script:
- composer self-update
- composer require satooshi/php-coveralls:dev-master --no-update --dev
- composer install
- cd examples/relational && composer install --prefer-dist
- php config/init.php
- php -S localhost:8000 &
- sleep 3
- cd ../..
script:
- mkdir -p build/logs
- phpunit --coverage-text