Ticket #2669: ParameterHolderArray.patch

test/unit/util/sfParameterHolderTest.php

@@ -3 +3 @@
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+8
-
-// ->clear()
-$t->diag('->clear()');
@@ -149 +149 @@
-// ->serialize() ->unserialize()
-$t->diag('->serialize() ->unserialize()');
-$t->ok($ph == unserialize(serialize($ph)), 'sfParameterHolder implements the Serializable interface');
+
+// ->count()
+$t->diag('->count()');
+$ph = new sfParameterHolder();
+$ph->add(array('a' => 'b', 'c' => 'd'));
+$t->is(count($ph), 2, 'sfParameterHolder implements the Count interface');
+
+// ->current() ->key() ->next() ->rewind() ->valid()
+$t->diag('->current() ->key() ->next() ->rewind() ->valid()');
+
+$ph = new sfParameterHolder();
+$parameters = array('foo' => 'bar', 'baz' => 'foobar', 'barfoo' => 'bazbar', 'bazfoo' => 'foobarbaz', false => false, 0 => 2);
+$ph->add($parameters);
+
+$testparameters = array();
+
+foreach ($ph as $key => $value)
+{
+  $testparameters[$key] = $value;
+}
+
+$t->is_deeply($testparameters, $parameters, 'sfParameterHolder implements the Iterator interface');
+
+// '->offsetExists() ->offsetGet() ->offsetSet() ->offsetUnset()
+$t->diag('->offsetExists() ->offsetGet() ->offsetSet() ->offsetUnset()');
+
+$t->ok(isset($ph['foo']), 'sfParameterHolder implements ArrayAccess interface for isset()');
+$t->is($ph['foo'], 'bar', 'sfParameterHolder implements ArrayAccess interface for get');
+$ph['foo'] = 'moo';
+$t->is($ph->get('foo'), 'moo', 'sfParameterHolder implements ArrayAccess interface for set');
+unset($ph['foo']);
+$t->ok(!$ph->has('foo'), 'sfParameterHolder implements ArrayAccess interface for unset()');

test/unit/util/sfNamespacedParameterHolderTest.php

@@ -3 +3 @@
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-0
+6
-
-// ->clear()
-$t->diag('->clear()');
@@ -239 +239 @@
-// ->serialize() ->unserialize()
-$t->diag('->serialize() ->unserialize()');
-$t->ok($ph == unserialize(serialize($ph)), 'sfNamespacedParameterHolder implements the Serializable interface');
+
+// ->count()
+$t->diag('->count()');
+$ph = new sfNamespacedParameterHolder();
+$ph->add(array('a' => 'b', 'c' => 'd'));
+$t->is(count($ph), 2, 'sfNamespacedParameterHolder implements the Count interface');
+
+// ->current() ->key() ->next() ->rewind() ->valid()
+$t->diag('->current() ->key() ->next() ->rewind() ->valid()');
+
+$ph = new sfNamespacedParameterHolder();
+$parameters = array('foo' => 'bar', 'baz' => 'foobar', 'barfoo' => 'bazbar', 'bazfoo' => 'foobarbaz', false => false, 0 => 2);
+$ph->add($parameters);
+
+$testparameters = array();
+
+foreach ($ph as $key => $value)
+{
+  $testparameters[$key] = $value;
+}
+
+$t->is_deeply($testparameters, $parameters, 'sfNamespacedParameterHolder implements the Iterator interface');
+
+// '->offsetExists() ->offsetGet() ->offsetSet() ->offsetUnset()
+$t->diag('->offsetExists() ->offsetGet() ->offsetSet() ->offsetUnset()');
+
+$t->ok(isset($ph['foo']), 'sfNamespacedParameterHolder implements ArrayAccess interface for isset()');
+$t->is($ph['foo'], 'bar', 'sfNamespacedParameterHolder implements ArrayAccess interface for get');
+$ph['foo'] = 'moo';
+$t->is($ph->get('foo'), 'moo', 'sfNamespacedParameterHolder implements ArrayAccess interface for set');
+unset($ph['foo']);
+$t->ok(!$ph->has('foo'), 'sfNamespacedParameterHolder implements ArrayAccess interface for unset()');

lib/util/sfNamespacedParameterHolder.class.php

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr.
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
@@ -21 +21 @@
- * @author     Sean Kerr <skerr@mojavi.org>
- * @version    SVN: $Id$
- */
-
+, Iterator, Countable, ArrayAccess
-{
-  protected $default_namespace = null;
-  protected $parameters = array();
-
-  /**
-   * The constructor for sfParameterHolder.
- 
+
-   * The default namespace may be overridden at initialization as follows:
-   * <code>
-   * <?php
@@ -52 +52 @@
-    if ($move)
-    {
-      $values = $this->removeNamespace();
-
+
+
+
+
+
+
-    }
-
-    $this->default_namespace = $namespace;
@@ -151 +156 @@
-   * Retrieve an array of parameters, within a namespace.
-   *
-   * This method is limited to a namespace.  Without any argument,
- 
+
-   * namespace is passed as an argument, only the parameters of the
-   * specified namespace are returned.
-   *
@@ -410 +415 @@
-    $this->default_namespace = $data[0];
-    $this->parameters = $data[1];
-  }
+
+  /**
+   * Implements the Iterator interface: Returns the current parameter
+   */
+  public function current()
+  {
+    return current($this->parameters[$this->default_namespace]);
+  }
+
+  /**
+   * Implements the Iterator interface: Returns the current parameter name
+   */
+  public function key()
+  {
+    return key($this->parameters[$this->default_namespace]);
+  }
+
+  /**
+   * Implements the Iterator interface: Moves to the next parameter
+   */
+  public function next()
+  {
+    next($this->parameters[$this->default_namespace]);
+  }
+
+  /**
+   * Implements the Iterator interface: Moves to the first parameter
+   */
+  public function rewind()
+  {
+    reset($this->parameters[$this->default_namespace]);
+  }
+
+  /**
+   * Implements the Iterator interface: Checks if parameter is valid.
+   */
+  public function valid()
+  {
+    if ($this->hasNamespace($this->default_namespace))
+    {
+      return false;
+    }
+
+    prev($this->parameters[$this->default_namespace]);
+    return each($this->parameters[$this->default_namespace]) !== false;
+  }
+
+  /**
+   * Counts the number of parameters
+   */
+  public function count()
+  {
+    return count($this->parameters[$this->default_namespace]);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->has()
+   * @see has()
+   */
+  public function offsetExists($offset)
+  {
+    return $this->has($offset);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->get()
+   * @see get()
+   */
+  public function offsetGet($offset)
+  {
+    return $this->get($offset);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->set()
+   * @see set()
+   */
+  public function offsetSet($offset, $set)
+  {
+    $this->set($offset, $set);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->remove()
+   * @see remove()
+   */
+  public function offsetUnset($offset)
+  {
+    $this->remove($offset);
+  }
-}

lib/util/sfParameterHolder.class.php

@@ -4 +4 @@
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004-2006 Sean Kerr.
- 
+
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
@@ -21 +21 @@
- * @author     Sean Kerr <skerr@mojavi.org>
- * @version    SVN: $Id$
- */
-
+, Iterator, Countable, ArrayAccess
-{
-  protected $parameters = array();
-
@@ -225 +225 @@
-  {
-    $this->parameters = unserialize($serialized);
-  }
+
+  /**
+   * Implements the Iterator interface: Returns the current parameter
+   */
+  public function current()
+  {
+    return current($this->parameters);
+  }
+
+  /**
+   * Implements the Iterator interface: Returns the current parameter name
+   */
+  public function key()
+  {
+    return key($this->parameters);
+  }
+
+  /**
+   * Implements the Iterator interface: Moves to the next parameter
+   */
+  public function next()
+  {
+    next($this->parameters);
+  }
+
+  /**
+   * Implements the Iterator interface: Moves to the first parameter
+   */
+  public function rewind()
+  {
+    reset($this->parameters);
+  }
+
+  /**
+   * Implements the Iterator interface: Checks if parameter is valid.
+   */
+  public function valid()
+  {
+    prev($this->parameters);
+    return each($this->parameters) !== false;
+  }
+
+  /**
+   * Counts the number of parameters
+   */
+  public function count()
+  {
+    return count($this->parameters);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->has()
+   * @see has()
+   */
+  public function offsetExists($offset)
+  {
+    return $this->has($offset);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->get()
+   * @see get()
+   */
+  public function offsetGet($offset)
+  {
+    return $this->get($offset);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->set()
+   * @see set()
+   */
+  public function offsetSet($offset, $set)
+  {
+    $this->set($offset, $set);
+  }
+
+  /**
+   * Wrapper for ArrayAccess interface for ->remove()
+   * @see remove()
+   */
+  public function offsetUnset($offset)
+  {
+    $this->remove($offset);
+  }
-}