diff --git a/src/Template/Bake/Element/array_property.ctp b/src/Template/Bake/Element/array_property.ctp index b9ab8910599..fc092bc495f 100644 --- a/src/Template/Bake/Element/array_property.ctp +++ b/src/Template/Bake/Element/array_property.ctp @@ -7,4 +7,4 @@ use Cake\Utility\Inflector; * * @var array */ - public $<%= $name %> = [<%= $this->Bake->stringifyList($value, ['keys' => true]) %>]; + public $<%= $name %> = [<%= $this->Bake->stringifyList($value) %>]; diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php index 59f29f17d50..18288e3cbb5 100644 --- a/src/View/Helper/BakeHelper.php +++ b/src/View/Helper/BakeHelper.php @@ -55,21 +55,16 @@ public function arrayProperty($name, $value, $options = []) { */ public function stringifyList($list, $options = []) { $options += [ - 'keys' => false, - 'indent' => 2, - 'callback' => function ($v) { - return "'$v'"; - }, + 'indent' => 2 ]; if (!$list) { return ''; } - $wrapped = array_map($options['callback'], $list); - - if (!empty($option['keys'])) { - foreach($wrapped as $k => &$v) { + foreach($list as $k => &$v) { + $v = "'$v'"; + if (!is_numeric($k)) { $v = "'$k' => $v"; } } @@ -82,7 +77,7 @@ public function stringifyList($list, $options = []) { $end = "\n" . str_repeat("\t", $options['indent'] - 1); } - return $start . implode($join, $wrapped) . $end; + return $start . implode($join, $list) . $end; } public function aliasExtractor($modelObj, $assoc) {