From 4d2ed4ef0bd24c3f2f8810ea899dd06bac4420e6 Mon Sep 17 00:00:00 2001
From: TAKAGI Masahiro <takagi@php.net>
Date: Wed, 30 Jan 2013 21:03:39 +0000
Subject: [PATCH] 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"


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329377 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../mbstring/functions/mb-convert-case.xml    |  2 +-
 .../functions/mb-decode-numericentity.xml     |  2 +-
 .../functions/mb-encode-numericentity.xml     | 34 ++++++++++++++++++-
 .../functions/mb-regex-set-options.xml        |  2 +-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/reference/mbstring/functions/mb-convert-case.xml b/reference/mbstring/functions/mb-convert-case.xml
index 63e85f8a0a..9ce2d077cd 100644
--- a/reference/mbstring/functions/mb-convert-case.xml
+++ b/reference/mbstring/functions/mb-convert-case.xml
@@ -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>
diff --git a/reference/mbstring/functions/mb-decode-numericentity.xml b/reference/mbstring/functions/mb-decode-numericentity.xml
index 73e3f70dd7..e45247f09f 100644
--- a/reference/mbstring/functions/mb-decode-numericentity.xml
+++ b/reference/mbstring/functions/mb-decode-numericentity.xml
@@ -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>
diff --git a/reference/mbstring/functions/mb-encode-numericentity.xml b/reference/mbstring/functions/mb-encode-numericentity.xml
index 812d3a33fd..8467d12b3d 100644
--- a/reference/mbstring/functions/mb-encode-numericentity.xml
+++ b/reference/mbstring/functions/mb-encode-numericentity.xml
@@ -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>
diff --git a/reference/mbstring/functions/mb-regex-set-options.xml b/reference/mbstring/functions/mb-regex-set-options.xml
index 2c6ebcc1fd..62bf53fcd6 100644
--- a/reference/mbstring/functions/mb-regex-set-options.xml
+++ b/reference/mbstring/functions/mb-regex-set-options.xml
@@ -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>