Upgrade supported PHP versions

Author: curry684

.github/workflows/ci.yaml

@@ -16,10 +16,9 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '8.1'
-          - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
         dependencies: [ stable, beta, lowest ]
         experimental: [ false ]
         include:
@@ -63,7 +62,7 @@ jobs:
 
       - name: Run PHPStan static analysis
         run: vendor/bin/phpstan
-        if: ${{ matrix.dependencies != 'lowest' && !matrix.experimental }}
+        if: ${{ matrix.dependencies == 'stable' && !matrix.experimental }}
 
       - name: Run automated tests
         run: vendor/bin/phpunit --coverage-text --coverage-xml build/coverage-xml --coverage-cobertura build/cobertura.xml

composer.json

@@ -18,24 +18,24 @@
         "gitlab"
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.3",
         "ext-mbstring": "*",
         "ext-intl": "*",
         "league/oauth2-client": "^2.4.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.65.0",
-        "guzzlehttp/psr7": "^2.7.0",
+        "friendsofphp/php-cs-fixer": "^3.90.0",
+        "guzzlehttp/psr7": "^2.8.0",
         "http-interop/http-factory-guzzle": "^1.2",
-        "infection/infection": "^0.27.11",
-        "m4tthumphrey/php-gitlab-api": "^11.14",
+        "infection/infection": "^0.31.9",
+        "m4tthumphrey/php-gitlab-api": "^11.14|^12.0",
         "mockery/mockery": "^1.6.12",
         "php-http/guzzle7-adapter": "^1.1.0",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.0.4",
+        "phpstan/phpstan": "^2.1.32",
         "phpstan/phpstan-mockery": "^2.0.0",
-        "phpstan/phpstan-phpunit": "^2.0.3",
-        "phpunit/phpunit": "^10.5.39"
+        "phpstan/phpstan-phpunit": "^2.0.8",
+        "phpunit/phpunit": "^12.4.4"
     },
     "suggest": {
         "m4tthumphrey/php-gitlab-api": "For further API usage using the acquired OAuth2 token"

src/Provider/Gitlab.php

@@ -29,13 +29,13 @@ class Gitlab extends AbstractProvider
 {
     use BearerAuthorizationTrait;
 
-    public const DEFAULT_DOMAIN = 'https://gitlab.com';
-    public const DEFAULT_SCOPE = 'api';
-    public const SCOPE_SEPARATOR = ' ';
+    public const string DEFAULT_DOMAIN = 'https://gitlab.com';
+    public const string DEFAULT_SCOPE = 'api';
+    public const string SCOPE_SEPARATOR = ' ';
 
-    private const PATH_API_USER = '/api/v4/user';
-    private const PATH_AUTHORIZE = '/oauth/authorize';
-    private const PATH_TOKEN = '/oauth/token';
+    private const string PATH_API_USER = '/api/v4/user';
+    private const string PATH_AUTHORIZE = '/oauth/authorize';
+    private const string PATH_TOKEN = '/oauth/token';
 
     public string $domain = self::DEFAULT_DOMAIN;
 

src/Provider/GitlabResourceOwner.php

@@ -20,11 +20,11 @@
  *
  * @author Niels Keurentjes <[email protected]>
  *
- * @phpstan-type ResourceOwner array{id: int, is_admin: bool, name: string, username: string, email: string, avatar_url: string, web_url: string, state: string, external: bool}
+ * @phpstan-type ResourceOwner array{id: ?int, is_admin: ?bool, name: string, username: string, email: string, avatar_url: string, web_url: string, state: ?string, external: ?bool}
  */
 class GitlabResourceOwner implements ResourceOwnerInterface
 {
-    public const PATH_API = '/api/v4/';
+    public const string PATH_API = '/api/v4/';
 
     /** @var ResourceOwner */
     private array $data;

test/src/Provider/GitlabTest.php

@@ -17,6 +17,8 @@
 use Mockery as m;
 use Omines\OAuth2\Client\Provider\Gitlab;
 use Omines\OAuth2\Client\Provider\GitlabResourceOwner;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\TestCase;
 
 class GitlabTest extends TestCase
@@ -218,9 +220,7 @@ public function testDefaultValuesForResourceOwner(): void
         $this->assertTrue($owner->isExternal());
     }
 
-    /**
-     * @depends testUserData
-     */
+    #[Depends('testUserData')]
     public function testApiClient(GitlabResourceOwner $owner): void
     {
         $client = $owner->getApiClient();
@@ -241,9 +241,7 @@ public static function provideErrorCodes(): array
         ];
     }
 
-    /**
-     * @dataProvider provideErrorCodes
-     */
+    #[DataProvider('provideErrorCodes')]
     public function testExceptionThrownWhenErrorObjectReceived(int $status): void
     {
         $response = new Response($status, ['content-type' => 'json'], '{"message": "Validation Failed","errors": [{"resource": "Issue","field": "title","code": "missing_field"}]}');