Merge pull request #1295 from nextcloud/bump-guzzlehttp-stable22

[stable22] Bump guzzlehttp/guzzle and guzzlehttp/psr7
nextcloud · Jan 31, 2023 · 1ba17c8 · 1ba17c8
2 parents 83367ce + f1eb2f9
commit 1ba17c8
Show file tree

Hide file tree

Showing 42 changed files with 658 additions and 347 deletions.
diff --git a/.patches/guzzle/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab-cookie.diff b/.patches/guzzle/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab-cookie.diff
diff --git a/.patches/guzzle/e3ff079b22820c2029d4c2a87796b6a0b8716ad8-header.patch b/.patches/guzzle/e3ff079b22820c2029d4c2a87796b6a0b8716ad8-header.patch
diff --git a/autoload.php b/autoload.php
@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
 		"doctrine/dbal": "3.1.4",
 		"egulias/email-validator": "2.1.25",
 		"giggsey/libphonenumber-for-php": "^8.12",
-		"guzzlehttp/guzzle": "7.3.0",
+		"guzzlehttp/guzzle": "^7.4.5",
+		"guzzlehttp/psr7": "^1.9",
 		"icewind/searchdav": "^2.0.0",
 		"icewind/streams": "v0.7.5",
 		"league/flysystem": "^1.0",