[9.x] Backport: Update TrustProxies to rely on $headers if properly set

[mzur]

This is a backport of #47844 which can be considered a security issue.

[driesvints]

Thanks. Please resend this with passing tests.

[mzur]

@driesvints Thanks for the quick reply. The type check error comes from a file that was not modified by this PR (Illuminate/Http/Client/Factory.php). Also the tests fail in an unrelated test case (HttpRequestTest.php) and rather seem to be an error in the test itself:

1) Illuminate\Tests\Http\HttpRequestTest::testDateMethod
Failed asserting that two DateTime objects are equal.
--- Expected
+++ Actual
@@ @@
-2020-01-01T16:30:25.000000+0000
+2020-01-01T16:30:25.889845+0000

The TrustProxiesTest passes.

[driesvints]

Right now we can't merge any PR with failing tests and we're not actively developing Laravel v9 anymore. Please fix any failing tests before sending in a PR, thanks.

[mzur]

I considered this a security fix which are promised to be provided until next year for 9.x. But it's your call, of course. I'll see what I can do but fixing my own application has priority.