svn: /phpdoc/en/trunk/reference/mbstring/functions/ mb-convert-case.xml mb-decode-numericentity.xml mb-encode-numericentity.xml
mb-regex-set-options.xml

takagi Wed, 30 Jan 2013 21:03:39 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=329377 Log: mbstring: Fix prototypes mb_convert_case(): 2nd parameter is not optional so default value is meaningless. mb_decode_numericentity(): 3rd parameter is optional and its default value is internal encoding. mb_encode_numericentity(): 3rd parameter is optional and its default value is internal encoding. added 4th parameter as of PHP 5.4.0. mb_regex_set_options(): no default value of "options" Changed paths: U phpdoc/en/trunk/reference/mbstring/functions/mb-convert-case.xml U phpdoc/en/trunk/reference/mbstring/functions/mb-decode-numericentity.xml U phpdoc/en/trunk/reference/mbstring/functions/mb-encode-numericentity.xml U phpdoc/en/trunk/reference/mbstring/functions/mb-regex-set-options.xml Modified: phpdoc/en/trunk/reference/mbstring/functions/mb-convert-case.xml =================================================================== --- phpdoc/en/trunk/reference/mbstring/functions/mb-convert-case.xml 2013-01-30 19:13:10 UTC (rev 329376) +++ phpdoc/en/trunk/reference/mbstring/functions/mb-convert-case.xml 2013-01-30 21:03:39 UTC (rev 329377) @@ -11,7 +11,7 @@ <methodsynopsis> <type>string</type><methodname>mb_convert_case</methodname> <methodparam><type>string</type><parameter>str</parameter></methodparam> - <methodparam><type>int</type><parameter>mode</parameter><initializer>MB_CASE_UPPER</initializer></methodparam> + <methodparam><type>int</type><parameter>mode</parameter></methodparam> <methodparam choice="opt"><type>string</type><parameter>encoding</parameter><initializer>mb_internal_encoding()</initializer></methodparam> </methodsynopsis> <para> Modified: phpdoc/en/trunk/reference/mbstring/functions/mb-decode-numericentity.xml =================================================================== --- phpdoc/en/trunk/reference/mbstring/functions/mb-decode-numericentity.xml 2013-01-30 19:13:10 UTC (rev 329376) +++ phpdoc/en/trunk/reference/mbstring/functions/mb-decode-numericentity.xml 2013-01-30 21:03:39 UTC (rev 329377) @@ -12,7 +12,7 @@ <type>string</type><methodname>mb_decode_numericentity</methodname> <methodparam><type>string</type><parameter>str</parameter></methodparam> <methodparam><type>array</type><parameter>convmap</parameter></methodparam> - <methodparam><type>string</type><parameter>encoding</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>encoding</parameter><initializer>mb_internal_encoding()</initializer></methodparam> </methodsynopsis> <para> Convert numeric string reference of <type>string</type> Modified: phpdoc/en/trunk/reference/mbstring/functions/mb-encode-numericentity.xml =================================================================== --- phpdoc/en/trunk/reference/mbstring/functions/mb-encode-numericentity.xml 2013-01-30 19:13:10 UTC (rev 329376) +++ phpdoc/en/trunk/reference/mbstring/functions/mb-encode-numericentity.xml 2013-01-30 21:03:39 UTC (rev 329377) @@ -12,7 +12,8 @@ <type>string</type><methodname>mb_encode_numericentity</methodname> <methodparam><type>string</type><parameter>str</parameter></methodparam> <methodparam><type>array</type><parameter>convmap</parameter></methodparam> - <methodparam><type>string</type><parameter>encoding</parameter></methodparam> + <methodparam choice="opt"><type>string</type><parameter>encoding</parameter><initializer>mb_internal_encoding()</initializer></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>is_hex</parameter></methodparam> </methodsynopsis> <para> Converts @@ -48,6 +49,13 @@ &mbstring.encoding.parameter; </listitem> </varlistentry> + <varlistentry> + <term><parameter>is_hex</parameter></term> + <listitem> + <para> + </para> + </listitem> + </varlistentry> </variablelist> </para> </refsect1> @@ -59,6 +67,30 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <para> + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>5.4.0</entry> + <entry> + Added <parameter>is_hex</parameter> parameter. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </para> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> Modified: phpdoc/en/trunk/reference/mbstring/functions/mb-regex-set-options.xml =================================================================== --- phpdoc/en/trunk/reference/mbstring/functions/mb-regex-set-options.xml 2013-01-30 19:13:10 UTC (rev 329376) +++ phpdoc/en/trunk/reference/mbstring/functions/mb-regex-set-options.xml 2013-01-30 21:03:39 UTC (rev 329377) @@ -10,7 +10,7 @@ &reftitle.description; <methodsynopsis> <type>string</type><methodname>mb_regex_set_options</methodname> - <methodparam choice="opt"><type>string</type><parameter>options</parameter><initializer>"msr"</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>options</parameter></methodparam> </methodsynopsis> <simpara> Sets the default options described by <parameter>options</parameter>