From: Tim Otten <totten@civicrm.org>
Date: Thu, 21 Dec 2023 19:12:00 +0000 (-0800)
Subject: (dev/core#3581) composer.json - Allow newer version of oauth2-google
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=01b9415c8bd53c13abfd4df99e066fae47557c14;p=civicrm-core.git

(dev/core#3581) composer.json - Allow newer version of oauth2-google

I looked at the diffs for v3.0.4 and 4.0.0.

* They raised the requirements to PHP 7.3/8.0 and added some type-hints.
* They raised the test-env to PHPUnit 8/9
* They updated some metadata to say all that.
* The main contracts are provided by `league/oauth2-client` -- which
  hasn't changed. It's still the same v2.x requirement.
* I don't believe that Civi directly extends/overrides any of the Google Auth stuff.
---

diff --git a/composer.json b/composer.json
index 53a86babef..5f846e68d1 100644
--- a/composer.json
+++ b/composer.json
@@ -85,7 +85,7 @@
     "civicrm/composer-downloads-plugin": "^3.0",
     "league/csv": "~9.7.4",
     "league/oauth2-client": "^2.4",
-    "league/oauth2-google": "^3.0",
+    "league/oauth2-google": "^3.0 || ^4.0",
     "tplaner/when": "~3.1",
     "xkerman/restricted-unserialize": "~1.1",
     "typo3/phar-stream-wrapper": "^2 || ^3.0",
diff --git a/composer.lock b/composer.lock
index bc9633e6c9..dc3100a4c5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9bd88911ac05e61e199444889b78fc8e",
+    "content-hash": "4d83914e1eba4abeb1a44bcc1512aa47",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -1174,6 +1174,7 @@
                     "type": "community_bridge"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-14T14:23:00+00:00"
         },
         {