-
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
base: 12.x
Are you sure you want to change the base?
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -19,12 +19,90 @@ trait CompilesJson | |||||
| */ | ||||||
| protected function compileJson($expression) | ||||||
| { | ||||||
| $parts = explode(',', $this->stripParentheses($expression)); | ||||||
| $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) ?>"; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Parse arguments from an expression, respecting nested structures. | ||||||
| * | ||||||
| * This method properly handles commas inside arrays, closures, function calls, | ||||||
| * and other nested structures by using PHP's tokenizer. | ||||||
| * | ||||||
| * @param string $expression | ||||||
| * @return array | ||||||
|
||||||
| * @return array | |
| * @return array{0?: string, 1?: string, 2?: string} |
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.
good call, thanks!
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're welcome!
Uh oh!
There was an error while loading. Please reload this page.
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
or
if you want