Hello PHP EN Documentation team,
There are contributions within the online editor queue for this language.
Please review, then commit or delete these patches.
Patches for review :
-----------------------
New file: en/reference/sqlite3/sqlite3/createcollation.xml
By: b dewar on 2013-04-10 04:59:20
===================================================================
--- en/reference/sqlite3/sqlite3/createcollation.xml
+++ en/reference/sqlite3/sqlite3/createcollation.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 299459 $ -->
+
+<refentry xml:id="sqlite3.createcollation"
xmlns="http://docbook.org/ns/docbook";
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <refnamediv>
+ <refname>SQLite3::createCollation</refname>
+
+ <refpurpose>Registers a PHP function for use as an SQL collating
function</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>public</modifier>
<type>bool</type><methodname>SQLite3::createCollation</methodname>
+ <methodparam><type>string</type><parameter>name</parameter></methodparam>
+
<methodparam><type>callable</type><parameter>callback</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Registers a PHP function or user-defined function for use as a collating
+ function within SQL statements.
+ </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <variablelist>
+ <varlistentry>
+ <term><parameter>name</parameter></term>
+ <listitem>
+ <para>
+ Name of the SQL collating function to be created or redefined
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>callback</parameter></term>
+ <listitem>
+ <para>
+ The name of a PHP function or user-defined function to apply as a
+ callback, defining the behavior of the collation. It should accept
+ two strings and return as <function>strcmp</function> does, i.e. it
should return -1, 1,
+ or 0 if the first string sorts before, sorts after, or is equal to the
second.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ &return.success;
+ </para>
+ </refsect1>
+
+ <refsect1 role="examples">
+ &reftitle.examples;
+ <para>
+ <example>
+ <title><function>SQLite3::createCollation</function> example</title>
+ <para>
+ Register the PHP function <function>strnatcmp</function> as a collating
sequence in the SQLite3 database.
+ </para>
+ <programlisting role="php">
+<![CDATA[
+<?php
+
+$db = new SQLite3(":memory:");
+$db->exec("CREATE TABLE test (col1 string)");
+$db->exec("INSERT INTO test VALUES ('a1')");
+$db->exec("INSERT INTO test VALUES ('a10')");
+$db->exec("INSERT INTO test VALUES ('a2')");
+
+$db->createCollation('NATURAL_CMP', 'strnatcmp');
+
+$defaultSort = $db->query("SELECT col1 FROM test ORDER BY col1");
+$naturalSort = $db->query("SELECT col1 FROM test ORDER BY col1 COLLATE
NATURAL_CMP");
+
+echo "default:n";
+while ($row = $defaultSort->fetchArray()){
+ echo $row['col1'], "n";
+}
+
+echo "nnatural:n";
+while ($row = $naturalSort->fetchArray()){
+ echo $row['col1'], "n";
+}
+
+$db->close();
+
+?>
+]]>
+ </programlisting>
+ &example.outputs;
+ <screen>
+<![CDATA[
+
+default:
+a1
+a10
+a2
+
+natural:
+a1
+a2
+a10
+
+]]>
+ </screen>
+ </example>
+ </para>
+ </refsect1>
+
+ <refsect1 role="seealso">
+ &reftitle.seealso;
+ <simplelist>
+ <member>The SQLite collation documentation: <link
xlink:href="&url.sqlite.collation;">&url.sqlite.collation;</link></member>
+ </simplelist>
+ </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
No newline at end of file
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=43558
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=43558
------------------------------------------------------------------
Modified: en/reference/sqlite3/versions.xml
By: b dewar on 2012-11-29 08:42:57
===================================================================
--- en/reference/sqlite3/versions.xml
+++ en/reference/sqlite3/versions.xml
@@ -9,6 +9,7 @@
<function name='SQLite3::changes' from='PHP 5 >= 5.3.0'/>
<function name='SQLite3::close' from='PHP 5 >= 5.3.0'/>
<function name='SQLite3::createAggregate' from='PHP 5 >= 5.3.0'/>
+ <function name='SQLite3::createCollation' from='PHP 5 >= 5.4.0'/>
<function name='SQLite3::createFunction' from='PHP 5 >= 5.3.0'/>
<function name='SQLite3::escapeString' from='PHP 5 >= 5.3.0'/>
<function name='SQLite3::exec' from='PHP 5 >= 5.3.0'/>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=43559
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=43559
------------------------------------------------------------------
Modified: en/reference/var/functions/intval.xml
By: anonymous on 2013-03-27 02:18:53
===================================================================
--- en/reference/var/functions/intval.xml
+++ en/reference/var/functions/intval.xml
@@ -40,6 +40,31 @@
<para>
The base for the conversion
</para>
+ <note>
+ <para>
+ If <parameter>base</parameter> is 0, the base used is determined
+ by the format of <parameter>var</parameter>:
+ <itemizedlist>
+ <listitem>
+ <simpara>
+ if string includes a "0x" (or "0X") prefix, the base is taken
+ as 16 (hex); otherwise,
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ if string starts with "0", the base is taken as 8 (octal);
+ otherwise,
+ </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ the base is taken as 10 (decimal).
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </note>
</listitem>
</varlistentry>
</variablelist>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=46078
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=46078
------------------------------------------------------------------
Modified: en/reference/pcre/pattern.syntax.xml
By: anonymous on 2013-03-29 01:31:14
===================================================================
--- en/reference/pcre/pattern.syntax.xml
+++ en/reference/pcre/pattern.syntax.xml
@@ -271,7 +271,7 @@
<listitem>
<simpara>
a character with the xx property, see
- <link linkend="regexp.reference.unicode">unicode properties</link>
+ <link linkend="regexp.reference.unicode">Unicode properties</link>
for more info
</simpara>
</listitem>
@@ -281,7 +281,17 @@
<listitem>
<simpara>
a character without the xx property, see
- <link linkend="regexp.reference.unicode">unicode properties</link>
+ <link linkend="regexp.reference.unicode">Unicode properties</link>
+ for more info
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><emphasis>X</emphasis></term>
+ <listitem>
+ <simpara>
+ an Unicode grapheme, see
+ <link linkend="regexp.reference.unicode">Unicode properties</link>
for more info
</simpara>
</listitem>
@@ -611,7 +621,7 @@
</varlistentry>
<varlistentry>
<term><emphasis>X</emphasis></term>
- <listitem><simpara>an extended Unicode sequence</simpara></listitem>
+ <listitem><simpara>any Unicode grapheme incl. an extended Unicode
sequence</simpara></listitem>
</varlistentry>
</variablelist>
<para>
@@ -1020,15 +1030,7 @@
</tgroup>
</table>
<para>
- The <literal>X</literal> escape matches any number of Unicode characters
- that form an extended Unicode sequence. <literal>X</literal> is equivalent
- to <literal>(?>PMpM*)</literal>.
- </para>
- <para>
- That is, it matches a character without the "mark" property, followed
- by zero or more characters with the "mark" property, and treats the
- sequence as an atomic group (see below). Characters with the "mark"
- property are typically accents that affect the preceding character.
+ The <literal>X</literal> escape matches any single Unicode grapheme
regardless it is a single code-point or in form of an extended Unicode sequence
with combining marks.
</para>
<para>
Matching characters by Unicode property is not fast, because PCRE has
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=46090
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=46090
------------------------------------------------------------------
Modified: en/reference/classobj/functions/get-object-vars.xml
By: anonymous on 2013-03-31 05:40:56
===================================================================
--- en/reference/classobj/functions/get-object-vars.xml
+++ en/reference/classobj/functions/get-object-vars.xml
@@ -13,7 +13,7 @@
</methodsynopsis>
<para>
Gets the accessible non-static properties of the given
- <parameter>object</parameter> according to scope.
+ <parameter>object</parameter> according to scope and name of the property.
</para>
</refsect1>
<refsect1 role="parameters">
@@ -35,7 +35,7 @@
&reftitle.returnvalues;
<para>
Returns an associative array of defined object accessible non-static
properties
- for the specified <parameter>object</parameter> in scope. If a property has
+ for the specified <parameter>object</parameter> in scope and per the
property-name. If a property has
not been assigned a value, it will be returned with a &null; value.
</para>
</refsect1>
@@ -59,6 +59,12 @@
</entry>
</row>
<row>
+ <entry>5.0.0</entry>
+ <entry>
+ This function now filters <type>integer</type> property-names out.
Previously their values were returned.
+ </entry>
+ </row>
+ <row>
<entry>4.2.0</entry>
<entry>
Properties which were declared in the class of the
<parameter>object</parameter>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=46111
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=46111
------------------------------------------------------------------
Modified: en/reference/math/constants.xml
By: anonymous on 2013-04-06 06:28:27
===================================================================
--- en/reference/math/constants.xml
+++ en/reference/math/constants.xml
@@ -146,13 +146,13 @@
<entry><constant>NAN</constant></entry>
<entry>NAN (as a float)</entry>
<entry>Not A Number</entry>
- <entry></entry>
+ <entry>PHP 4.3.6</entry>
</row>
<row xml:id="constant.inf">
<entry><constant>INF</constant></entry>
<entry>INF (as a float)</entry>
<entry>The infinite</entry>
- <entry></entry>
+ <entry>PHP 4.3.6</entry>
</row>
</tbody>
</tgroup>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=46202
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=46202
------------------------------------------------------------------
Modified: en/reference/var/functions/is-float.xml
By: Hans Henrik Bergan on 2013-05-07 14:02:53
===================================================================
--- en/reference/var/functions/is-float.xml
+++ en/reference/var/functions/is-float.xml
@@ -52,28 +52,33 @@
<programlisting role="php">
<![CDATA[
<?php
-if (is_float(27.25)) {
- echo "is floatn";
-} else {
- echo "is not floatn";
+$values = array(23,'23',23.5,'23.5', '0', 0,false, true, null, 'abc', '', ' ');
+foreach ($values as $value) {
+ echo "is_float(";
+ var_export($value);
+ echo ") = ";
+ var_dump(is_float($value));
}
-var_dump(is_float('abc'));
-var_dump(is_float(23));
-var_dump(is_float(23.5));
-var_dump(is_float(1e7)); //Scientific Notation
-var_dump(is_float(true));
+echo "is_float(1e7) = bool(true)";//1e7 Scientific Notation
?>
]]>
</programlisting>
&example.outputs;
<screen>
<![CDATA[
-is float
-bool(false)
-bool(false)
-bool(true)
-bool(true)
-bool(false)
+is_float(23) = bool(false)
+is_float('23') = bool(false)
+is_float(23.5) = bool(true)
+is_float('23.5') = bool(false)
+is_float('0') = bool(false)
+is_float(0) = bool(false)
+is_float(false) = bool(false)
+is_float(true) = bool(false)
+is_float(NULL) = bool(false)
+is_float('abc') = bool(false)
+is_float('') = bool(false)
+is_float(' ') = bool(false)
+is_float(1e7) = bool(true)
]]>
</screen>
</example>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=46466
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=46466
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.
