-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[HttpKernel] Fix datacollector caster for reference object property #54072
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
nicolas-grekas
merged 1 commit into
symfony:5.4
from
ebuildy:fix_httpkernel_clone_caster
Apr 12, 2024
Merged
[HttpKernel] Fix datacollector caster for reference object property #54072
nicolas-grekas
merged 1 commit into
symfony:5.4
from
ebuildy:fix_httpkernel_clone_caster
Apr 12, 2024
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, thanks for the test cases.
Here is the correct patch that fixes both aspect of the issue:
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -70,16 +70,21 @@ abstract class DataCollector implements DataCollectorInterface
$casters = [
'*' => function ($v, array $a, Stub $s, $isNested) {
if (!$v instanceof Stub) {
+ $b = $a;
foreach ($a as $k => $v) {
if (!\is_object($v) || $v instanceof \DateTimeInterface || $v instanceof Stub) {
continue;
}
try {
- $a[$k] = new CutStub($v);
+ $a[$k] = $s = new CutStub($v);
+
+ if ($b[$k] === $s) {
+ // we've hit a non-typed reference
+ $a[$k] = $v;
+ }
} catch (\TypeError $e) {
- $a[$k] = &$v;
- unset($v);
+ // we've hit a typed reference
}
}
}
Can you please make the necessary changes to fix the CI on PHP 7.2+? (that could involve using |
b2a9d7d
to
457a3de
Compare
Thank you @ebuildy. |
This was referenced Apr 29, 2024
Merged
Merged
Merged
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed on #49091:
Unit tests FAIL "Error: KO src/Symfony/Component/HttpKernel" --> normal