Merging develop into master and deprecating develop branch (#35)

.travis.yml

@@ -1,13 +1,15 @@
 language: php
+dist: precise
 php:
 - 5.3
 - 5.4
 - 5.5
 - 5.6
 - 7.0
 - 7.1
-- hhvm
+- 7.2
 script:
-- phpunit
+- vendor/bin/phpunit
 before_script:
 - composer install
+- composer require --dev phpunit/phpunit

composer.json

@@ -14,8 +14,8 @@
     "homepage": "http://github.com/bshaffer/oauth2-server-httpfoundation-bridge",
     "require":{
         "php":">=5.3.0",
-        "symfony/http-foundation": ">=2.1",
-        "bshaffer/oauth2-server-php": ">=0.9"
+        "bshaffer/oauth2-server-php": ">=0.9",
+        "symfony/http-foundation": ">=2.1"
     },
     "autoload": {
         "psr-0": { "OAuth2\\HttpFoundationBridge": "src/" }

phpunit.xml.dist

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php">
+<phpunit bootstrap="./test/bootstrap.php"
+  convertWarningsToExceptions="false">
   <testsuites>
     <testsuite name="OAuth2 Server HttpFoundation Bridge Test Suite">
       <directory suffix="Test.php">./test</directory>

src/OAuth2/HttpFoundationBridge/Request.php

@@ -9,8 +9,8 @@
 /**
  *
  */
- class Request extends BaseRequest implements RequestInterface
- {
+class Request extends BaseRequest implements RequestInterface
+{
     public function query($name, $default = null)
     {
         return $this->query->get($name, $default);
@@ -46,9 +46,9 @@ public static function createFromRequestStack(RequestStack $request)
         $request = $request->getCurrentRequest();
         return self::createFromRequest($request);
     }
-    
+
     /**
-     * Creates a new request with values from PHP's super globals. 
+     * Creates a new request with values from PHP's super globals.
      * Overwrite to fix an apache header bug. Read more here:
      * http://stackoverflow.com/questions/11990388/request-headers-bag-is-missing-authorization-header-in-symfony-2%E2%80%94
      *
@@ -59,13 +59,13 @@ public static function createFromRequestStack(RequestStack $request)
     public static function createFromGlobals()
     {
         $request = parent::createFromGlobals();
-        
+
         //fix the bug.
         self::fixAuthHeader($request->headers);
-        
+
         return $request;
     }
-    
+
     /**
      * PHP does not include HTTP_AUTHORIZATION in the $_SERVER array, so this header is missing.
      * We retrieve it from apache_request_headers()
@@ -83,4 +83,4 @@ protected static function fixAuthHeader(\Symfony\Component\HttpFoundation\Header
             }
         }
     }
- }
+}

src/OAuth2/HttpFoundationBridge/Response.php

@@ -8,7 +8,7 @@
 /**
  *
  */
- class Response extends JsonResponse implements ResponseInterface
+class Response extends JsonResponse implements ResponseInterface
  {
     public function addParameters(array $parameters)
     {
@@ -59,10 +59,18 @@ public function setRedirect($statusCode = 302, $url, $state = null, $error = nul
         if ($params) {
             // add the params to the URL
             $parts = parse_url($url);
-            $sep = isset($parts['query']) && count($parts['query']) > 0 ? '&' : '?';
+            $sep = isset($parts['query']) && !empty($parts['query']) ? '&' : '?';
             $url .= $sep . http_build_query($params);
         }
 
         $this->headers->set('Location', $url);
     }
- }
+
+    /**
+     * @param int $statusCode
+     */
+    public function setStatusCode($statusCode, $text = null)
+    {
+        return parent::setStatusCode($statusCode);
+    }
+}

test/OAuth2/HttpFoundationBridge/RequestTest.php

@@ -6,9 +6,9 @@ class RequestTest extends \PHPUnit_Framework_TestCase
 {
     public function testFixAuthHeader()
     {
-    	require_once __DIR__ .'/../../includes/apache_request_headers.php';
+        require_once __DIR__ .'/../../includes/apache_request_headers.php';
 
-    	\set_apache_request_headers(array('Authorization' => 'Bearer xyz'));
+        \set_apache_request_headers(array('Authorization' => 'Bearer xyz'));
 
         $request = Request::createFromGlobals();
 

test/bootstrap.php

@@ -2,4 +2,17 @@
 
 if (file_exists($autoload_file = __DIR__.'/../vendor/autoload.php')) {
     require_once $autoload_file;
-}
+}
+
+// Allows us to test across multiple versions of PHPUnit
+if (!class_exists('\PHPUnit\Framework\TestCase', true)) {
+    class_alias(
+        '\PHPUnit_Framework_TestCase',
+        '\PHPUnit\Framework\TestCase'
+    );
+} elseif (!class_exists('\PHPUnit_Framework_TestCase', true)) {
+    class_alias(
+        '\PHPUnit\Framework\TestCase',
+        '\PHPUnit_Framework_TestCase'
+    );
+}