Merge branch 'master' into patch-2

Author: GuilhemN

.travis.yml

@@ -1,41 +1,15 @@
 language: php
 
-sudo: false
-
-cache:
-  directories:
-    - ~/.composer/cache/files
-
-matrix:
-  fast_finish: true
-  include:
-    - php: hhvm-stable
-      sudo: required
-      dist: trusty
-      group: edge
-    - php: 5.3
-      env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 5.4
-    - php: 5.5
-    - php: 5.6
-      env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.0.*
-    - php: 7.0
-      env: SYMFONY_VERSION=3.1.*
-    - php: 7.1
-
-before_install:
-  - if [[ "$TRAVIS_PHP_VERSION" != "hhvm-stable" ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi;
-
-before_script:
-  - composer self-update
-  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --dev --no-update; fi;
-  - if [ "$COMPOSER_FLAGS" != "" ]; then composer update --prefer-dist --no-interaction --no-scripts $COMPOSER_FLAGS; fi;
-  - composer install --prefer-dist --no-interaction --no-scripts
-
-script: vendor/bin/phpunit
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+    - 7.1
+    - 7.2
+    - hhvm
+
+install:
+    - composer install
+
+script:
+    - vendor/bin/phpunit

composer.json

@@ -17,8 +17,8 @@
     ],
 
     "require": {
-        "php": "^5.3.2 || ^7.0",
-        "symfony/http-foundation": "^2.3 || ^3.0"
+        "php": "^5.5.9|>=7.0.8",
+        "symfony/http-foundation": "~3.0|~4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8 || ^5.0"

lib/OAuth2.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2;
 
+use Symfony\Component\HttpFoundation\Response;
+
 /**
  * Redirect the end-user's user agent with error message.
  *
@@ -37,7 +39,7 @@ class OAuth2RedirectException extends OAuth2ServerException
      */
     public function __construct($redirectUri, $error, $errorDescription = null, $state = null, $method = OAuth2::TRANSPORT_QUERY)
     {
-        parent::__construct(OAuth2::HTTP_FOUND, $error, $errorDescription);
+        parent::__construct(Response::HTTP_FOUND, $error, $errorDescription);
 
         $this->method = $method;
         $this->redirectUri = $redirectUri;

lib/OAuth2RedirectException.php

@@ -7,6 +7,7 @@
 use OAuth2\OAuth2ServerException;
 use OAuth2\Model\IOAuth2Client;
 use OAuth2\Tests\Fixtures\OAuth2StorageStub;
+use Symfony\Component\HttpFoundation\Response;
 
 class OAuth2GrantExtensionJwtBearer extends OAuth2StorageStub implements IOAuth2GrantExtension
 {
@@ -15,7 +16,7 @@ class OAuth2GrantExtensionJwtBearer extends OAuth2StorageStub implements IOAuth2
     public function checkGrantExtension(IOAuth2Client $client, $uri, array $inputData, array $authHeaders)
     {
         if ('urn:ietf:params:oauth:grant-type:jwt-bearer' !== $uri) {
-            throw new OAuth2ServerException(OAuth2::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
+            throw new OAuth2ServerException(Response::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
         }
 
         if (!isset($inputData['jwt'])) {

tests/Fixtures/OAuth2GrantExtensionJwtBearer.php

@@ -6,6 +6,7 @@
 use OAuth2\IOAuth2GrantExtension;
 use OAuth2\OAuth2ServerException;
 use OAuth2\Model\IOAuth2Client;
+use Symfony\Component\HttpFoundation\Response;
 
 class OAuth2GrantExtensionLifetimeStub extends OAuth2StorageStub implements IOAuth2GrantExtension
 {
@@ -14,7 +15,7 @@ class OAuth2GrantExtensionLifetimeStub extends OAuth2StorageStub implements IOAu
     public function checkGrantExtension(IOAuth2Client $client, $uri, array $inputData, array $authHeaders)
     {
         if ('http://company.com/fb_access_token_time_limited' !== $uri) {
-            throw new OAuth2ServerException(OAuth2::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
+            throw new OAuth2ServerException(Response::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
         }
 
         if (!isset($inputData['fb_access_token'])) {

tests/Fixtures/OAuth2GrantExtensionLifetimeStub.php

@@ -7,6 +7,7 @@
 use OAuth2\OAuth2ServerException;
 use OAuth2\Model\IOAuth2Client;
 use OAuth2\Tests\Fixtures\OAuth2StorageStub;
+use Symfony\Component\HttpFoundation\Response;
 
 class OAuth2GrantExtensionStub extends OAuth2StorageStub implements IOAuth2GrantExtension
 {
@@ -15,7 +16,7 @@ class OAuth2GrantExtensionStub extends OAuth2StorageStub implements IOAuth2Grant
     public function checkGrantExtension(IOAuth2Client $client, $uri, array $inputData, array $authHeaders)
     {
         if ('http://company.com/fb_access_token' !== $uri) {
-            throw new OAuth2ServerException(OAuth2::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
+            throw new OAuth2ServerException(Response::HTTP_BAD_REQUEST, OAuth2::ERROR_UNSUPPORTED_GRANT_TYPE);
         }
 
         if (!isset($inputData['fb_access_token'])) {