Merge branch 'main' into CLI-1417

acquia · Nov 26, 2024 · 773c298 · 773c298
2 parents 0298261 + 42c689f
commit 773c298
Show file tree

Hide file tree

Showing 14 changed files with 130 additions and 110 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,15 +23,16 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-22.04']
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
         coverage: ['none']
         include:
           - os: 'ubuntu-22.04'
-            php: '8.2'
+            php: '8.4'
             coverage: 'pcov'
           # Only test pre-installed (i.e. fast) versions of PHP on Windows.
+          # https://github.com/shivammathur/setup-php?tab=readme-ov-file#github-hosted-runners
           - os: 'windows-2022'
-            php: '8.2'
+            php: '8.3'
             coverage: 'none'
     steps:
       - name: Prepare Git

diff --git a/composer.json b/composer.json
@@ -10,20 +10,29 @@
             "role": "Maintainer"
         }
     ],
+    "repositories": [
+        {
+            "type": "vcs", "url": "https://github.com/ruudk/oauth2-client"
+        },
+        {
+            "type": "vcs", "url": "https://github.com/Ayesh/safe"
+        }
+    ],
     "minimum-stability": "dev",
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "acquia/drupal-environment-detector": "^1.2.0",
+        "acquia/drupal-environment-detector": "^1.7.0",
         "bugsnag/bugsnag": "^3.0",
         "composer/semver": "^3.3",
         "consolidation/self-update": "^3",
         "dflydev/dot-access-data": "^3",
-        "grasmash/expander": "^3",
+        "grasmash/expander": "^3.0.1",
         "guzzlehttp/guzzle": "^7.4",
         "http-interop/http-factory-guzzle": "^1.0",
         "laminas/laminas-validator": "^2.20.0",
         "league/csv": "^9.8",
+        "league/oauth2-client": "dev-patch-1 as 2.7.0",
         "loophp/phposinfo": "^1.7.2",
         "ltd-beget/dns-zone-configurator": "^1.3.0",
         "m4tthumphrey/php-gitlab-api": "^11.5",
@@ -45,9 +54,9 @@
         "symfony/process": "^6.3",
         "symfony/validator": "^6.3",
         "symfony/yaml": "^6.3",
-        "thecodingmachine/safe": "^2.4",
+        "thecodingmachine/safe": "dev-php84/nullability as 2.5.0",
         "typhonius/acquia-logstream": "^0.0.14",
-        "typhonius/acquia-php-sdk-v2": "^3.4.0",
+        "typhonius/acquia-php-sdk-v2": "^3.4.1",
         "vlucas/phpdotenv": "^5.5",
         "zumba/amplitude-php": "^1.0.4"
     },