Changeset 8532

Timestamp:

04/18/08 19:25:28 (6 months ago)

Author:

fabien

Message:

added support for multi-array keys in sf*ParameterHolder::remove

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) (2 diffs)
• branches/1.1/test/unit/util/sfParameterHolderTest.php (modified) (2 diffs)
• branches/1.1/test/unit/util/sfToolkitTest.php (modified) (2 diffs)

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

@@ -240 +240 @@
-      unset($this->parameters[$ns][$name]);
-    }
+    else
+    {
+      $retval = sfToolkit::removeArrayValueForPath($this->parameters[$ns], $name, $default);
+    }
-
-    return $retval;

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

@@ -121 +121 @@
-      unset($this->parameters[$name]);
-    }
+    else
+    {
+      $retval = sfToolkit::removeArrayValueForPath($this->parameters, $name, $default);
+    }
-
-    return $retval;

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

@@ -564 +564 @@
-
-  /**
+   * Removes a path for the given array.
+   *
+   * @param array  The values to search
+   * @param string The token name
+   * @param mixed  The default value to return if the name does not exist
+   */
+  public static function removeArrayValueForPath(&$values, $name, $default = null)
+  {
+    if (false === $offset = strpos($name, '['))
+    {
+      if (isset($values[$name]))
+      {
+        $value = $values[$name];
+        unset($values[$name]);
+
+        return $value;
+      }
+      else
+      {
+        return $default;
+      }
+    }
+
+    if (!isset($values[substr($name, 0, $offset)]))
+    {
+      return $default;
+    }
+
+    $value = &$values[substr($name, 0, $offset)];
+
+    while (false !== $pos = strpos($name, '[', $offset))
+    {
+      $end = strpos($name, ']', $pos);
+      if ($end == $pos + 1)
+      {
+        // reached a []
+        if (!is_array($value))
+        {
+          return $default;
+        }
+        break;
+      }
+      else if (!isset($value[substr($name, $pos + 1, $end - $pos - 1)]))
+      {
+        return $default;
+      }
+
+      $parent = &$value;
+      $key = substr($name, $pos + 1, $end - $pos - 1);
+      $value = &$value[$key];
+      $offset = $end;
+    }
+
+    if ($key)
+    {
+      unset($parent[$key]);
+    }
+
+    return $value;
+  }
+
+  /**
-   * Get path to php cli.
-   *

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+4
-
-// ->clear()
@@ -221 +221 @@
-$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');
+$t->is($ph->remove('foo[bar]'), 'foo', '->remove() can takes a multi-array key');
+$t->is($ph->getAll(), array('foo' => array()), '->remove() can takes a multi-array key');

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-4
+6
-
-// ->clear()
@@ -131 +131 @@
-$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');
+$t->is($ph->remove('foo[bar]'), 'foo', '->remove() can takes a multi-array key');
+$t->is($ph->getAll(), array('foo' => array()), '->remove() can takes a multi-array key');

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

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-3
+9
-
-// ::stringToArray()
@@ -234 +234 @@
-$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');
+
+// ::removeArrayValueForPath()
+$t->diag('::removeArrayValueForPath()');
+$t->is(sfToolkit::removeArrayValueForPath($arr, 'foobar'), 'foo', '::removeArrayValueForPath() returns the removed value');
+$t->is($arr, array(
+  'foo' => array(
+    'bar' => array(
+      'baz' => 'foo bar',
+    ),
+  ),
+  'bar' => array(
+    'foo',
+    'bar',
+  ),
+), '::removeArrayValueForPath() removes a key');
+$t->is(sfToolkit::removeArrayValueForPath($arr, 'barfoo'), null, '::removeArrayValueForPath() returns null if the key does not exist');
+$t->is(sfToolkit::removeArrayValueForPath($arr, 'barfoo', 'bar'), 'bar', '::removeArrayValueForPath() takes the default value as a third argument');
+
+$t->is(sfToolkit::removeArrayValueForPath($arr, 'foo[bar][baz]'), 'foo bar', '::removeArrayValueForPath() works with deep paths');
+$t->is($arr, array(
+  'foo' => array(
+    'bar' => array(
+    ),
+  ),
+  'bar' => array(
+    'foo',
+    'bar',
+  ),
+), '::removeArrayValueForPath() works with deep paths');