Merge pull request #142 from martijnpieters/yaml-fix

j0k3r · web-flow · commit a82ef81833f3 · 2016-12-05T11:26:05.000+01:00
Fixed yaml dumpArray() for PHP 7.1
diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
@@ -134,7 +134,7 @@ static protected function dumpArray($value)
     if (
       (1 == count($keys) && '0' == $keys[0])
       ||
-      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
+      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', '$w = is_numeric($w) ? $w : 0; return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
     {
       $output = array();
       foreach ($value as $val)

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ static protected function dumpArray($value)`
`134`	`134`	`if (`
`135`	`135`	`(1 == count($keys) && '0' == $keys[0])`
`136`	`136`	`\|\|`
`137`		`- (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))`
	`137`	`+ (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', '$w = is_numeric($w) ? $w : 0; return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))`
`138`	`138`	`{`
`139`	`139`	`$output = array();`
`140`	`140`	`foreach ($value as $val)`