diff options
| author | Nuno Lopes <nlopess@php.net> | 2006-05-07 18:11:40 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2006-05-07 18:11:40 +0000 |
| commit | eb5343ee47dbfbd41afb2783da9377a6683294cf (patch) | |
| tree | ac56c1570ec28c29d92d3f35991468c288b4c6dc | |
| parent | fc91929f9455e9af8c1c3d698d7bf688a70e5034 (diff) | |
| download | php-git-eb5343ee47dbfbd41afb2783da9377a6683294cf.tar.gz | |
convert a few more functions to unicode and adapt the tests as well
| -rw-r--r-- | ext/tidy/tests/007.phpt | 4 | ||||
| -rw-r--r-- | ext/tidy/tests/021.phpt | 23 | ||||
| -rw-r--r-- | ext/tidy/tidy.c | 12 |
3 files changed, 33 insertions, 6 deletions
diff --git a/ext/tidy/tests/007.phpt b/ext/tidy/tests/007.phpt index 26867ff3fb..0b506ac1dd 100644 --- a/ext/tidy/tests/007.phpt +++ b/ext/tidy/tests/007.phpt @@ -19,3 +19,7 @@ tidy.default_config= Current Value of 'tidy-mark': bool(false) Current Value of 'error-file': string(0) "" Current Value of 'tab-size': int(8) +--UEXPECT-- +Current Value of 'tidy-mark': bool(false) +Current Value of 'error-file': unicode(0) "" +Current Value of 'tab-size': int(8) diff --git a/ext/tidy/tests/021.phpt b/ext/tidy/tests/021.phpt new file mode 100644 index 0000000000..94aa6c7f73 --- /dev/null +++ b/ext/tidy/tests/021.phpt @@ -0,0 +1,23 @@ +--TEST-- +tidy_get_opt_doc() +--SKIPIF-- +<?php if (!extension_loaded("tidy") || !function_exists('tidy_get_opt_doc')) print "skip"; ?> +--FILE-- +<?php + +var_dump(tidy_get_opt_doc(new tidy, 'some_bogus_cfg')); + +$t = new tidy; +var_dump($t->getOptDoc('ncr')); +var_dump(strlen(tidy_get_opt_doc($t, 'wrap')) > 99); +?> +--EXPECT-- +Warning: tidy_get_opt_doc(): Unknown Tidy Configuration Option 'some_bogus_cfg' in /cvs/php-src/ext/tidy/tests/021.php on line 3 +bool(false) +string(73) "This option specifies if Tidy should allow numeric character references. " +bool(true) +--UEXPECT-- +Warning: tidy_get_opt_doc(): Unknown Tidy Configuration Option 'some_bogus_cfg' in /cvs/php-src/ext/tidy/tests/021.php on line 3 +bool(false) +unicode(73) "This option specifies if Tidy should allow numeric character references. " +bool(true) diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index f82bd25510..4de4555efe 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -1220,7 +1220,7 @@ PHP_FUNCTION(tidy_get_release) #if HAVE_TIDYOPTGETDOC -/* {{{ proto string tidy_get_opt_doc(tidy resource, string optname) +/* {{{ proto string tidy_get_opt_doc(tidy resource, string optname) U Returns the documentation for the given option name */ PHP_FUNCTION(tidy_get_opt_doc) { @@ -1251,7 +1251,7 @@ PHP_FUNCTION(tidy_get_opt_doc) } if ( (optval = (char *) tidyOptGetDoc(obj->ptdoc->doc, opt)) ) { - RETURN_STRING(optval, 1); + RETURN_ASCII_STRING(optval, 1); } RETURN_FALSE; @@ -1260,8 +1260,8 @@ PHP_FUNCTION(tidy_get_opt_doc) #endif -/* {{{ proto array tidy_get_config() - Get current Tidy configuarion */ +/* {{{ proto array tidy_get_config() U + Get current Tidy configuration */ PHP_FUNCTION(tidy_get_config) { TidyIterator itOpt; @@ -1282,7 +1282,7 @@ PHP_FUNCTION(tidy_get_config) opt_value = php_tidy_get_opt_val(obj->ptdoc, opt, &optt TSRMLS_CC); switch (optt) { case TidyString: - add_assoc_string(return_value, opt_name, (char*)opt_value, 0); + add_assoc_ascii_string(return_value, opt_name, (char*)opt_value, 0); break; case TidyInteger: @@ -1414,7 +1414,7 @@ PHP_FUNCTION(tidy_getopt) optval = php_tidy_get_opt_val(obj->ptdoc, opt, &optt TSRMLS_CC); switch (optt) { case TidyString: - RETURN_STRING((char *)optval, 0); + RETURN_ASCII_STRING((char *)optval, 0); break; case TidyInteger: |