-
Notifications
You must be signed in to change notification settings - Fork 11.7k
Fix @JSON Blade directive parsing with nested structures #58075
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
Open
elliota43
wants to merge
3
commits into
laravel:12.x
Choose a base branch
from
elliota43:fix/blade-json-parsing-56331
base: 12.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+129
−2
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
Replaces `explode()` with tokenizer-based parser that respects nested arrays, closures, and function calls. Only splits on commas at the top level, preserving commas inside nested structure. Example of previously broken case: @JSON([$items->map(fn($x) => ['a' => $x, 'b' => $x]), 'key' => 'value']) This fix is backwards compatible - all existing @JSON usage continues to work as before. The change only fixes previously broken cases with complex nested structures. Fixes laravel#56331
shaedrich
reviewed
Dec 12, 2025
Comment on lines
+22
to
+31
| $parts = $this->parseArguments($this->stripParentheses($expression)); | ||
|
|
||
| $options = isset($parts[1]) ? trim($parts[1]) : $this->encodingOptions; | ||
|
|
||
| $depth = isset($parts[2]) ? trim($parts[2]) : 512; | ||
|
|
||
| return "<?php echo json_encode($parts[0], $options, $depth) ?>"; | ||
| // Ensure we have at least one argument, default to null if empty | ||
| $data = $parts[0] ?? 'null'; | ||
|
|
||
| return "<?php echo json_encode($data, $options, $depth) ?>"; |
Contributor
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.
You can shorten this to
Suggested change
| $parts = $this->parseArguments($this->stripParentheses($expression)); | |
| $options = isset($parts[1]) ? trim($parts[1]) : $this->encodingOptions; | |
| $depth = isset($parts[2]) ? trim($parts[2]) : 512; | |
| return "<?php echo json_encode($parts[0], $options, $depth) ?>"; | |
| // Ensure we have at least one argument, default to null if empty | |
| $data = $parts[0] ?? 'null'; | |
| return "<?php echo json_encode($data, $options, $depth) ?>"; | |
| [$data, $options, $depth] = $this->parseArguments($this->stripParentheses($expression)) + ['null', $this->encodingOptions, 512]; | |
| return "<?php echo json_encode($data, trim($options), $depth) ?>"; |
if you want
| * and other nested structures by using PHP's tokenizer. | ||
| * | ||
| * @param string $expression | ||
| * @return array |
Contributor
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.
You can narrow this further down:
Suggested change
| * @return array | |
| * @return array{0?: string, 1?: string, 2?: string} |
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.
Description
Fixes
@jsonBlade directive incorrectly parsing complex expressions with nested structures. Replacesexplode()with tokenizer-based parser that respects nesting depth.Problem
The directive would split on commas inside nested arrays, closures, and method calls, causing parse errors.
Example (from original issue):
would incorrectly split on the comma inside the closure.
Solution
parseArguments()method using PHP's tokenizerdepth === 0)null)Fully backwards compatible - defaults to same behavior as before.
Fixes #56331