...

...

@@ -1,6 +1,6 @@

1

1

<?xml version="1.0" encoding="utf-8"?>

2

2

<!-- $Revision$ -->

3

-

<refentry xml:id='function.simplexml-load-string' xmlns="http://docbook.org/ns/docbook">

3

+

<refentry xml:id="function.simplexml-load-string" xmlns="http://docbook.org/ns/docbook">

4

4

<refnamediv>

5

5

<refname>simplexml_load_string</refname>

6

6

<refpurpose>

...

...

@@ -10,11 +10,11 @@

10

10

<refsect1 role="description">

11

11

&reftitle.description;

12

12

<methodsynopsis>

13

-

<type>SimpleXMLElement</type><methodname>simplexml_load_string</methodname>

13

+

<type class="union"><type>SimpleXMLElement</type><type>false</type></type><methodname>simplexml_load_string</methodname>

14

14

<methodparam><type>string</type><parameter>data</parameter></methodparam>

15

-

<methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"SimpleXMLElement"</initializer></methodparam>

15

+

<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>class_name</parameter><initializer>SimpleXMLElement::class</initializer></methodparam>

16

16

<methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>

17

-

<methodparam choice="opt"><type>string</type><parameter>ns</parameter><initializer>""</initializer></methodparam>

17

+

<methodparam choice="opt"><type>string</type><parameter>namespace_or_prefix</parameter><initializer>""</initializer></methodparam>

18

18

<methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam>

19

19

</methodsynopsis>

20

20

<para>

...

...

@@ -48,15 +48,11 @@

48

48

<varlistentry>

49

49

<term><parameter>options</parameter></term>

50

50

<listitem>

51

-

<para>

52

-

Since PHP 5.1.0 and Libxml 2.6.0, you may also use the

53

-

<parameter>options</parameter> parameter to specify <link

54

-

linkend="libxml.constants">additional Libxml parameters</link>.

55

-

</para>

51

+

&dom.parameter.options;

56

52

</listitem>

57

53

</varlistentry>

58

54

<varlistentry>

59

-

<term><parameter>ns</parameter></term>

55

+

<term><parameter>namespace_or_prefix</parameter></term>

60

56

<listitem>

61

57

<para>

62

58

Namespace prefix or URI.

...

...

@@ -67,7 +63,7 @@

67

63

<term><parameter>is_prefix</parameter></term>

68

64

<listitem>

69

65

<para>

70

-

&true; if <parameter>ns</parameter> is a prefix, &false; if it's a URI;

66

+

&true; if <parameter>namespace_or_prefix</parameter> is a prefix, &false; if it's a URI;

71

67

defaults to &false;.

72

68

</para>

73

69

</listitem>

...

...

@@ -100,30 +96,6 @@

100

96

</tip>

101

97

</refsect1><!-- }}} -->

102

98

103

-

<refsect1 role="changelog">

104

-

&reftitle.changelog;

105

-

<para>

106

-

<informaltable>

107

-

<tgroup cols="2">

108

-

<thead>

109

-

<row>

110

-

<entry>&Version;</entry>

111

-

<entry>&Description;</entry>

112

-

</row>

113

-

</thead>

114

-

<tbody>

115

-

<row>

116

-

<entry>5.2.0</entry>

117

-

<entry>

118

-

The optional parameter <parameter>is_prefix</parameter> was added.

119

-

</entry>

120

-

</row>

121

-

</tbody>

122

-

</tgroup>

123

-

</informaltable>

124

-

</para>

125

-

</refsect1>

126

-

127

99

<refsect1 role="examples">

128

100

&reftitle.examples;

129

101

<para>

...

...

@@ -164,7 +136,7 @@ SimpleXMLElement Object

164

136

]]>

165

137

</screen>

166

138

<simpara>

167

-

At this point, you can go about using <literal>$xml->body</literal>

139

+

At this point, you can go about using <literal>$xml-&gt;body</literal>

168

140

and such.

169

141

</simpara>

170

142

</example>

...

...

@@ -177,14 +149,13 @@ SimpleXMLElement Object

177

149

<simplelist>

178

150

<member><function>simplexml_load_file</function></member>

179

151

<member><methodname>SimpleXMLElement::__construct</methodname></member>

180

-

<member><xref linkend="simplexml.examples-errors" /></member>

152

+

<member><xref linkend="simplexml.examples-errors"/></member>

181

153

<member><function>libxml_use_internal_errors</function></member>

182

154

<member><xref linkend="simplexml.examples-basic"/></member>

183

155

</simplelist>

184

156

</para>

185

157

</refsect1>

186

158

</refentry>

187

-

188

159

<!-- Keep this comment at the end of the file

189

160

Local variables:

190

161

mode: sgml

191

162