[VarExporter] fix exporting array indexes

xabbuh · xabbuh · commit 3c936f447b2b · 2019-01-01T14:11:42.000+01:00
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -232,7 +232,7 @@ public static function export($value, $indent = '')
                 if (!\is_int($k) || 1 !== $k - $j) {
                     $code .= self::export($k, $subIndent).' => ';
                 }
-                if (\is_int($k)) {
+                if (\is_int($k) && $k > $j) {
                     $j = $k;
                 }
                 $code .= self::export($v, $subIndent).",\n";
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/partially-indexed-array.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/partially-indexed-array.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    5 => true,
+    1 => true,
+    2 => true,
+    true,
+];
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -112,6 +112,7 @@ public function provideExport()
 
         yield array('bool', true, true);
         yield array('simple-array', array(123, array('abc')), true);
+        yield array('partially-indexed-array', array(5 => true, 1 => true, 2 => true, 6 => true), true);
         yield array('datetime', \DateTime::createFromFormat('U', 0));
 
         $value = new \ArrayObject();

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public static function export($value, $indent = '')`
`232`	`232`	`if (!\is_int($k) \|\| 1 !== $k - $j) {`
`233`	`233`	`$code .= self::export($k, $subIndent).' => ';`
`234`	`234`	`}`
`235`		`- if (\is_int($k)) {`
	`235`	`+ if (\is_int($k) && $k > $j) {`
`236`	`236`	`$j = $k;`
`237`	`237`	`}`
`238`	`238`	`$code .= self::export($v, $subIndent).",\n";`