Re-enable PHP down to version 7.1 (#1049)

thephpleague · Dec 11, 2024 · bfb0098 · bfb0098
1 parent 17f5b55
commit bfb0098
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 6 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-version: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
     steps:
       - uses: "actions/checkout@v4"
       - uses: "shivammathur/setup-php@v2"
@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-version: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
     steps:
       - uses: "actions/checkout@v4"
       - uses: "shivammathur/setup-php@v2"

diff --git a/README.md b/README.md
@@ -28,6 +28,11 @@ We support the following versions of PHP:
 * PHP 8.3
 * PHP 8.2
 * PHP 8.1
+* PHP 8.0
+* PHP 7.4
+* PHP 7.3
+* PHP 7.2
+* PHP 7.1
 
 ## Provider Clients
 

diff --git a/composer.json b/composer.json
@@ -6,14 +6,14 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "^7.1 || >=8.0.0 <8.5.0",
         "ext-json": "*",
-        "guzzlehttp/guzzle": "^7.0"
+        "guzzlehttp/guzzle": "^6.0 || ^7.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.6",
+        "mockery/mockery": "^1.3.5",
         "php-parallel-lint/php-parallel-lint": "^1.4",
-        "phpunit/phpunit": "^10.5 || ^11.5",
+        "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
         "squizlabs/php_codesniffer": "^3.11"
     },
     "keywords": [

diff --git a/test/src/Grant/GrantFactoryTest.php b/test/src/Grant/GrantFactoryTest.php
@@ -11,6 +11,9 @@
 
 class GrantFactoryTest extends TestCase
 {
+    /**
+     * @dataProvider providerGetGrantDefaults
+     */
     #[DataProvider('providerGetGrantDefaults')]
     public function testGetGrantDefaults($name)
     {

diff --git a/test/src/Grant/GrantTestCase.php b/test/src/Grant/GrantTestCase.php
@@ -42,6 +42,9 @@ abstract public static function providerGetAccessToken();
      */
     abstract protected function getParamExpectation();
 
+    /**
+     * @dataProvider providerGetAccessToken
+     */
     #[DataProvider('providerGetAccessToken')]
     public function testGetAccessToken($grant, array $params = [])
     {

diff --git a/test/src/OptionProvider/HttpBasicAuthOptionProviderTest.php b/test/src/OptionProvider/HttpBasicAuthOptionProviderTest.php
@@ -28,6 +28,8 @@ public static function providerTestGetAccessTokenOptionsException()
 
     /**
      * @param array $params
+     *
+     * @dataProvider providerTestGetAccessTokenOptionsException
      */
     #[DataProvider('providerTestGetAccessTokenOptionsException')]
     public function testGetAccessTokenOptionsException($params)

diff --git a/test/src/Provider/AbstractProviderTest.php b/test/src/Provider/AbstractProviderTest.php
@@ -182,6 +182,9 @@ public function testSetRedirectHandler()
         $this->assertNotFalse($state);
     }
 
+    /**
+     * @dataProvider userPropertyProvider
+     */
     #[DataProvider('userPropertyProvider')]
     public function testGetUserProperties($name = null, $email = null, $id = null)
     {
@@ -340,6 +343,9 @@ public function testSetGetPkceCode()
         $this->assertEquals($pkceCode, $provider->getPkceCode());
     }
 
+    /**
+     * @dataProvider pkceMethodProvider
+     */
     #[DataProvider('pkceMethodProvider')]
     public function testPkceMethod($pkceMethod, $pkceCode, $expectedChallenge)
     {
@@ -604,6 +610,9 @@ public static function getAccessTokenMethodProvider()
         ];
     }
 
+    /**
+     * @dataProvider getAccessTokenMethodProvider
+     */
     #[DataProvider('getAccessTokenMethodProvider')]
     public function testGetAccessToken($method)
     {
@@ -724,6 +733,9 @@ public static function parseResponseProvider()
         ];
     }
 
+    /**
+     * @dataProvider parseResponseProvider
+     */
     #[DataProvider('parseResponseProvider')]
     public function testParseResponse($body, $type, $parsed, $statusCode = 200)
     {
@@ -774,6 +786,9 @@ public static function getAppendQueryProvider()
         ];
     }
 
+    /**
+     * @dataProvider getAppendQueryProvider
+     */
     #[DataProvider('getAppendQueryProvider')]
     public function testAppendQuery($expected, $url, $query)
     {

diff --git a/test/src/Provider/GenericProviderTest.php b/test/src/Provider/GenericProviderTest.php
@@ -143,6 +143,8 @@ public function testCheckResponse()
     /**
      * @param array $error The error response to parse
      * @param array $extraOptions Any extra options to configure the generic provider with.
+     *
+     * @dataProvider checkResponseThrowsExceptionProvider
      */
     #[DataProvider('checkResponseThrowsExceptionProvider')]
     public function testCheckResponseThrowsException(array $error, array $extraOptions = [])