Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce Zend guard recursion protection
This PR introduces a new way of recursion protection in JSON, var_dump and friends. It fixes issue in master for __debugInfo and also improves perf for jsonSerializable in some cases. More info can be found in GH-10020. Closes GH-11812
- Loading branch information
Showing
16 changed files
with
322 additions
and
37 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --TEST-- | ||
| json_encode() Recursion test with just JsonSerializable | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| class SerializingTest implements JsonSerializable | ||
| { | ||
| public $a = 1; | ||
|
|
||
| private $b = 'hide'; | ||
|
|
||
| protected $c = 'protect'; | ||
|
|
||
| public function jsonSerialize(): mixed | ||
| { | ||
| $result = json_encode($this); | ||
| var_dump($result); | ||
| return $this; | ||
| } | ||
| } | ||
|
|
||
| var_dump(json_encode(new SerializingTest())); | ||
| ?> | ||
| --EXPECT-- | ||
| bool(false) | ||
| string(7) "{"a":1}" |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| --TEST-- | ||
| json_encode() Recursion test with JsonSerializable and var_dump simple | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| class SerializingTest implements JsonSerializable | ||
| { | ||
| public $a = 1; | ||
|
|
||
| public function jsonSerialize(): mixed | ||
| { | ||
| var_dump($this); | ||
| return $this; | ||
| } | ||
| } | ||
|
|
||
| var_dump(json_encode(new SerializingTest())); | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| object(SerializingTest)#1 (1) { | ||
| ["a"]=> | ||
| int(1) | ||
| } | ||
| string(7) "{"a":1}" |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| --TEST-- | ||
| json_encode() Recursion test with JsonSerializable and __debugInfo | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| class SerializingTest implements JsonSerializable | ||
| { | ||
| public $a = 1; | ||
|
|
||
| public function __debugInfo() | ||
| { | ||
| return [ 'result' => json_encode($this) ]; | ||
| } | ||
|
|
||
| public function jsonSerialize(): mixed | ||
| { | ||
| var_dump($this); | ||
| return $this; | ||
| } | ||
| } | ||
|
|
||
| var_dump(json_encode(new SerializingTest())); | ||
| echo "---------\n"; | ||
| var_dump(new SerializingTest()); | ||
|
|
||
| ?> | ||
| --EXPECT-- | ||
| object(SerializingTest)#1 (1) { | ||
| ["result"]=> | ||
| bool(false) | ||
| } | ||
| string(7) "{"a":1}" | ||
| --------- | ||
| *RECURSION* | ||
| object(SerializingTest)#1 (1) { | ||
| ["result"]=> | ||
| string(7) "{"a":1}" | ||
| } |
Oops, something went wrong.