Changeset 6376

Timestamp:

12/07/07 21:11:36 (2 years ago)

Author:

fabien

Message:

changed implementation of sfCultureInfo::simplify (closes #1821)

Files:

• trunk/lib/i18n/sfCultureInfo.class.php (modified) (1 diff)
• trunk/test/unit/i18n/sfCultureInfoTest.php (modified) (2 diffs)

trunk/lib/i18n/sfCultureInfo.class.php

@@ -638 +638 @@
-   * @return array simplified array.
-   */
-
-
-
-
-
-
+
+
+
+
+
-      {
-array[$key] = $array[$key]
+item = $item
-      }
-      next($array);
-    }
-

trunk/test/unit/i18n/sfCultureInfoTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+6
-
-// __construct()
@@ -189 +189 @@
-$c->NumberFormat = '#';
-$t->is($c->getNumberFormat(), '#', '->setNumberFormat() is equivalent to ->NumberFormat = ');
+
+// ->simplify()
+$t->diag('->simplify()');
+
+class myCultureInfo extends sfCultureInfo
+{
+  static public function simplify($array)
+  {
+    return parent::simplify($array);
+  }
+}
+
+$array1 = array(0 => 'hello', 1 => 'world');
+$array2 = array(0 => array('hello'), 1 => 'world');
+$array3 = array(0 => array('hello', 'hi'), 1 => 'world');
+
+$ci = new myCultureInfo();
+
+$t->isa_ok($ci->simplify($array1), 'array', '::simplify() returns an array');
+$t->is_deeply($ci->simplify($array1), $array1, '::simplify() leaves 1D-arrays unchanged');
+$t->is_deeply($ci->simplify($array2), $array1, '::simplify() simplifies arrays');
+$t->is_deeply($ci->simplify($array3), $array3, '::simplify() leaves not-simplifiable arrays unchanged');