Permalink
Browse files

Add support for NULL values in Set::format().

Add test case.
Fixes #2076.
  • Loading branch information...
Thomas Ploch authored and markstory committed Oct 7, 2011
1 parent d823710 commit e894ab2dd27d8a742f4489450414d8aef825e2ec
Showing with 21 additions and 1 deletion.
  1. +1 −1 cake/libs/set.php
  2. +20 −0 cake/tests/cases/libs/set.test.php
View
@@ -329,7 +329,7 @@ function format($data, $format, $keys) {
for ($j = 0; $j < $count; $j++) {
$args = array();
for ($i = 0; $i < $count2; $i++) {
if (isset($data[$i][$j])) {
if (array_key_exists($j, $data[$i])) {
$args[] = $data[$i][$j];
}
}
@@ -2160,6 +2160,26 @@ function testFormatting() {
$expected = array('Nate, 42', 'Larry, 0', 'Garrett, 0');
$this->assertEqual($result, $expected);
}
/**
* testFormattingNullValues method
*
* @return void
*/
public function testFormattingNullValues() {
$data = array(
array('Person' => array('first_name' => 'Nate', 'last_name' => 'Abele', 'city' => 'Boston', 'state' => 'MA', 'something' => '42')),
array('Person' => array('first_name' => 'Larry', 'last_name' => 'Masters', 'city' => 'Boondock', 'state' => 'TN', 'something' => null)),
array('Person' => array('first_name' => 'Garrett', 'last_name' => 'Woodworth', 'city' => 'Venice Beach', 'state' => 'CA', 'something' => null)));
$result = Set::format($data, '%s', array('{n}.Person.something'));
$expected = array('42', '', '');
$this->assertEqual($expected, $result);
$result = Set::format($data, '{0}, {1}', array('{n}.Person.city', '{n}.Person.something'));
$expected = array('Boston, 42', 'Boondock, ', 'Venice Beach, ');
$this->assertEqual($expected, $result);
}
/**
* testCountDim method
*

0 comments on commit e894ab2

Please sign in to comment.