Changeset 6375
- Timestamp:
- 12/07/07 21:11:13 (2 years ago)
- Files:
-
- branches/1.0/lib/i18n/sfCultureInfo.class.php (modified) (1 diff)
- branches/1.0/test/unit/i18n/sfCultureInfoTest.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0/lib/i18n/sfCultureInfo.class.php
r5776 r6375 633 633 * @return array simplified array. 634 634 */ 635 protected function simplify($array) 636 { 637 for ($i = 0, $max = count($array); $i < $max; $i++) 638 { 639 $key = key($array); 640 if (is_array($array[$key]) && count($array[$key]) == 1) 641 { 642 $array[$key] = $array[$key][0]; 643 } 644 next($array); 635 static protected function simplify($array) 636 { 637 foreach ($array as &$item) 638 { 639 if (is_array($item) && count($item) == 1) 640 { 641 $item = $item[0]; 642 } 645 643 } 646 644 branches/1.0/test/unit/i18n/sfCultureInfoTest.php
r2834 r6375 11 11 require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 12 12 13 $t = new lime_test(5 2, new lime_output_color());13 $t = new lime_test(56, new lime_output_color()); 14 14 15 15 // __construct() … … 189 189 $c->NumberFormat = '#'; 190 190 $t->is($c->getNumberFormat(), '#', '->setNumberFormat() is equivalent to ->NumberFormat = '); 191 192 // ->simplify() 193 $t->diag('->simplify()'); 194 195 class myCultureInfo extends sfCultureInfo 196 { 197 static public function simplify($array) 198 { 199 return parent::simplify($array); 200 } 201 } 202 203 $array1 = array(0 => 'hello', 1 => 'world'); 204 $array2 = array(0 => array('hello'), 1 => 'world'); 205 $array3 = array(0 => array('hello', 'hi'), 1 => 'world'); 206 207 $ci = new myCultureInfo(); 208 209 $t->isa_ok($ci->simplify($array1), 'array', '::simplify() returns an array'); 210 $t->is_deeply($ci->simplify($array1), $array1, '::simplify() leaves 1D-arrays unchanged'); 211 $t->is_deeply($ci->simplify($array2), $array1, '::simplify() simplifies arrays'); 212 $t->is_deeply($ci->simplify($array3), $array3, '::simplify() leaves not-simplifiable arrays unchanged');
