Changeset 7576

Timestamp:

02/22/08 16:58:07 (1 year ago)

Author:

fabien

Message:

refactored sfToolkit::getArrayValueForPath() and added sfToolkit::hasArrayValueForPath()

Files:

• branches/1.1/lib/util/sfNamespacedParameterHolder.class.php (modified) (1 diff)
• branches/1.1/lib/util/sfParameterHolder.class.php (modified) (1 diff)
• branches/1.1/lib/util/sfToolkit.class.php (modified) (1 diff)
• branches/1.1/test/unit/util/sfNamespacedParameterHolderTest.php (modified) (4 diffs)
• branches/1.1/test/unit/util/sfParameterHolderTest.php (modified) (4 diffs)
• branches/1.1/test/unit/util/sfToolkitTest.php (modified) (2 diffs)

branches/1.1/lib/util/sfNamespacedParameterHolder.class.php

@@ -192 +192 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-      return true;
+    }
+    else if (isset($this->parameters[$ns]))
+    {
+      return sfToolkit::hasArrayValueForPath($this->parameters[$ns], $name);
-    }
-

branches/1.1/lib/util/sfParameterHolder.class.php

@@ -92 +92 @@
-  public function has($name)
-  {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-      return true;
+    }
+    else
+    {
+      return sfToolkit::getArrayValueForPath($this->parameters, $name);
-    }
-

branches/1.1/lib/util/sfToolkit.class.php

@@ -497 +497 @@
-  public static function getArrayValueForPath($values, $name, $default = null)
-  {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-

branches/1.1/test/unit/util/sfNamespacedParameterHolderTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-60
+52
-
-// ->clear()
@@ -37 +37 @@
-$t->is('bar', $ph->get('myfoo', null, 'symfony/mynamespace'), '->get() takes an optional namespace as its third argument');
-$t->is(null, $ph->get('myfoo'), '->get() can have the same key for several namespaces');
-
-$ph = new sfNamespacedParameterHolder();
-$ph->add(array('foo' => array(
-  'bar' => array(
-    'baz' => 'foo bar',
-  ),
-  'bars' => array('foo', 'bar'),
-)));
-$t->is($ph->get('foo[bar][baz]'), 'foo bar', '->get() can take a multi-array key');
-$t->is($ph->get('foo[bars][1]'), 'bar', '->get() can take a multi-array key');
-$t->is($ph->get('foo[bars][2]'), null, '->get() returns null if the key does not exist');
-$t->is($ph->get('foo[bars][]'), array('foo', 'bar'), '->get() returns an array');
-$t->is($ph->get('foo[bars][]'), $ph->get('foo[bars]'), '->get() returns an array even if you omit the []');
-
-// ->getNames()
@@ -107 +94 @@
-$t->is($ph->has('myfoo', 'symfony/mynamespace'), true, '->has() returns true if the key exists in the namespace given as its second argument');
-
-$ph = new sfNamespacedParameterHolder();
-$ph->add(array('foo' => array(
-  'bar' => array(
-    'baz' => 'foo bar',
-  ),
-  'bars' => array('foo', 'bar'),
-)));
-$t->is($ph->has('foo[bar][baz]'), true, '->has() can takes a multi-array key');
-$t->is($ph->get('foo[bars][1]'), true, '->has() can takes a multi-array key');
-$t->is($ph->get('foo[bars][2]'), false, '->has() returns null is the key does not exist');
-$t->is($ph->has('foo[bars][]'), true, '->has() returns true if an array exists');
-$t->is($ph->get('foo[bars][]'), $ph->has('foo[bars]'), '->has() returns true for an array even if you omit the []');
-
-// ->hasNamespace()
-$t->diag('->hasNamespace()');
@@ -240 +214 @@
-$t->diag('->serialize() ->unserialize()');
-$t->ok($ph == unserialize(serialize($ph)), 'sfNamespacedParameterHolder implements the Serializable interface');
+
+// Array path as a key
+$t->diag('Array path as a key');
+$ph = new sfNamespacedParameterHolder();
+$ph->add(array('foo' => array('bar' => 'foo')));
+$t->is($ph->has('foo[bar]'), true, '->has() can takes a multi-array key');
+$t->is($ph->get('foo[bar]'), 'foo', '->has() can takes a multi-array key');

branches/1.1/test/unit/util/sfParameterHolderTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-32
+24
-
-// ->clear()
@@ -32 +32 @@
-$ph = new sfParameterHolder();
-$t->is('default_value', $ph->get('foo1', 'default_value'), '->get() takes the default value as its second argument');
-
-$ph = new sfParameterHolder();
-$ph->add(array('foo' => array(
-  'bar' => array(
-    'baz' => 'foo bar',
-  ),
-  'bars' => array('foo', 'bar'),
-)));
-$t->is($ph->get('foo[bar][baz]'), 'foo bar', '->get() can take a multi-array key');
-$t->is($ph->get('foo[bars][1]'), 'bar', '->get() can take a multi-array key');
-$t->is($ph->get('foo[bars][2]'), null, '->get() returns null if the key does not exist');
-$t->is($ph->get('foo[bars][]'), array('foo', 'bar'), '->get() returns an array');
-$t->is($ph->get('foo[bars][]'), $ph->get('foo[bars]'), '->get() returns an array even if you omit the []');
-
-// ->getNames()
@@ -67 +54 @@
-$t->is($ph->has('foo'), true, '->has() returns true if the key exists');
-$t->is($ph->has('bar'), false, '->has() returns false if the key does not exist');
-
-$ph = new sfParameterHolder();
-$ph->add(array('foo' => array(
-  'bar' => array(
-    'baz' => 'foo bar',
-  ),
-  'bars' => array('foo', 'bar'),
-)));
-$t->is($ph->has('foo[bar][baz]'), true, '->has() can takes a multi-array key');
-$t->is($ph->get('foo[bars][1]'), true, '->has() can takes a multi-array key');
-$t->is($ph->get('foo[bars][2]'), false, '->has() returns null is the key does not exist');
-$t->is($ph->has('foo[bars][]'), true, '->has() returns true if an array exists');
-$t->is($ph->get('foo[bars][]'), $ph->has('foo[bars]'), '->has() returns true for an array even if you omit the []');
-
-// ->remove()
@@ -150 +124 @@
-$t->diag('->serialize() ->unserialize()');
-$t->ok($ph == unserialize(serialize($ph)), 'sfParameterHolder implements the Serializable interface');
+
+// Array path as a key
+$t->diag('Array path as a key');
+$ph = new sfParameterHolder();
+$ph->add(array('foo' => array('bar' => 'foo')));
+$t->is($ph->has('foo[bar]'), true, '->has() can takes a multi-array key');
+$t->is($ph->get('foo[bar]'), 'foo', '->has() can takes a multi-array key');

branches/1.1/test/unit/util/sfToolkitTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-70
+92
-
-// ::stringToArray()
@@ -173 +173 @@
-  '::arrayDeepMerge() recursively merges arrays preserving numerical keys'
-);
+
+$arr = array(
+  'foobar' => 'foo',
+  'foo' => array(
+    'bar' => array(
+      'baz' => 'foo bar',
+    ),
+  ),
+  'bar' => array(
+    'foo',
+    'bar',
+  ),
+);
+
+// ::hasArrayValueForPath()
+$t->diag('::hasArrayValueForPath()');
+
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'foobar'), true, '::hasArrayValueForPath() returns true if the path exists');
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'barfoo'), false, '::hasArrayValueForPath() returns false if the path does not exist');
+
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'foo[bar][baz]'), true, '::hasArrayValueForPath() works with deep paths');
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'foo[bar][bar]'), false, '::hasArrayValueForPath() works with deep paths');
+
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'foo[]'), true, '::hasArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'foobar[]'), false, '::hasArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'barfoo[]'), false, '::hasArrayValueForPath() accepts a [] at the end to check for an array');
+
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'bar[1]'), true, '::hasArrayValueForPath() can take an array indexed by integer');
+$t->is(sfToolkit::hasArrayValueForPath($arr, 'bar[2]'), false, '::hasArrayValueForPath() can take an array indexed by integer');
+
+// ::getArrayValueForPath()
+$t->diag('::getArrayValueForPath()');
+
+$t->is(sfToolkit::getArrayValueForPath($arr, 'foobar'), 'foo', '::getArrayValueForPath() returns the value of the path if it exists');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'barfoo'), null, '::getArrayValueForPath() returns null if the path does not exist');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'barfoo', 'bar'), 'bar', '::getArrayValueForPath() takes a default value as its third argument');
+
+$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[bar][baz]'), 'foo bar', '::getArrayValueForPath() works with deep paths');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[bar][bar]'), false, '::getArrayValueForPath() works with deep paths');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[bar][bar]', 'bar'), 'bar', '::getArrayValueForPath() works with deep paths');
+
+$t->is(sfToolkit::getArrayValueForPath($arr, 'foo[]'), array('bar' => array('baz' => 'foo bar')), '::getArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'foobar[]'), null, '::getArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'barfoo[]'), null, '::getArrayValueForPath() accepts a [] at the end to check for an array');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'foobar[]', 'foo'), 'foo', '::getArrayValueForPath() accepts a [] at the end to check for an array');
+
+$t->is(sfToolkit::getArrayValueForPath($arr, 'bar[1]'), 'bar', '::getArrayValueForPath() can take an array indexed by integer');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'bar[2]'), null, '::getArrayValueForPath() can take an array indexed by integer');
+$t->is(sfToolkit::getArrayValueForPath($arr, 'bar[2]', 'foo'), 'foo', '::getArrayValueForPath() can take an array indexed by integer');