Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update hierselect's value on name change

  • Loading branch information...
commit 51d2efe2c2a6b8cc0a77d1b540aed57616890a0b 1 parent c00ac6d
@sad-spirit sad-spirit authored
View
16 HTML/QuickForm2/Element/Hierselect.php
@@ -278,6 +278,22 @@ public function setValue($value)
return $this;
}
+ /**
+ * Sets the element's name
+ *
+ * Need to override group's implementation due to overridden updateValue()
+ *
+ * @param string $name
+ *
+ * @return HTML_QuickForm2_Element_Hierselect
+ */
+ public function setName($name)
+ {
+ parent::setName($name);
+ $this->updateValue();
+ return $this;
+ }
+
/**
* Called when the element needs to update its value from form's data sources
*
View
2  tests/QuickForm2/Element/AllTests.php
@@ -62,6 +62,7 @@
require_once dirname(__FILE__) . '/InputFileTest.php';
require_once dirname(__FILE__) . '/StaticTest.php';
require_once dirname(__FILE__) . '/DateTest.php';
+require_once dirname(__FILE__) . '/HierselectTest.php';
class QuickForm2_Element_AllTests
{
@@ -92,6 +93,7 @@ public static function suite()
$suite->addTestSuite('HTML_QuickForm2_Element_InputFileTest');
$suite->addTestSuite('HTML_QuickForm2_Element_StaticTest');
$suite->addTestSuite('HTML_QuickForm2_Element_DateTest');
+ $suite->addTestSuite('HTML_QuickForm2_Element_HierselectTest');
return $suite;
}
View
77 tests/QuickForm2/Element/HierselectTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Unit tests for HTML_QuickForm2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2006-2012, Alexey Borzov <avb@php.net>,
+ * Bertrand Mansion <golgote@mamasam.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * The names of the authors may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category HTML
+ * @package HTML_QuickForm2
+ * @author Alexey Borzov <avb@php.net>
+ * @license http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version SVN: $Id$
+ * @link http://pear.php.net/package/HTML_QuickForm2
+ */
+
+/** Sets up includes */
+require_once dirname(dirname(dirname(__FILE__))) . '/TestHelper.php';
+/** Hierarchical select element */
+require_once 'HTML/QuickForm2/Element/Hierselect.php';
+/** Class representing a HTML form */
+require_once 'HTML/QuickForm2.php';
+
+/**
+ * Unit test for HTML_QuickForm2_Element_Hierselect class
+ */
+class HTML_QuickForm2_Element_HierselectTest extends PHPUnit_Framework_TestCase
+{
+ public function testUpdateValueOnNameChange()
+ {
+ $primary = array(1 => 'one', 2 => 'two');
+ $secondary = array(
+ 1 => array(11 => 'one-one', 12 => 'one-two'),
+ 2 => array(21 => 'two-one', 22 => 'two-two')
+ );
+
+ $form = new HTML_QuickForm2('testHierselectForm');
+ $form->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
+ 'foo' => array(1, 12),
+ 'bar' => array(2, 21)
+ )));
+ $hs = $form->addHierselect('foo')->loadOptions(array($primary, $secondary));
+ $this->assertEquals(array(1, 12), $hs->getValue());
+
+ $hs->setName('bar');
+ $this->assertEquals(array(2, 21), $hs->getValue());
+ }
+}
+?>
Please sign in to comment.
Something went wrong with that request. Please try again.