bug #38442 [VarDumper] fix truncating big arrays (nicolas-grekas)

fabpot · fabpot · commit c4aeb6fd807c · 2020-10-07T07:50:22.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [VarDumper] fix truncating big arrays | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | | Deprecations? | no | Tickets | Fix #38428 | License | MIT | Doc PR | - Commits ------- a8b986e [VarDumper] fix truncating big arrays
diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -247,7 +247,7 @@ protected function doClone($var)
                         $stub->position = $len++;
                     } elseif ($pos < $maxItems) {
                         if ($maxItems < $pos += \count($a)) {
-                            $a = \array_slice($a, 0, $maxItems - $pos);
+                            $a = \array_slice($a, 0, $maxItems - $pos, true);
                             if ($stub->cut >= 0) {
                                 $stub->cut += $pos - $maxItems;
                             }
diff --git a/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php b/src/Symfony/Component/VarDumper/Tests/Cloner/VarClonerTest.php
@@ -162,7 +162,7 @@ public function testLimits()
                     'Level 3 Item 3',
                 ],
                 [
-                    'Level 3 Item 4',
+                    999 => 'Level 3 Item 4',
                     'Level 3 Item 5',
                     'Level 3 Item 6',
                 ],
@@ -242,7 +242,7 @@ public function testLimits()
                     [1] => Array
                         (
                             [0] => 2
-                            [2] => 7
+                            [1] => 7
                         )
 
                     [2] => Array
@@ -299,7 +299,7 @@ public function testLimits()
 
             [7] => Array
                 (
-                    [0] => Level 3 Item 4
+                    [999] => Level 3 Item 4
                 )
 
         )

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ protected function doClone($var)`
`247`	`247`	`$stub->position = $len++;`
`248`	`248`	`} elseif ($pos < $maxItems) {`
`249`	`249`	`if ($maxItems < $pos += \count($a)) {`
`250`		`- $a = \array_slice($a, 0, $maxItems - $pos);`
	`250`	`+ $a = \array_slice($a, 0, $maxItems - $pos, true);`
`251`	`251`	`if ($stub->cut >= 0) {`
`252`	`252`	`$stub->cut += $pos - $maxItems;`
`253`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function testLimits()`
`162`	`162`	`'Level 3 Item 3',`
`163`	`163`	`],`
`164`	`164`	`[`
`165`		`- 'Level 3 Item 4',`
	`165`	`+ 999 => 'Level 3 Item 4',`
`166`	`166`	`'Level 3 Item 5',`
`167`	`167`	`'Level 3 Item 6',`
`168`	`168`	`],`
`@@ -242,7 +242,7 @@ public function testLimits()`
`242`	`242`	`[1] => Array`
`243`	`243`	`(`
`244`	`244`	`[0] => 2`
`245`		`- [2] => 7`
	`245`	`+ [1] => 7`
`246`	`246`	`)`
`247`	`247`
`248`	`248`	`[2] => Array`
`@@ -299,7 +299,7 @@ public function testLimits()`
`299`	`299`
`300`	`300`	`[7] => Array`
`301`	`301`	`(`
`302`		`- [0] => Level 3 Item 4`
	`302`	`+ [999] => Level 3 Item 4`
`303`	`303`	`)`
`304`	`304`
`305`	`305`	`)`