Merge pull request #41 from edipoReboucas/fix-phpunit-php8.1

Fix test issues with phpunit 9 and php 8 and 8.1

Author: kamermans

.gitignore

@@ -3,5 +3,7 @@ vendor/
 .php-cs.cache
 guzzle_environments/*/vendor/
 guzzle_environments/*/composer.lock
+guzzle_environments/*/.phpunit.result.cache
 composer.lock
 internal_examples/
+.idea

.travis.yml

@@ -11,6 +11,8 @@ php:
     - 7.2
     - 7.3
     - 7.4
+    - 8.0
+    - 8.1
 
 install:
     - cd guzzle_environments/${GUZZLE_VERSION}
@@ -62,3 +64,11 @@ matrix:
           env: GUZZLE_VERSION=4
         - php: 7.4
           env: GUZZLE_VERSION=5
+        - php: 8.0
+          env: GUZZLE_VERSION=4
+        - php: 8.0
+          env: GUZZLE_VERSION=5
+        - php: 8.1
+          env: GUZZLE_VERSION=4
+        - php: 8.1
+          env: GUZZLE_VERSION=5

README.md

@@ -1,6 +1,6 @@
 # Guzzle OAuth 2.0 Subscriber
 
-> Tested with Guzzle 4, 5, 6, 7 and PHP 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3 and 7.4.
+> Tested with Guzzle 4, 5, 6, 7 and PHP 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0 and 8.1.
 
 This is an OAuth 2.0 client for Guzzle which aims to be 100% compatible with Guzzle 4, 5, 6, 7 and all future versions within a single package.
 Although I love Guzzle, its interfaces keep changing, causing massive breaking changes every 12 months or so, so I have created this package

guzzle_environments/4/composer.json

@@ -8,7 +8,7 @@
     ],
     "require-dev": {
         "guzzlehttp/guzzle": "~4",
-        "phpunit/phpunit": ">=4 <8",
+        "phpunit/phpunit": ">=4 <10",
         "doctrine/cache": "~1.5"
     },
     "autoload": {

guzzle_environments/5/composer.json

@@ -8,7 +8,7 @@
     ],
     "require-dev": {
         "guzzlehttp/guzzle": "~5",
-        "phpunit/phpunit": ">=4 <8",
+        "phpunit/phpunit": ">=4 <10",
         "doctrine/cache": "~1.5"
     },
     "autoload": {

guzzle_environments/6/composer.json

@@ -8,7 +8,7 @@
     ],
     "require-dev": {
         "guzzlehttp/guzzle": "~6",
-        "phpunit/phpunit": ">=4 <8",
+        "phpunit/phpunit": ">=4 <10",
         "doctrine/cache": "~1.5",
         "psr/simple-cache": "^1.0",
         "symfony/cache": "^3.4",

guzzle_environments/7/composer.json

@@ -8,7 +8,7 @@
     ],
     "require-dev": {
         "guzzlehttp/guzzle": "~7",
-        "phpunit/phpunit": ">=4 <8",
+        "phpunit/phpunit": ">=4 <10",
         "doctrine/cache": "~1.5",
         "psr/simple-cache": "^1.0",
         "symfony/cache": "^3.4",

guzzle_environments/run_tests_docker.sh

@@ -3,8 +3,16 @@
 DIR=$(dirname $(readlink -f $0))
 
 TESTS=${1:-all}
-#IMAGE="composer:php5-alpine"
-IMAGE="composer:latest"
+#IMAGE="phplegacy/php:5.4-composer" #PHP 5.4.45
+# not found a working php 5.5 image
+#IMAGE="prooph/composer:5.6"
+#IMAGE="prooph/composer:7.0"
+#IMAGE="prooph/composer:7.1"
+#IMAGE="prooph/composer:7.2"
+#IMAGE="prooph/composer:7.3"
+#IMAGE="prooph/composer:7.4"
+#IMAGE="prooph/composer:8.0"
+IMAGE="composer:latest" #PHP latest version
 
 function run_tests()
 {

tests/BaseTestCase.php

@@ -13,6 +13,47 @@
 
 class BaseTestCase extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @before
+     */
+    public function _callCompatibleSetup()
+    {
+        if (method_exists($this, '_setUp')) {
+            $this->_setUp();
+        }
+    }
+
+    /**
+     * @after
+     */
+    public function _callCompatibleTearDown()
+    {
+        if (method_exists($this, '_tearDown')) {
+            $this->_tearDown();
+        }
+    }
+
+    public function _expectException($exception)
+    {
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exception);
+        } else {
+            $this->setExpectedException($exception);
+        }
+    }
+
+    public function _expectExceptionMessage($message)
+    {
+        if (method_exists($this,'expectExceptionMessage')) {
+            $this->expectExceptionMessage($message);
+        } else {
+            $this->setExpectedException(
+                $this->getExpectedException() ? $this->getExpectedException() : 'Exception',
+                $message
+            );
+        }
+    }
+
     protected function createRequest($method, $uri, $options=[])
     {
         return Helper::guzzleIs('>=', 6)?

tests/GrantType/AuthorizationCodeTest.php

@@ -25,12 +25,10 @@ public function testConstruct()
         ]);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Config is missing the following keys
-     */
     public function testConstructThrowsForMissing()
     {
+        $this->_expectException('InvalidArgumentException');
+        $this->_expectExceptionMessage('Config is missing the following keys');
         $grant = new AuthorizationCode(new Client(), []);
     }
 

tests/GrantType/ClientCredentialsTest.php

@@ -24,12 +24,10 @@ public function testConstruct()
         ]);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Config is missing the following keys
-     */
     public function testConstructThrowsForMissing()
     {
+        $this->_expectException('InvalidArgumentException');
+        $this->_expectExceptionMessage('Config is missing the following keys');
         $grant = new ClientCredentials(new Client(), []);
     }
 

tests/GrantType/PasswordCredentialsTest.php

@@ -26,12 +26,10 @@ public function testConstruct()
         ]);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Config is missing the following keys
-     */
     public function testConstructThrowsForMissing()
     {
+        $this->_expectException('InvalidArgumentException');
+        $this->_expectExceptionMessage('Config is missing the following keys');
         $grant = new PasswordCredentials(new Client(), []);
     }
 

tests/GrantType/RefreshTokenTest.php

@@ -26,12 +26,10 @@ public function testConstruct()
         ]);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Config is missing the following keys
-     */
     public function testConstructThrowsForMissing()
     {
+        $this->_expectException('InvalidArgumentException');
+        $this->_expectExceptionMessage('Config is missing the following keys');
         $grant = new RefreshToken(new Client(), []);
     }
 

tests/GrantType/Specific/GithubApplicationTest.php

@@ -29,12 +29,10 @@ public function testConstruct()
         ]);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Config is missing the following keys
-     */
     public function testConstructThrowsForMissing()
     {
+        $this->_expectException('InvalidArgumentException');
+        $this->_expectExceptionMessage('Config is missing the following keys');
         $grant = new GithubApplication(new Client(), []);
     }
 

tests/OAuth2MiddlewareTest.php

@@ -15,7 +15,7 @@
 
 class OAuth2MiddlewareTest extends BaseTestCase
 {
-    public function setUp()
+    public function _setUp()
     {
         if (Helper::guzzleIs('<', 6)) {
             $this->markTestSkipped("Guzzle 6+ is required for this test");
@@ -162,11 +162,9 @@ public function testTriggersSignerAndGrantDataProcessor()
         $this->assertSame($expected_auth_value, $this->getHeader($container[0]['request'], 'Authorization'));
     }
 
-    /**
-     * @expectedException GuzzleHttp\Exception\ClientException
-     */
     public function testOnErrorDoesNotTriggerForNonOAuthRequests()
     {
+        $this->_expectException('GuzzleHttp\Exception\ClientException');
 
         // A random access token helps avoid false pasitives due to caching
         $mock_access_token = md5(microtime(true).mt_rand(100000, 999999));

tests/Persistence/ClosureTokenPersistenceTest.php

@@ -13,7 +13,7 @@ class ClosureTokenPersistenceTest extends TokenPersistenceTestBase
 
     private $cache = [];
 
-    public function setUp()
+    public function _setUp()
     {
         $this->cache = [];
     }

tests/Persistence/DoctrineCacheTokenPersistenceTest.php

@@ -16,7 +16,7 @@ public function getInstance()
         return new DoctrineCacheTokenPersistence($this->cache);
     }
 
-    public function setUp()
+    public function _setUp()
     {
         $this->cache = new ArrayCache();
     }

tests/Persistence/FileTokenPersistenceTest.php

@@ -13,15 +13,15 @@ public function getInstance()
         return new FileTokenPersistence($this->testFile);
     }
 
-    public function setUp()
+    public function _setUp()
     {
         $this->testFile = tempnam(sys_get_temp_dir(), "guzzle_phpunit_test_");
         if (file_exists($this->testFile)) {
             unlink($this->testFile);
         }
     }
 
-    public function tearDown()
+    public function _tearDown()
     {
         if (file_exists($this->testFile)) {
             unlink($this->testFile);

tests/Persistence/Laravel5CacheTokenPersistenceTest.php

@@ -17,7 +17,7 @@ public function getInstance()
         return new Laravel5CacheTokenPersistence($this->cache);
     }
 
-    public function setUp()
+    public function _setUp()
     {
         $this->cache = new Repository(new ArrayStore());
     }

tests/Persistence/SimpleCacheTokenPersistenceTest.php

@@ -16,7 +16,7 @@ public function getInstance()
         return new SimpleCacheTokenPersistence($this->cache);
     }
 
-    public function setUp()
+    public function _setUp()
     {
         $this->cache = new ArrayCache();
     }