All code review notes answered by a code modification and the branch has been rebased and squashed.

Maybe extract the if( empty $requestUri string ) to jump over the if/else, unless you actually want to send an empty string into parse_url()? Just micro optimizations. I tested it with our setup and it worked well.

@danijelk Thank you for your feedback.

On the majority of casesREQUEST_URI starts with a slash. Theparse_url() usage is just to handle an edge case.

Your idea is good in order to skip null and empty strings. However, it is a bit overkill regarding the occurrence of this case whileparse_url() return an empty path without an huge performance impact.

So to keep the code simple (as we cannot use here an early return) I think that this micro optimization adds useless complexity.

@nicolas-grekas Do you think that we can turn this PR asReviewed status?

Is there a way to keep existing tests the same?
When tests change too much it raises a red flag because it means a regression is possible.
Please reduce the diff to the strict minimum to ease the work of reviewers.

Is there a way to keep existing tests the same?

Yes for sure. I can revert them.

@nicolas-grekas FYI: Tests has been refactored on this commit95e9fe0 then squashed.

Its tests has been added on#29256.

cc@thomasbisignani

@Dylan-DutchAndBold it's not: see how many tests this "solution" breaks.

@Dylan-DutchAndBold it's not: see how many tests this "solution" breaks.

You're right, missed that, didn't get what you meant by your original comment at first.

Thank you@alquerci.