Skip to content

Commit 1e85273

Browse files
authored
Merge branch refs/heads/2.1.x into 2.2.x
2 parents c36e435 + c8d1d89 commit 1e85273

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@
128128
"patches/DependencyChecker.patch",
129129
"patches/Resolver.patch"
130130
],
131+
"ralouphie/getallheaders": [
132+
"patches/getallheaders.patch"
133+
],
131134
"symfony/console": [
132135
"patches/OutputFormatter.patch"
133136
]

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

patches/getallheaders.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- src/getallheaders.php 2019-03-08 09:55:37
2+
+++ src/getallheaders.php 2026-03-16 12:55:00
3+
@@ -5,7 +5,7 @@
4+
/**
5+
* Get all HTTP header key/values as an associative array for the current request.
6+
*
7+
- * @return string[string] The HTTP header key/value pairs.
8+
+ * @return array The HTTP header key/value pairs.
9+
*/
10+
function getallheaders()
11+
{

src/Reflection/BetterReflection/SourceLocator/SkipPolyfillSourceLocator.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ public function locateIdentifier(Reflector $reflector, Identifier $identifier):
3434
$fileName = $reflection->getFileName();
3535
if ($fileName !== null) {
3636
$normalized = str_replace('\\', '/', $fileName);
37-
if (str_contains($normalized, '/ralouphie/getallheaders/src/getallheaders.php')) {
38-
return null;
39-
}
4037
if (str_contains($normalized, '/symfony/polyfill-php80/') && $this->phpVersion->getVersionId() >= 80000) {
4138
return null;
4239
}

0 commit comments

Comments
 (0)