reference/iconv/functions/iconv-strpos.xml
ab9a7d2e3dfa9224186abcbd7a43b3af08d1bfdb
ab9a7d2e3dfa9224186abcbd7a43b3af08d1bfdb
...
...
@@ -9,11 +9,11 @@
9
9
<refsect1 role="description">
10
10
&reftitle.description;
11
11
<methodsynopsis>
12
-
<type>int</type><methodname>iconv_strpos</methodname>
12
+
<type class="union"><type>int</type><type>false</type></type><methodname>iconv_strpos</methodname>
13
13
<methodparam><type>string</type><parameter>haystack</parameter></methodparam>
14
14
<methodparam><type>string</type><parameter>needle</parameter></methodparam>
15
15
<methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
16
-
<methodparam choice="opt"><type>string</type><parameter>charset</parameter><initializer>ini_get("iconv.internal_encoding")</initializer></methodparam>
16
+
<methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
17
17
</methodsynopsis>
18
18
<para>
19
19
Finds position of first occurrence of a <parameter>needle</parameter>
...
...
@@ -24,7 +24,7 @@
24
24
<function>iconv_strpos</function> is the number of characters that
25
25
appear before the needle, rather than the offset in bytes to the
26
26
position where the needle has been found. The characters are counted
27
-
on the basis of the specified character set <parameter>charset</parameter>.
27
+
on the basis of the specified character set <parameter>encoding</parameter>.
28
28
</para>
29
29
</refsect1>
30
30
...
...
@@ -59,10 +59,10 @@
59
59
</listitem>
60
60
</varlistentry>
61
61
<varlistentry>
62
-
<term><parameter>charset</parameter></term>
62
+
<term><parameter>encoding</parameter></term>
63
63
<listitem>
64
64
<para>
65
-
If <parameter>charset</parameter> parameter is omitted,
65
+
If <parameter>encoding</parameter> parameter is omitted or &null;,
66
66
<parameter>string</parameter> are assumed to be encoded in
67
67
<link linkend="iconv.configuration">iconv.internal_encoding</link>.
68
68
</para>
...
...
@@ -102,6 +102,12 @@
102
102
</thead>
103
103
<tbody>
104
104
<row>
105
+
<entry>8.0.0</entry>
106
+
<entry>
107
+
<parameter>encoding</parameter> is nullable now.
108
+
</entry>
109
+
</row>
110
+
<row>
105
111
<entry>7.1.0</entry>
106
112
<entry>
107
113
Support for negative <parameter>offset</parameter>s has been added.
...
...
@@ -124,7 +130,6 @@
124
130
</refsect1>
125
131
126
132
</refentry>
127
-
128
133
<!-- Keep this comment at the end of the file
129
134
Local variables:
130
135
mode: sgml
131
136