mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
Add support for NULL values in Set::format().
Add test case. Fixes #2076.
This commit is contained in:
parent
3becdc5959
commit
5d3fdfc9d6
2 changed files with 21 additions and 1 deletions
|
@ -327,7 +327,7 @@ class Set {
|
|||
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];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2255,6 +2255,26 @@ class SetTest extends CakeTestCase {
|
|||
$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
|
||||
*
|
||||
|
|
Loading…
Add table
Reference in a new issue