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 :
-----------------------
Modified: en/reference/openssl/constants.xml
By: z z on 2012-12-21 06:55:42
===================================================================
--- en/reference/openssl/constants.xml
+++ en/reference/openssl/constants.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 329005 $ -->
+<!-- $Revision: 328742 $ -->
<appendix xml:id="openssl.constants" xmlns="http://docbook.org/ns/docbook";>
&reftitle.constants;
&extension.constants;
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44029
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44029
------------------------------------------------------------------
Modified: en/reference/pcntl/functions/pcntl-signal.xml
By: da vinci on 2012-12-28 02:32:53
===================================================================
--- en/reference/pcntl/functions/pcntl-signal.xml
+++ en/reference/pcntl/functions/pcntl-signal.xml
@@ -16,7 +16,7 @@
</methodsynopsis>
<para>
The <function>pcntl_signal</function> function installs a new
- signal handler for the signal indicated by <parameter>signo</parameter>.
+ signal handler or replaces the current signal handler for the signal
indicated by <parameter>signo</parameter>.
</para>
</refsect1>
@@ -168,6 +168,15 @@
</example>
</para>
</refsect1>
+
+
+
+
+<refsect1 role="notes"><!-- {{{ -->
+&reftitle.notes;
+<function>pcntl_signal</function> doesn't stack the signal handlers, but
replaces them.
+</refsect1><!-- }}} -->
+
<refsect1 role="seealso">
&reftitle.seealso;
@@ -178,6 +187,8 @@
</simplelist>
</para>
</refsect1>
+
+
</refentry>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44062
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44062
------------------------------------------------------------------
Modified: en/reference/pcntl/functions/pcntl-exec.xml
By: da vinci on 2012-12-28 02:46:08
===================================================================
--- en/reference/pcntl/functions/pcntl-exec.xml
+++ en/reference/pcntl/functions/pcntl-exec.xml
@@ -11,8 +11,8 @@
<methodsynopsis>
<type>void</type><methodname>pcntl_exec</methodname>
<methodparam><type>string</type><parameter>path</parameter></methodparam>
- <methodparam
choice="opt"><type>array</type><parameter>args</parameter></methodparam>
- <methodparam
choice="opt"><type>array</type><parameter>envs</parameter></methodparam>
+ <methodparam
choice="opt"><type>array</type><parameter>args</parameter><initializer>array()</initializer></methodparam>
+ <methodparam
choice="opt"><type>array</type><parameter>envs</parameter><initializer>array()</initializer></methodparam>
</methodsynopsis>
<para>
Executes the program with the given arguments.
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44063
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44063
------------------------------------------------------------------
Modified: en/reference/pcre/functions/preg-split.xml
By: anonymous on 2012-12-31 11:39:41
===================================================================
--- en/reference/pcre/functions/preg-split.xml
+++ en/reference/pcre/functions/preg-split.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 329086 $ -->
+<!-- $Revision: 313291 $ -->
<refentry xml:id="function.preg-split" xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
<refname>preg_split</refname>
@@ -147,6 +147,7 @@
// which include " ", r, t, n and f
$keywords = preg_split("/[s,]+/", "hypertext language, programming");
print_r($keywords);
+?>
]]>
</programlisting>
&example.outputs;
@@ -171,6 +172,7 @@
$str = 'string';
$chars = preg_split('//', $str, -1, PREG_SPLIT_NO_EMPTY);
print_r($chars);
+?>
]]>
</programlisting>
&example.outputs;
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44094
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44094
------------------------------------------------------------------
Modified: en/language/oop5/decon.xml
By: anonymous on 2012-12-31 14:03:39
===================================================================
--- en/language/oop5/decon.xml
+++ en/language/oop5/decon.xml
@@ -21,7 +21,9 @@
Parent constructors are not called implicitly if the child class defines
a constructor. In order to run a parent constructor, a call to
<function>parent::__construct</function> within the child constructor is
- required.
+ required. If the child does not define a constructor then it may be
inherited
+ from the parent class just like a normal class method (if it was not
declared
+ as private).
</simpara>
</note>
<example>
@@ -42,15 +44,27 @@
}
}
+class OtherSubClass extends BaseClass {
+ // inherits BaseClass's constructor
+}
+
+// In BaseClass constructor
$obj = new BaseClass();
+
+// In BaseClass constructor
+// In SubClass constructor
$obj = new SubClass();
+
+// In BaseClass constructor
+$obj = new OtherSubClass();
?>
]]>
</programlisting>
</example>
<para>
For backwards compatibility, if PHP 5 cannot find a
- <link linkend="object.construct">__construct()</link> function for a given
class, it will
+ <link linkend="object.construct">__construct()</link> function for a given
class, and the
+ class did not inherit one from a parent class, it will
search for the old-style constructor function, by the name of the class.
Effectively, it means that the only case that would have compatibility
issues is if the class had a method named
@@ -122,7 +136,8 @@
Like constructors, parent destructors will not be called implicitly by
the engine. In order to run a parent destructor, one would have to
explicitly call <function>parent::__destruct</function> in the destructor
- body.
+ body. Also like constructors, a child class may inherit the parent's
+ destructor if it does not implement one itself.
</para>
<para>
The destructor will be called even if script execution is stopped using
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44095
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44095
------------------------------------------------------------------
Modified: en/reference/ssh2/functions/ssh2-connect.xml
By: Niel Archer on 2013-01-01 18:25:58
===================================================================
--- en/reference/ssh2/functions/ssh2-connect.xml
+++ en/reference/ssh2/functions/ssh2-connect.xml
@@ -78,7 +78,7 @@
<row>
<entry>hostkey</entry>
<entry>
- List of hostkey methods to advertise, come separated
+ List of hostkey methods to advertise, comma separated
in order of preference.
</entry>
<entry>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44097
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44097
------------------------------------------------------------------
Modified: en/reference/curl/functions/curl-setopt.xml
By: Genadi Saltikov on 2013-01-02 06:03:37
===================================================================
--- en/reference/curl/functions/curl-setopt.xml
+++ en/reference/curl/functions/curl-setopt.xml
@@ -1237,26 +1237,26 @@
<entry valign="top"><constant>CURLOPT_FILE</constant></entry>
<entry valign="top">
The file that the transfer should be written to. The default
- is <literal>STDOUT</literal> (the browser window).
+ is <literal>STDOUT</literal> (the browser window). Should be a
stream resource.
</entry>
</row>
<row>
<entry valign="top"><constant>CURLOPT_INFILE</constant></entry>
<entry valign="top">
- The file that the transfer should be read from when uploading.
+ The file that the transfer should be read from when uploading.
Should be a stream resource.
</entry>
</row>
<row>
<entry valign="top"><constant>CURLOPT_STDERR</constant></entry>
<entry valign="top">
An alternative location to output errors to instead of
- <literal>STDERR</literal>.
+ <literal>STDERR</literal>. Should be a stream resource.
</entry>
</row>
<row>
<entry valign="top"><constant>CURLOPT_WRITEHEADER</constant></entry>
<entry valign="top">
- The file that the header part of the transfer is written to.
+ The file that the header part of the transfer is written to.
Should be a stream resource.
</entry>
</row>
</tbody>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44105
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44105
------------------------------------------------------------------
Modified: en/reference/network/functions/setcookie.xml
By: anonymous on 2013-01-04 03:11:56
===================================================================
--- en/reference/network/functions/setcookie.xml
+++ en/reference/network/functions/setcookie.xml
@@ -373,6 +373,7 @@
<member><function>setrawcookie</function></member>
<member><link linkend="features.cookies">cookies section</link></member>
<member><link xlink:href="&url.rfc;6265">RFC 6265</link></member>
+ <member><link xlink:href="&url.rfc;2965">RFC 2965</link></member>
<member><link xlink:href="&url.rfc;2109">RFC 2109</link></member>
</simplelist>
</para>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44111
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44111
------------------------------------------------------------------
Modified: en/reference/network/functions/header.xml
By: anonymous on 2013-01-04 03:28:53
===================================================================
--- en/reference/network/functions/header.xml
+++ en/reference/network/functions/header.xml
@@ -129,6 +129,17 @@
</programlisting>
</informalexample>
</para>
+ <para>
+ <note>
+ <para>
+ When <parameter>replace</parameter> is set to <literal>TRUE</literal>,
+ all matching headers will be removed before the new one is sent. For
+ example, if multiple cookies are already sent, then sending a
<literal>
+ Set-Cookie</literal> header through <function>header</function> will
+ replace all of them.
+ </para>
+ </note>
+ </para>
</listitem>
</varlistentry>
<varlistentry>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44112
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44112
------------------------------------------------------------------
Modified: en/reference/pdo/pdostatement/setfetchmode.xml
By: Niel Archer on 2013-01-08 11:33:15
===================================================================
--- en/reference/pdo/pdostatement/setfetchmode.xml
+++ en/reference/pdo/pdostatement/setfetchmode.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 329087 $ -->
+<!-- $Revision: 322104 $ -->
<refentry xml:id="pdostatement.setfetchmode"
xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
<refname>PDOStatement::setFetchMode</refname>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44272
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44272
------------------------------------------------------------------
Modified: en/appendices/ini.core.xml
By: anonymous on 2013-01-14 04:16:53
===================================================================
--- en/appendices/ini.core.xml
+++ en/appendices/ini.core.xml
@@ -1300,6 +1300,24 @@
'./file'</literal> than having PHP always check the current
directory for every include.
</para>
+ <note>
+ <para>
+ ENV variables are also accessible inside the .ini
+ files. As such it is possible to reference the home directory
+ using <constant>${LOGIN}</constant> and <constant>${USER}</constant>.
+ See the example below.
+ </para>
+ </note>
+ <para>
+ <example>
+ <title>Unix include_path using ${USER} env variable</title>
+ <programlisting role="php.ini">
+<![CDATA[
+include_path = ".:${USER}/pear/php"
+]]>
+ </programlisting>
+ </example>
+ </para>
</listitem>
</varlistentry>
=> Put this change into your patches :
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=44706
=> Delete this change:
https://edit.php.net/?project=php&action=deleteThisChange&idDB=44706
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.
