Merge pull request #142 from garak/fix-getid

Fix oauth2-client 3 compat, drop PHP 7 support

Author: shadowhand

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -35,24 +35,24 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.3'
-          - '7.4'
           - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
+          - '8.5'
         minimum_versions: [ false ]
         coverage: [ 'none' ]
         include:
           - description: Minimum version
-            php: '7.3'
+            php: '8.0'
             minimum_versions: true
           - description: Code coverage
-            php: '8.2'
+            php: '8.5'
             coverage: pcov
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Cache dependencies
         uses: actions/cache@v3

CHANGELOG.md

@@ -1,6 +1,16 @@
 OAuth 2.0 Google Provider Changelog
 
 
+## To be released
+
+### Fixed
+
+- Ensure compatibility with `oauth2-client` version 3 by @garak
+
+### Removed
+
+- Remove PHP 7 support by @garak
+
 ## 4.2.0 - 2026-03-09
 
 ### Added

README.md

@@ -17,13 +17,14 @@ a patch via pull request.
 ## Requirements
 
 The following versions of PHP are supported.
+Support for older PHP versions is available in version 4.2 (and older) of this library.
 
-* PHP 7.3
-* PHP 7.4
 * PHP 8.0
 * PHP 8.1
 * PHP 8.2
 * PHP 8.3
+* PHP 8.4
+* PHP 8.5
 
 This package uses [OpenID Connect][openid-connect] to authenticate users with
 Google accounts.

composer.json

@@ -19,7 +19,7 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.0",
         "league/oauth2-client": "^2.0 || ^3.0"
     },
     "require-dev": {

src/Provider/GoogleUser.php

@@ -17,7 +17,7 @@ public function __construct(array $response)
         $this->response = $response;
     }
 
-    public function getId()
+    public function getId(): mixed
     {
         return $this->response['sub'];
     }