Merge branch '4.x' into simplify-breadcrumb-api

getsentry · Oct 30, 2023 · b01d538 · b01d538
2 parents b3de1fe + a122325
commit b01d538
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Update PHPCS (#1599)
+f8b64d330d03cbf809795beb5846b2c48175cd62
diff --git a/composer.json b/composer.json
@@ -24,14 +24,14 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-curl": "*",
+        "guzzlehttp/psr7": "^1.8.4|^2.1.1",
         "jean85/pretty-package-versions": "^1.5|^2.0.4",
         "psr/log": "^1.0|^2.0|^3.0",
         "symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",
         "guzzlehttp/promises": "^1.0|^2.0",
-        "guzzlehttp/psr7": "^1.8.4|^2.1.1",
         "http-interop/http-factory-guzzle": "^1.0",
         "monolog/monolog": "^1.6|^2.0|^3.0",
         "nikic/php-parser": "^4.10.3",

diff --git a/src/Integration/RequestFetcher.php b/src/Integration/RequestFetcher.php
@@ -4,7 +4,7 @@
 
 namespace Sentry\Integration;
 
-use Http\Discovery\Psr17Factory;
+use GuzzleHttp\Psr7\ServerRequest;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
@@ -22,6 +22,6 @@ public function fetchRequest(): ?ServerRequestInterface
             return null;
         }
 
-        return (new Psr17Factory())->createServerRequestFromGlobals();
+        return ServerRequest::fromGlobals();
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Update PHPCS (#1599)
		f8b64d330d03cbf809795beb5846b2c48175cd62