Merge pull request #9 from mtvbrianking/2.x

Guzzle 7 support

Author: mtvbrianking

.gitignore

@@ -1,5 +1,6 @@
 .idea
 .php_cs.cache
+.phpunit.result.cache
 composer.lock
 coverage
 coverage.clover

.travis.yml

@@ -3,8 +3,7 @@
 language: php
 
 php:
-  - 5.6
-  - 7.2
+  - 7.3
 
 # Default stage = test,
 # Runs for both default php versions - above.
@@ -24,7 +23,7 @@ jobs:
 
       name: Documentation
 
-      php: 7.2
+      php: 7.3
 
       install:
         - curl -O http://get.sensiolabs.org/sami.phar

composer.json

@@ -20,14 +20,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
+        "php": ">=7.2.5",
         "ext-json": "*",
-        "guzzlehttp/guzzle": "^6.3"
+        "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.14",
-        "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.0"
+        "friendsofphp/php-cs-fixer": "^2.16",
+        "mockery/mockery": "1.3.*",
+        "phpunit/phpunit": "^8.5.5"
     },
     "suggest": {
         "monolog/monolog": "For comprehensive logging."

phpunit.xml.dist

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="true">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Bmatovu OAuth Negotiator Test Suite">
-            <directory>tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
 </phpunit>

src/OAuth2Middleware.php

@@ -227,7 +227,7 @@ private function onFulfilled(RequestInterface $request, array $options, callable
      */
     private function onRejected(RequestInterface $request, array $options, callable $handler)
     {
-        return function ($reason) use ($request, $options) {
+        return function ($reason) {
             return \GuzzleHttp\Promise\rejection_for($reason);
         };
     }

tests/OAuth2MiddlewareTest.php

@@ -20,12 +20,12 @@ class OAuth2MiddlewareTest extends TestCase
 {
     protected $testTokenFile;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->testTokenFile = tempnam(sys_get_temp_dir(), 'phpunit_test_');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if (file_exists($this->testTokenFile)) {
             unlink($this->testTokenFile);

tests/Repositories/FileTokenTest.php

@@ -23,7 +23,7 @@ class FileTokenTest extends TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->testTokenFile = tempnam(sys_get_temp_dir(), 'phpunit_test_');
 
@@ -33,7 +33,7 @@ public function setUp()
     /**
      * {@inheritdoc}
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         if (file_exists($this->testTokenFile)) {
             unlink($this->testTokenFile);