cvs: pear /HTML_Common2 Common2.php package.xml /HTML_Common2/tests HTML_Common2_Test.php

avb Wed Oct 27 05:02:58 2004 EDT Modified files: /pear/HTML_Common2 package.xml Common2.php /pear/HTML_Common2/tests HTML_Common2_Test.php Log: renamed updateAttributes() -> mergeAttributes() prepare release 0.1.0 http://cvs.php.net/diff.php/pear/HTML_Common2/package.xml?r1=1.1&r2=1.2&ty=u Index: pear/HTML_Common2/package.xml diff -u pear/HTML_Common2/package.xml:1.1 pear/HTML_Common2/package.xml:1.2 --- pear/HTML_Common2/package.xml:1.1 Tue Oct 26 05:04:09 2004 +++ pear/HTML_Common2/package.xml Wed Oct 27 05:02:57 2004 @@ -26,8 +26,8 @@ </maintainer> </maintainers> <release> - <version>2.0.0dev1</version> - <date>2004-??-??</date> + <version>0.1.0</version> + <date>2004-10-27</date> <license>PHP License</license> <state>dev</state> <notes> http://cvs.php.net/diff.php/pear/HTML_Common2/Common2.php?r1=1.1&r2=1.2&ty=u Index: pear/HTML_Common2/Common2.php diff -u pear/HTML_Common2/Common2.php:1.1 pear/HTML_Common2/Common2.php:1.2 --- pear/HTML_Common2/Common2.php:1.1 Tue Oct 26 05:04:09 2004 +++ pear/HTML_Common2/Common2.php Wed Oct 27 05:02:57 2004 @@ -13,7 +13,7 @@ * @author Alexey Borzov <avb@php.net> * @copyright 2004 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License - * @version CVS: $Id: Common2.php,v 1.1 2004/10/26 09:04:09 avb Exp $ + * @version CVS: $Id: Common2.php,v 1.2 2004/10/27 09:02:57 avb Exp $ * @link http://pear.php.net/package/HTML_Common2 */ @@ -24,7 +24,7 @@ * attribute strings. Port of HTML_Common class for PHP4 originally written by * Adam Daniel with contributions from numerous other developers. * - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * @author Alexey Borzov <avb@php.net> */ abstract class HTML_Common2 @@ -229,7 +229,7 @@ * * @param mixed Array of attribute 'name' => 'value' pairs or HTML attribute string */ - public function updateAttributes($attributes) + public function mergeAttributes($attributes) { $this->_attributes = array_merge($this->_attributes, self::parseAttributes($attributes)); } http://cvs.php.net/diff.php/pear/HTML_Common2/tests/HTML_Common2_Test.php?r1=1.1&r2=1.2&ty=u Index: pear/HTML_Common2/tests/HTML_Common2_Test.php diff -u pear/HTML_Common2/tests/HTML_Common2_Test.php:1.1 pear/HTML_Common2/tests/HTML_Common2_Test.php:1.2 --- pear/HTML_Common2/tests/HTML_Common2_Test.php:1.1 Tue Oct 26 05:04:09 2004 +++ pear/HTML_Common2/tests/HTML_Common2_Test.php Wed Oct 27 05:02:57 2004 @@ -3,7 +3,7 @@ * Unit test suite for HTML_Common2 class * * @author Alexey Borzov <avb@php.net> - * @version $Id: HTML_Common2_Test.php,v 1.1 2004/10/26 09:04:09 avb Exp $ + * @version $Id: HTML_Common2_Test.php,v 1.2 2004/10/27 09:02:57 avb Exp $ */ if (!defined('PHPUnit2_MAIN_METHOD')) { @@ -54,7 +54,7 @@ $obj = new HTML_Common2_Concrete(); $obj->setAttributes(array('BAZ' => 'quux')); $obj->setAttribute('Foo', 'bar'); - $obj->updateAttributes(array('XyZZy' => 'xyzzy value')); + $obj->mergeAttributes(array('XyZZy' => 'xyzzy value')); $this->assertEquals('bar', $obj->getAttribute('FOO')); @@ -100,7 +100,7 @@ { $obj = new HTML_Common2_Concrete(array('multiple')); $obj->setAttribute('selected'); - $obj->updateAttributes('checked nowrap'); + $obj->mergeAttributes('checked nowrap'); $this->assertEquals( array('multiple' => 'multiple', 'selected' => 'selected', 'checked' => 'checked', 'nowrap' => 'nowrap'),