cvs: pear /CodeGen_PECL/PECL/Dependency With.php /CodeGen_PECL/PECL/Element Test.php

hholzgra Fri Feb 17 10:03:47 2006 UTC Modified files: /pear/CodeGen_PECL/PECL/Dependency With.php /pear/CodeGen_PECL/PECL/Element Test.php Log: changed ereg() calls to preg_match() http://cvs.php.net/viewcvs.cgi/pear/CodeGen_PECL/PECL/Dependency/With.php?r1=1.6&r2=1.7&diff_format=u Index: pear/CodeGen_PECL/PECL/Dependency/With.php diff -u pear/CodeGen_PECL/PECL/Dependency/With.php:1.6 pear/CodeGen_PECL/PECL/Dependency/With.php:1.7 --- pear/CodeGen_PECL/PECL/Dependency/With.php:1.6 Sat Feb 4 19:19:07 2006 +++ pear/CodeGen_PECL/PECL/Dependency/With.php Fri Feb 17 10:03:46 2006 @@ -15,7 +15,7 @@ * @author Hartmut Holzgraefe <hartmut@php.net> * @copyright 2005 Hartmut Holzgraefe * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: With.php,v 1.6 2006/02/04 19:19:07 hholzgra Exp $ + * @version CVS: $Id: With.php,v 1.7 2006/02/17 10:03:46 hholzgra Exp $ * @link http://pear.php.net/package/CodeGen */ @@ -114,7 +114,7 @@ */ function setName($name) { - if (!ereg("[[:alpha:]][[:alnum:]-]*", $name)) { + if (!preg_match('|[a-z][a-z0-9-]*|i', $name)) { return PEAR::raiseError("'$name' is not a valid --with option name"); } http://cvs.php.net/viewcvs.cgi/pear/CodeGen_PECL/PECL/Element/Test.php?r1=1.8&r2=1.9&diff_format=u Index: pear/CodeGen_PECL/PECL/Element/Test.php diff -u pear/CodeGen_PECL/PECL/Element/Test.php:1.8 pear/CodeGen_PECL/PECL/Element/Test.php:1.9 --- pear/CodeGen_PECL/PECL/Element/Test.php:1.8 Sun Aug 14 18:54:20 2005 +++ pear/CodeGen_PECL/PECL/Element/Test.php Fri Feb 17 10:03:47 2006 @@ -15,7 +15,7 @@ * @author Hartmut Holzgraefe <hartmut@php.net> * @copyright 2005 Hartmut Holzgraefe * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Test.php,v 1.8 2005/08/14 18:54:20 hholzgra Exp $ + * @version CVS: $Id: Test.php,v 1.9 2006/02/17 10:03:47 hholzgra Exp $ * @link http://pear.php.net/package/CodeGen */ @@ -61,7 +61,7 @@ * @return string value of */ function setName($name) { - if (! ereg("[[:alnum:]_-]+", $name)) { + if (! preg_match('|^[\w-]+$|i', $name)) { return PEAR::raiseError("'$name' is not a valid test case basename"); }