Contributions are ready for review
| From: | phpdoc at lists dot php dot net | Date: | Mon, 04 May 2015 12:00:04 +0000 |
| Subject: | Contributions are ready for review | ||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969385629@lists.php.net to get a copy of this message | ||
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/pdo_pgsql/PDO/pgsqlCopyFromArray.xml
By: Александр Н on 2015-05-01 05:45:57
===================================================================
--- en/reference/pdo_pgsql/PDO/pgsqlCopyFromArray.xml
+++ en/reference/pdo_pgsql/PDO/pgsqlCopyFromArray.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 334641 $ -->
+<refentry xml:id="pdo.pgsqlcopyfromarray" xmlns="http://docbook.org/ns/docbook">
+ <refnamediv>
+ <refname>PDO::pgsqlCopyFromArray</refname>
+ <refpurpose>Copy data from PHP array into table</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>public</modifier> <type>bool</type>
<methodname>PDO::pgsqlCopyFromArray</methodname>
+
<methodparam><type>string</type><parameter>table_name</parameter></methodparam>
+
<methodparam><type>array</type><parameter>rows</parameter></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>'t'</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>null_as</parameter><initializer>"\\N"</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>fields</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Copies data from <param>rows</param> array to table
<param>table_name</param>
+ using <param>delimiter</param> as fields delimiter and
<param>fields</param> list
+ </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>table_name</parameter></term>
+ <listitem>
+ <para>
+ String containing table name
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>rows</parameter></term>
+ <listitem>
+ <para>
+ Array of strings with fields separated by <param>delimiter</param>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>delimiter</parameter></term>
+ <listitem>
+ <para>
+ Delimiter used in <param>rows</param> array
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>null_as</parameter></term>
+ <listitem>
+ <para>
+ How to interpret null values
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>fields</parameter></term>
+ <listitem>
+ <para>
+ List of fields to insert
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ If copying data was successfull returns &true;, otherwise returns &false;.
+ </para>
+ </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=62495
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62495
------------------------------------------------------------------
New file: en/reference/pdo_pgsql/PDO/pgsqlCopyFromFile.xml
By: Александр Н on 2015-05-01 05:51:11
===================================================================
--- en/reference/pdo_pgsql/PDO/pgsqlCopyFromFile.xml
+++ en/reference/pdo_pgsql/PDO/pgsqlCopyFromFile.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 334641 $ -->
+<refentry xml:id="pdo.pgsqlcopyfromfile" xmlns="http://docbook.org/ns/docbook">
+ <refnamediv>
+ <refname>PDO::pgsqlCopyFromFile</refname>
+ <refpurpose>Copy data from file into table</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>public</modifier> <type>bool</type>
<methodname>PDO::pgsqlCopyFromFile</methodname>
+
<methodparam><type>string</type><parameter>table_name</parameter></methodparam>
+
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>'t'</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>null_as</parameter><initializer>"\\N"</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>fields</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Copies data from file specified by <param>filename</param> into table
<param>table_name</param>
+ using <param>delimiter</param> as fields delimiter and
<param>fields</param> list
+ </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>table_name</parameter></term>
+ <listitem>
+ <para>
+ String containing table name
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>filename</parameter></term>
+ <listitem>
+ <para>
+ Filename containing data to import
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>delimiter</parameter></term>
+ <listitem>
+ <para>
+ Delimiter used in file specified by <param>filename</param>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>null_as</parameter></term>
+ <listitem>
+ <para>
+ How to interpret null values
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>fields</parameter></term>
+ <listitem>
+ <para>
+ List of fields to insert
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ If copying data was successfull returns &true;, otherwise returns &false;.
+ </para>
+ </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=62494
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62494
------------------------------------------------------------------
New file: en/reference/pdo_pgsql/PDO/pgsqlCopyToFile.xml
By: Александр Н on 2015-05-01 05:52:35
===================================================================
--- en/reference/pdo_pgsql/PDO/pgsqlCopyToFile.xml
+++ en/reference/pdo_pgsql/PDO/pgsqlCopyToFile.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 334641 $ -->
+<refentry xml:id="pdo.pgsqlcopytofile" xmlns="http://docbook.org/ns/docbook">
+ <refnamediv>
+ <refname>PDO::pgsqlCopyToFile</refname>
+ <refpurpose>Copy data from table into file</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>public</modifier> <type>bool</type>
<methodname>PDO::pgsqlCopyToFile</methodname>
+
<methodparam><type>string</type><parameter>table_name</parameter></methodparam>
+
<methodparam><type>string</type><parameter>filename</parameter></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>'t'</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>null_as</parameter><initializer>"\\N"</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>fields</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Copies data from table into file specified by <param>filename</param>
+ using <param>delimiter</param> as fields delimiter and
<param>fields</param> list
+ </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>table_name</parameter></term>
+ <listitem>
+ <para>
+ String containing table name
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>filename</parameter></term>
+ <listitem>
+ <para>
+ Filename to export data
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>delimiter</parameter></term>
+ <listitem>
+ <para>
+ Delimiter used in file specified by <param>filename</param>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>null_as</parameter></term>
+ <listitem>
+ <para>
+ How to interpret null values
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>fields</parameter></term>
+ <listitem>
+ <para>
+ List of fields to insert
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ If copying data was successfull returns &true;, otherwise returns &false;.
+ </para>
+ </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=62496
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62496
------------------------------------------------------------------
New file: en/reference/pdo_pgsql/PDO/pgsqlCopyToArray.xml
By: Александр Н on 2015-05-01 06:06:15
===================================================================
--- en/reference/pdo_pgsql/PDO/pgsqlCopyToArray.xml
+++ en/reference/pdo_pgsql/PDO/pgsqlCopyToArray.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 334641 $ -->
+<refentry xml:id="pdo.pgsqlcopytoarray" xmlns="http://docbook.org/ns/docbook">
+ <refnamediv>
+ <refname>PDO::pgsqlCopyToArray</refname>
+ <refpurpose>Copy data from database table into PHP array</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>public</modifier> <type>array</type>
<methodname>PDO::pgsqlCopyToArray</methodname>
+
<methodparam><type>string</type><parameter>table_name</parameter></methodparam>
+
<methodparam><type>array</type><parameter>rows</parameter></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>'t'</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>null_as</parameter><initializer>"\\N"</initializer></methodparam>
+ <methodparam
choice="opt"><type>string</type><parameter>fields</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Copies data from <param>table</param> into array using
<param>delimiter</param> as fields delimiter and <param>fields</param> list
+ </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>table_name</parameter></term>
+ <listitem>
+ <para>
+ String containing table name
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>delimiter</parameter></term>
+ <listitem>
+ <para>
+ Delimiter used in <param>rows</param> array
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>null_as</parameter></term>
+ <listitem>
+ <para>
+ How to interpret null values
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>fields</parameter></term>
+ <listitem>
+ <para>
+ List of fields to export
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ If copying data was successfull returns an array of rows, otherwise returns &false;.
+ </para>
+ </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=62497
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62497
------------------------------------------------------------------
Modified: en/faq/installation.xml
By: mattficken on 2014-09-04 14:39:45
===================================================================
--- en/faq/installation.xml
+++ en/faq/installation.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 334758 $ -->
+<!-- $Revision: 311461 $ -->
<chapter xml:id="faq.installation" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -394,9 +394,9 @@
<function>phpinfo</function>. Near the top, there will be a
listing called <literal>Configuration File (php.ini)</literal>.
This will tell you where PHP is looking for &php.ini; and
- whether or not it's being read. If just a directory <envar>PATH</envar>
exists,
+ whether or not it's being read. If just a directory PATH exists,
then it's not being read, and you should put your &php.ini;
- in that directory. If &php.ini; is included within the <envar>PATH</envar>,
+ in that directory. If &php.ini; is included within the PATH,
it is being read.
</para>
<para>
@@ -413,18 +413,16 @@
<qandaentry xml:id="faq.installation.addtopath">
<question>
<para>
- How do I add my PHP directory to the <envar>PATH</envar>
+ How do I add my PHP directory to the <varname>PATH</varname>
on Windows?
</para>
</question>
<answer>
<para>
- On Windows NT+ and Windows Server 2000+:
+ On Windows 7, XP, Vista, 2008, 2012 and up
<itemizedlist>
<listitem><para>
- Go to Control Panel and open the System icon (Start -> Settings
- -> Control Panel -> System, or just Start -> Control Panel
- -> System for Windows XP/2003+)
+ Go to Control Panel and open the System icon (Start -> Control Panel)
</para></listitem>
<listitem><para>
Go to the Advanced tab
@@ -450,107 +448,18 @@
</para></listitem>
</itemizedlist>
</para>
- <para>
- On Windows 98/Me you need to edit the <filename>autoexec.bat</filename>
- file:
- <itemizedlist>
- <listitem><para>
- Open the Notepad (Start -> Run and enter notepad)
- </para></listitem>
- <listitem><para>
- Open the <filename>C:autoexec.bat</filename> file
- </para></listitem>
- <listitem><para>
- Locate the line with PATH=C:WINDOWS;C:WINDOWSCOMMAND;..... and add:
- <literal>;C:php</literal> to the end of the line
- </para></listitem>
- <listitem><para>
- Save the file and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- <note>
- <simpara>
- Be sure to reboot after following the steps above to ensure that the
- <envar>PATH</envar> changes are applied.
- </simpara>
- </note>
- <para>
- The PHP manual used to promote the copying of files into the Windows
- system directory, this is because this directory
+
+ <para>
+ The PHP manual used to promote the copying of files into the Windows
+ system directory, this is because this directory
(<filename>C:Windows</filename>, <filename>C:WINNT</filename>, etc.)
- is by default in the system's <envar>PATH</envar>. Copying files into the
Windows
+ is by default in the systems PATH. Copying files into the Windows
system directory has long since been deprecated and may cause problems.
</para>
</answer>
</qandaentry>
- <qandaentry xml:id="faq.installation.phprc">
- <question>
- <para>
- How do I make the &php.ini; file available to PHP on windows?
- </para>
- </question>
- <answer>
- <para>
- There are several ways of doing this. If you are using Apache, read
- their installation specific instructions (<link
- linkend="install.windows.apache1">Apache 1</link>, <link
- linkend="install.windows.apache2">Apache 2</link>), otherwise you must
- set the <varname>PHPRC</varname> environment variable:
- </para>
- <para>
- On Windows NT, 2000, XP and 2003:
- <itemizedlist>
- <listitem><para>
- Go to Control Panel and open the System icon (Start -> Settings
- -> Control Panel -> System, or just Start -> Control Panel
- -> System for Windows XP/2003)
- </para></listitem>
- <listitem><para>
- Go to the Advanced tab
- </para></listitem>
- <listitem><para>
- Click on the 'Environment Variables' button
- </para></listitem>
- <listitem><para>
- Look into the 'System variables' pane
- </para></listitem>
- <listitem><para>
- Click on 'New' and enter 'PHPRC' as the variable name and the
- directory where &php.ini; is located as the variable value (e.g.
- <literal>C:php</literal>)
- </para></listitem>
- <listitem><para>
- Press OK and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- <para>
- On Windows 98/Me you need to edit the <filename>autoexec.bat</filename>
- file:
- <itemizedlist>
- <listitem><para>
- Open the Notepad (Start -> Run and enter notepad)
- </para></listitem>
- <listitem><para>
- Open the <filename>C:autoexec.bat</filename> file
- </para></listitem>
- <listitem><para>
- Add a new line to the end of the file: <literal>set
- PHPRC=C:php</literal> (replace <literal>C:php</literal> with the
- directory where &php.ini; is located). Please note that the path
- cannot contain spaces. For instance, if you have installed PHP in
- <filename>C:Program FilesPHP</filename>, you would enter
- <filename>C:PROGRA~1PHP</filename> instead.
- </para></listitem>
- <listitem><para>
- Save the file and restart your computer
- </para></listitem>
- </itemizedlist>
- </para>
- </answer>
- </qandaentry>
+
<qandaentry xml:id="faq.installation.apache.multiviews">
<question>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=57941
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=57941
------------------------------------------------------------------
Modified: en/language/oop5/basic.xml
By: cmb on 2014-10-04 20:15:14
===================================================================
--- en/language/oop5/basic.xml
+++ en/language/oop5/basic.xml
@@ -132,8 +132,8 @@
$instance = new SimpleClass();
// This can also be done with a variable:
-$className = 'Foo';
-$instance = new $className(); // Foo()
+$className = 'SimpleClass';
+$instance = new $className(); // new SimpleClass()
?>
]]>
</programlisting>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58743
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58743
------------------------------------------------------------------
Modified: en/reference/soap/soapclient/getlastrequest.xml
By: cmb on 2014-10-09 20:12:58
===================================================================
--- en/reference/soap/soapclient/getlastrequest.xml
+++ en/reference/soap/soapclient/getlastrequest.xml
@@ -44,7 +44,7 @@
<programlisting role="php">
<![CDATA[
<?php
-$client = SoapClient("some.wsdl", array('trace' => 1));
+$client = new SoapClient("some.wsdl", array('trace' => 1));
$result = $client->SomeFunction();
echo "REQUEST:n" . $client->__getLastRequest() . "n";
?>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58778
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58778
------------------------------------------------------------------
Modified: en/reference/pthreads/threaded/merge.xml
By: Krzysiek Łukasiak on 2014-11-25 03:44:27
===================================================================
--- en/reference/pthreads/threaded/merge.xml
+++ en/reference/pthreads/threaded/merge.xml
@@ -1,134 +1,135 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 334955 $ -->
-
-<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
- <refname>Threaded::merge</refname>
- <refpurpose>Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
- &reftitle.description;
- <methodsynopsis>
- <modifier>public</modifier>
<type>boolean</type><methodname>Threaded::merge</methodname>
-
<methodparam><type>mixed</type><parameter>from</parameter></methodparam>
- <methodparam
choice="opt"><type>mixed</type><parameter>overwrite</parameter></methodparam>
- </methodsynopsis>
- <para>
- Merges data into the current object
- </para>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
- <varlistentry>
- <term><parameter>from</parameter></term>
- <listitem>
- <para>
- The data to merge
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><parameter>overwrite</parameter></term>
- <listitem>
- <para>
- Overwrite existing keys, by default true
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
- &reftitle.returnvalues;
- <para>
- A boolean indication of success
- </para>
- </refsect1>
-
- <refsect1 role="examples">
- &reftitle.examples;
- <para>
- <example>
- <title>Merging into the property table of a threaded object</title>
- <programlisting role="php">
-<![CDATA[
-<?php
-$array = [];
-
-while (count($array) < 10)
- $array[] = count($array);
-
-$stdClass = new stdClass();
-$stdClass->foo = "foo";
-$stdClass->bar = "bar";
-$stdClass->baz = "baz";
-
-$safe = new Threaded();
-$safe->merge($array);
-$safe->merge($stdClass);
-
-var_dump($safe);
-?>
-]]>
- </programlisting>
- &example.outputs;
- <screen>
-<![CDATA[
-object(Threaded)#2 (13) {
- ["0"]=>
- int(0)
- ["1"]=>
- int(1)
- ["2"]=>
- int(2)
- ["3"]=>
- int(3)
- ["4"]=>
- int(4)
- ["5"]=>
- int(5)
- ["6"]=>
- int(6)
- ["7"]=>
- int(7)
- ["8"]=>
- int(8)
- ["9"]=>
- int(9)
- ["foo"]=>
- string(3) "foo"
- ["bar"]=>
- string(3) "bar"
- ["baz"]=>
- string(3) "baz"
-}
-]]>
- </screen>
- </example>
- </para>
- </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
--->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 334955 $ -->
+
+<refentry xml:id="threaded.merge" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+ <refname>Threaded::merge</refname>
+ <refpurpose>Manipulation</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+ &reftitle.description;
+ <methodsynopsis>
+ <modifier>public</modifier>
<type>boolean</type><methodname>Threaded::merge</methodname>
+
<methodparam><type>mixed</type><parameter>from</parameter></methodparam>
+ <methodparam
choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ Merges data into the current object
+ </para>
+ </refsect1>
+
+ <refsect1 role="parameters">
+ &reftitle.parameters;
+ <variablelist>
+ <varlistentry>
+ <term><parameter>from</parameter></term>
+ <listitem>
+ <para>
+ The data to merge
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>overwrite</parameter></term>
+ <listitem>
+ <para>
+ Overwrite existing keys, by default true
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+ &reftitle.returnvalues;
+ <para>
+ A boolean indication of success
+ </para>
+ </refsect1>
+
+ <refsect1 role="examples">
+ &reftitle.examples;
+ <para>
+ <example>
+ <title>Merging into the property table of a threaded object</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$array = [];
+
+while (count($array) < 10)
+ $array[] = count($array);
+
+$stdClass = new stdClass();
+$stdClass->foo = "foo";
+$stdClass->bar = "bar";
+$stdClass->baz = "baz";
+
+$safe = new Threaded();
+$safe->merge($array);
+$safe->foo = "bar";
+$safe->merge($stdClass, false);
+
+var_dump($safe);
+?>
+]]>
+ </programlisting>
+ &example.outputs;
+ <screen>
+<![CDATA[
+object(Threaded)#2 (13) {
+ ["0"]=>
+ int(0)
+ ["1"]=>
+ int(1)
+ ["2"]=>
+ int(2)
+ ["3"]=>
+ int(3)
+ ["4"]=>
+ int(4)
+ ["5"]=>
+ int(5)
+ ["6"]=>
+ int(6)
+ ["7"]=>
+ int(7)
+ ["8"]=>
+ int(8)
+ ["9"]=>
+ int(9)
+ ["foo"]=>
+ string(3) "bar"
+ ["bar"]=>
+ string(3) "bar"
+ ["baz"]=>
+ string(3) "baz"
+}
+]]>
+ </screen>
+ </example>
+ </para>
+ </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
+-->
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59207
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59207
------------------------------------------------------------------
Modified: en/reference/mbstring/supported-encodings.xml
By: hayk on 2014-12-24 09:42:39
===================================================================
--- en/reference/mbstring/supported-encodings.xml
+++ en/reference/mbstring/supported-encodings.xml
@@ -88,6 +88,7 @@
<listitem><simpara>Windows-1252 (CP1252)</simpara></listitem>
<listitem><simpara>CP866 (IBM866)</simpara></listitem>
<listitem><simpara>KOI8-R*</simpara></listitem>
+ <listitem><simpara>ArmSCII-8 (ArmSCII8)</simpara></listitem>
</itemizedlist>
<para>
* denotes encodings usable also in regular expressions.
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59553
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59553
------------------------------------------------------------------
Modified: en/reference/curl/functions/curl-setopt.xml
By: Christoph M. Becker on 2015-01-08 15:16:29
===================================================================
--- en/reference/curl/functions/curl-setopt.xml
+++ en/reference/curl/functions/curl-setopt.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 336354 $ -->
+<!-- $Revision: 335082 $ -->
<refentry xml:id="function.curl-setopt" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>curl_setopt</refname>
@@ -620,18 +620,6 @@
</entry>
</row>
<row>
- <entry
valign="top"><constant>CURLOPT_POSTREDIR</constant></entry>
- <entry valign="top">
- A bitmask of 1 (301 Moved Permanently), 2 (302 Found)
- and 4 (303 See Other) if the HTTP POST method should be maintained
- when <constant>CURLOPT_FOLLOWLOCATION</constant> is set and a
- specific type of redirect occurs.
- </entry>
- <entry valign="top">
- Added in cURL 7.19.1. Available since PHP 5.3.2.
- </entry>
- </row>
- <row>
<entry
valign="top"><constant>CURLOPT_PROTOCOLS</constant></entry>
<entry valign="top">
<para>
@@ -1367,7 +1355,7 @@
A callback accepting two parameters.
The first is the cURL resource, the second is a
string with the header data to be written. The header data must
- be written by this callback. Return the number of
+ be written when by this callback. Return the number of
bytes written.
</entry>
</row>
@@ -1481,7 +1469,7 @@
<row>
<entry>5.6.0</entry>
<entry>
- <constant>CURL_SAFE_UPLOAD</constant> is now &true; by default.
+ <constant>CURLOPT_SAFE_UPLOAD</constant> is now &true; by default.
</entry>
</row>
<row>
@@ -1498,6 +1486,12 @@
</entry>
</row>
<row>
+ <entry>5.5.0</entry>
+ <entry>
+ Introduced <constant>CURLOPT_SAFE_UPLOAD</constant>.
+ </entry>
+ </row>
+ <row>
<entry>5.5.0</entry>
<entry>
Introduced <constant>CURLOPT_SHARE</constant>.
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=59979
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=59979
------------------------------------------------------------------
Modified: en/install/windows/manual.xml
By: Ladislav Kubes on 2015-01-22 01:18:31
===================================================================
--- en/install/windows/manual.xml
+++ en/install/windows/manual.xml
@@ -11,35 +11,8 @@
<para>
Download the PHP zip binary distribution from
<link xlink:href="&url.php.win.downloads;">PHP for Windows: Binaries and
Sources</link>.
- There are several different versions of the zip package - choose the version that is suitable
for
- the web server being used:
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- If PHP is used with IIS then choose PHP 5.3 <emphasis>VC9 Non Thread
Safe</emphasis> or
- PHP 5.2 <emphasis>VC6 Non Thread Safe</emphasis>;
- </para>
- </listitem>
- <listitem>
- <para>
- If PHP is used with IIS7 or greater and PHP 5.3+, then the VC9 binaries of PHP should be
used.
- </para>
- </listitem>
- <listitem>
- <para>
- If PHP is used with Apache 1 or Apache 2 then choose PHP 5.3
<emphasis>VC6</emphasis> or
- PHP 5.2 <emphasis>VC6</emphasis>.
- </para>
- </listitem>
- </itemizedlist>
- <note>
- <para>
- VC9 Versions are compiled with the Visual Studio 2008 compiler and have improvements
- in performance and stability. The VC9 versions require you to have the
- <link xlink:href="&url.microsoft.vc9.x86;">Microsoft 2008 C++ Runtime
(x86)</link> or
- the <link xlink:href="&url.microsoft.vc9.x64;">Microsoft 2008 C++
Runtime (x64)</link> installed.
- </para>
- </note>
+ There are several different versions of the zip package - to choose a right version for you,
follow
+ detailed guide on the <link xlink:href="&url.php.win.downloads;">download
page</link>.
</para>
</sect2>
<sect2 xml:id="install.windows.manual.package">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60149
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60149
------------------------------------------------------------------
Modified: en/reference/solr/solrdismaxquery/removequeryfield.xml
By: anonymous on 2015-02-15 20:19:41
===================================================================
--- en/reference/solr/solrdismaxquery/removequeryfield.xml
+++ en/reference/solr/solrdismaxquery/removequeryfield.xml
@@ -53,8 +53,8 @@
$dismaxQuery = new SolrDisMaxQuery('lucene');
$dismaxQuery
- ->addQueryField('first', 3)
- ->addQueryField('second', 0.2)
+ ->addQueryField('first', 3)
+ ->addQueryField('second', 0.2)
->addQueryField('cat');
echo $dismaxQuery . PHP_EOL;
// remove field 'second'
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60360
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60360
------------------------------------------------------------------
Modified: en/reference/solr/solrdismaxquery/removephrasefield.xml
By: anonymous on 2015-02-15 20:19:46
===================================================================
--- en/reference/solr/solrdismaxquery/removephrasefield.xml
+++ en/reference/solr/solrdismaxquery/removephrasefield.xml
@@ -50,8 +50,8 @@
$dismaxQuery = new SolrDisMaxQuery('lucene');
$dismaxQuery
->addPhraseField('first', 3, 1)
- ->addPhraseField('second', 4, 1)
- ->addPhraseField('cat', 55);
+ ->addPhraseField('second', 4, 1)
+ ->addPhraseField('cat', 55);
echo $dismaxQuery . PHP_EOL;
echo $dismaxQuery->removePhraseField('second');
?>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60361
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60361
------------------------------------------------------------------
Modified: en/internals2/opcodes/add-interface.xml
By: Gennady Kovshenin on 2015-03-15 18:27:32
===================================================================
--- en/internals2/opcodes/add-interface.xml
+++ en/internals2/opcodes/add-interface.xml
@@ -8,11 +8,64 @@
<![CDATA[
<?php
/*
- *
+ * adds an implemented interface to a class declaration
* opcode number: 144
- * No sample PHP yet */
+ */
+interface iA {
+}
+
+class A implements iA {
+}
?>
]]>
</programlisting>
</section>
+ <section xml:id="internals2.opcodes.add-interface.listing">
+ <title>PHP opcodes</title>
+ <simpara>Function name: (null)</simpara>
+ <simpara>Compiled variables: none</simpara>
+ <informaltable>
+ <tgroup cols="7">
+ <thead>
+ <row>
+ <entry>line</entry><entry>#</entry><entry>op</entry>
+
<entry>fetch</entry><entry>ext</entry><entry>return</entry>
+ <entry>operands</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>6</entry><entry>0</entry>
+ <entry>NOP</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry></entry><entry>1</entry>
+ <entry>DECLARE_CLASS</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>'a'</entry>
+ </row>
+ <row>
+ <entry></entry><entry>2</entry>
+ <entry>ADD_INTERFACE</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>'iA'</entry>
+ </row>
+ <row>
+ <entry></entry><entry>3</entry>
+ <entry>VERIFY_ABSTRACT_CLASS</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry></entry><entry>3</entry>
+ <entry>RETURN</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>1</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
</section>
No newline at end of file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60576
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60576
------------------------------------------------------------------
Modified: en/internals2/opcodes/add-char.xml
By: Gennady Kovshenin on 2015-03-15 18:29:44
===================================================================
--- en/internals2/opcodes/add-char.xml
+++ en/internals2/opcodes/add-char.xml
@@ -8,10 +8,10 @@
<![CDATA[
<?php
/*
- * add character value2 to string value1 and store in result
+ * add regular characters in encapsed string
* opcode number: 54
*/
-echo "hello world";
+echo "$a ";
?>
]]>
</programlisting>
@@ -19,7 +19,7 @@
<section xml:id="internals2.opcodes.add-char.listing">
<title>PHP opcodes</title>
<simpara>Function name: (null)</simpara>
- <simpara>Compiled variables: none </simpara>
+ <simpara>Compiled variables: !0=$a</simpara>
<informaltable>
<tgroup cols="7">
<thead>
@@ -32,12 +32,24 @@
<tbody>
<row>
<entry>6</entry><entry>0</entry>
+ <entry>ADD_VAR</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>!0</entry>
+ </row>
+ <row>
+ <entry></entry><entry>1</entry>
+ <entry>ADD_CHAR</entry><entry></entry>
+ <entry></entry><entry></entry>
+ <entry>32</entry>
+ </row>
+ <row>
+ <entry></entry><entry>2</entry>
<entry>ECHO</entry><entry></entry>
<entry></entry><entry></entry>
- <entry>'hello%5C+world'</entry>
+ <entry> </entry>
</row>
<row>
- <entry>7</entry><entry>1</entry>
+ <entry></entry><entry>3</entry>
<entry>RETURN</entry><entry></entry>
<entry></entry><entry></entry>
<entry>1</entry>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60575
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60575
------------------------------------------------------------------
Modified: en/internals2/opcodes/cast.xml
By: Gennady Kovshenin on 2015-03-15 18:46:59
===================================================================
--- en/internals2/opcodes/cast.xml
+++ en/internals2/opcodes/cast.xml
@@ -8,7 +8,7 @@
<![CDATA[
<?php
/*
- * casts value1 as type value2 (?? Not certain about arguments ??)
+ * casts value1 as type value2 (type in extended_value)
* opcode number: 21
*/
echo (int)1;
@@ -39,7 +39,7 @@
<row>
<entry></entry><entry>1</entry>
<entry>ECHO</entry><entry></entry>
- <entry></entry><entry></entry>
+ <entry></entry><entry>1</entry>
<entry>~0</entry>
</row>
<row>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60577
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60577
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetget.xml
By: Craig Duncan on 2015-03-16 18:05:53
===================================================================
--- en/language/predefined/arrayaccess/offsetget.xml
+++ en/language/predefined/arrayaccess/offsetget.xml
@@ -4,7 +4,7 @@
<refentry xml:id="arrayaccess.offsetget" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>ArrayAccess::offsetGet</refname>
- <refpurpose>Offset to retrieve</refpurpose>
+ <refpurpose>Returns the value at specified offset</refpurpose>
</refnamediv>
<refsect1 role="description">
@@ -14,9 +14,6 @@
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>
- Returns the value at specified offset.
- </para>
- <para>
This method is executed when checking if offset is <function>empty</function>.
</para>
</refsect1>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60585
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60585
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetset.xml
By: Craig Duncan on 2015-03-16 18:06:21
===================================================================
--- en/language/predefined/arrayaccess/offsetset.xml
+++ en/language/predefined/arrayaccess/offsetset.xml
@@ -4,7 +4,7 @@
<refentry xml:id="arrayaccess.offsetset" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>ArrayAccess::offsetSet</refname>
- <refpurpose>Offset to set</refpurpose>
+ <refpurpose>Assigns a value to the specified offset</refpurpose>
</refnamediv>
<refsect1 role="description">
@@ -14,9 +14,6 @@
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
<methodparam><type>mixed</type><parameter>value</parameter></methodparam>
</methodsynopsis>
- <para>
- Assigns a value to the specified offset.
- </para>
</refsect1>
<refsect1 role="parameters">
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60586
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60586
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetexists.xml
By: Craig Duncan on 2015-03-16 18:06:25
===================================================================
--- en/language/predefined/arrayaccess/offsetexists.xml
+++ en/language/predefined/arrayaccess/offsetexists.xml
@@ -4,7 +4,7 @@
<refentry xml:id="arrayaccess.offsetexists" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>ArrayAccess::offsetExists</refname>
- <refpurpose>Whether an offset exists</refpurpose>
+ <refpurpose>Checks if the specified offset exists</refpurpose>
</refnamediv>
<refsect1 role="description">
@@ -14,9 +14,6 @@
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
<para>
- Whether or not an offset exists.
- </para>
- <para>
This method is executed when using <function>isset</function> or
<function>empty</function> on objects implementing
<classname>ArrayAccess</classname>.
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60584
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60584
------------------------------------------------------------------
Modified: en/language/predefined/arrayaccess/offsetunset.xml
By: Craig Duncan on 2015-03-16 18:06:47
===================================================================
--- en/language/predefined/arrayaccess/offsetunset.xml
+++ en/language/predefined/arrayaccess/offsetunset.xml
@@ -4,7 +4,7 @@
<refentry xml:id="arrayaccess.offsetunset" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>ArrayAccess::offsetUnset</refname>
- <refpurpose>Offset to unset</refpurpose>
+ <refpurpose>Unsets an offset</refpurpose>
</refnamediv>
<refsect1 role="description">
@@ -13,9 +13,6 @@
<modifier>abstract</modifier> <modifier>public</modifier>
<type>void</type><methodname>ArrayAccess::offsetUnset</methodname>
<methodparam><type>mixed</type><parameter>offset</parameter></methodparam>
</methodsynopsis>
- <para>
- Unsets an offset.
- </para>
<note>
<para>
This method will <emphasis>not</emphasis> be called when type-casting to
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=60587
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=60587
------------------------------------------------------------------
Modified: en/reference/weakref/weakref/release.xml
By: anonymous on 2015-03-30 23:52:56
===================================================================
--- en/reference/weakref/weakref/release.xml
+++ en/reference/weakref/weakref/release.xml
@@ -5,7 +5,7 @@
<refname>Weakref::release</refname>
<refpurpose>Releases a previously acquired reference</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
@@ -13,16 +13,23 @@
<void/>
</methodsynopsis>
<para>
- Releases a previously acquired reference. Potentially turning a strong
+ Releases a previously acquired reference, potentially turning a strong
reference back into a weak reference.
</para>
+ <para>
+ The <classname>Weakref</classname> instance maintains an internal acquired
+ counter to track outstanding strong references. If the call to
+ <methodname>Weakref::release</methodname> is successful, this counter
+ will be decremented by one. Once this counter reaches zero, the strong
+ reference is turned back into a weak reference.
+ </para>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
&no.function.parameters;
</refsect1>
-
+
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
@@ -30,7 +37,7 @@
released, &false; otherwise.
</para>
</refsect1>
-
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -74,7 +81,7 @@
</example>
</para>
</refsect1>
-
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
@@ -83,7 +90,7 @@
</simplelist>
</para>
</refsect1>
-
+
</refentry>
<!-- Keep this comment at the end of the file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61144
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61144
------------------------------------------------------------------
Modified: en/reference/weakref/weakref/acquire.xml
By: anonymous on 2015-03-30 23:53:03
===================================================================
--- en/reference/weakref/weakref/acquire.xml
+++ en/reference/weakref/weakref/acquire.xml
@@ -5,7 +5,7 @@
<refname>Weakref::acquire</refname>
<refpurpose>Acquires a strong reference on that object</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
@@ -16,13 +16,19 @@
Acquires a strong reference on that object, virtually turning the weak
reference into a strong one.
</para>
+ <para>
+ The <classname>Weakref</classname> instance maintains an internal acquired
+ counter to track outstanding strong references. If the call to
+ <methodname>Weakref::acquire</methodname> is successful, this counter
+ will be incremented by one.
+ </para>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
&no.function.parameters;
</refsect1>
-
+
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
@@ -30,7 +36,7 @@
reference, &false; otherwise.
</para>
</refsect1>
-
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -73,7 +79,7 @@
</screen>
</example>
</para>
-
+
<para>
<example>
<title>Nested acquire/release example</title>
@@ -130,7 +136,7 @@
</example>
</para>
</refsect1>
-
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
@@ -139,7 +145,7 @@
</simplelist>
</para>
</refsect1>
-
+
</refentry>
<!-- Keep this comment at the end of the file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61145
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61145
------------------------------------------------------------------
Modified: en/reference/strings/functions/strtolower.xml
By: Evaldo Junior on 2015-04-05 03:34:48
===================================================================
--- en/reference/strings/functions/strtolower.xml
+++ en/reference/strings/functions/strtolower.xml
@@ -56,7 +56,7 @@
<?php
$str = "Mary Had A Little Lamb and She LOVED It So";
$str = strtolower($str);
-echo $str; // Prints mary had a little lamb and she loved it so
+echo $str; // mary had a little lamb and she loved it so
?>
]]>
</programlisting>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61334
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61334
------------------------------------------------------------------
Modified: en/reference/mbstring/functions/mb-strtolower.xml
By: Evaldo Junior on 2015-04-05 03:37:06
===================================================================
--- en/reference/mbstring/functions/mb-strtolower.xml
+++ en/reference/mbstring/functions/mb-strtolower.xml
@@ -72,7 +72,7 @@
<?php
$str = "Mary Had A Little Lamb and She LOVED It So";
$str = mb_strtolower($str);
-echo $str; // Prints mary had a little lamb and she loved it so
+echo $str; // mary had a little lamb and she loved it so
?>
]]>
</programlisting>
@@ -87,7 +87,7 @@
<?php
$str = "Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει
υπέρ νωθρού κυνός";
$str = mb_strtolower($str, 'UTF-8');
-echo $str; // Prints τάχιστη αλώπηξ βαφής ψημένη γη,
δρασκελίζει υπέρ νωθρού κυνός
+echo $str; // τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει
υπέρ νωθρού κυνός
?>
]]>
</programlisting>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61335
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61335
------------------------------------------------------------------
Modified: en/reference/funchand/functions/func-get-arg.xml
By: Jonid Bendo on 2015-04-07 07:57:11
===================================================================
--- en/reference/funchand/functions/func-get-arg.xml
+++ en/reference/funchand/functions/func-get-arg.xml
@@ -109,6 +109,15 @@
?>
]]>
</programlisting>
+ <para>
+ &example.outputs;
+ </para>
+ <screen>
+<![CDATA[
+Number of arguments: 3
+Second argument is: 2
+]]>
+ </screen>
</example>
</para>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=61658
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=61658
------------------------------------------------------------------
Modified: en/internals2/opcodes/declare-const.xml
By: salathe on 2015-04-15 01:07:47
===================================================================
--- en/internals2/opcodes/declare-const.xml
+++ en/internals2/opcodes/declare-const.xml
@@ -6,13 +6,75 @@
<title>PHP code</title>
<programlisting role="php">
<![CDATA[
-<?php
+<?php
/*
*
* opcode number: 143
- * No sample PHP yet */
+ * Declare a constant
+ */
+const a = "A";
+
+echo a;
?>
]]>
</programlisting>
</section>
+ <section xml:id="internals2.opcodes.declare-const.listing">
+ <title>PHP opcodes</title>
+ <simpara>Function name: (null)</simpara>
+ <simpara>Compiled variables: (null) </simpara>
+ <informaltable>
+ <tgroup cols="7">
+ <thead>
+ <row>
+ <entry>line</entry>
+ <entry>#</entry>
+ <entry>op</entry>
+ <entry>fetch</entry>
+ <entry>ext</entry>
+ <entry>return</entry>
+ <entry>operands</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>7</entry>
+ <entry>0</entry>
+ <entry>DECLARE_CONST</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>'a', 'A'</entry>
+ </row>
+ <row>
+ <entry>9</entry>
+ <entry>1</entry>
+ <entry>FETCH_CONSTANT</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>~0</entry>
+ <entry>'a'</entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>2</entry>
+ <entry>ECHO</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>~0</entry>
+ </row>
+ <row>
+ <entry></entry>
+ <entry>3</entry>
+ <entry>RETURN</entry>
+ <entry></entry>
+ <entry></entry>
+ <entry></entry>
+ <entry>1</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </section>
</section>
No newline at end of file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62134
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62134
------------------------------------------------------------------
Modified: en/internals2/opcodes.xml
By: salathe on 2015-04-15 03:41:19
===================================================================
--- en/internals2/opcodes.xml
+++ en/internals2/opcodes.xml
@@ -65,7 +65,7 @@
<row><entry>38</entry><entry><xref
linkend="internals2.opcodes.assign"/></entry><entry>yes</entry></row>
<row><entry>39</entry><entry><xref
linkend="internals2.opcodes.assign-ref"/></entry><entry>yes</entry></row>
<row><entry>40</entry><entry><xref
linkend="internals2.opcodes.echo"/></entry><entry>yes</entry></row>
- <row><entry>41</entry><entry><xref
linkend="internals2.opcodes.print"/></entry><entry>yes</entry></row>
+ <row><entry>41</entry><entry><xref
linkend="internals2.opcodes.print"/>(removed in
PHP7)</entry><entry>yes</entry></row>
<row><entry>42</entry><entry><xref
linkend="internals2.opcodes.jmp"/></entry><entry>yes</entry></row>
<row><entry>43</entry><entry><xref
linkend="internals2.opcodes.jmpz"/></entry><entry>yes</entry></row>
<row><entry>44</entry><entry><xref
linkend="internals2.opcodes.jmpnz"/></entry><entry>yes</entry></row>
@@ -77,7 +77,7 @@
<row><entry>50</entry><entry><xref
linkend="internals2.opcodes.brk"/></entry><entry>yes</entry></row>
<row><entry>51</entry><entry><xref
linkend="internals2.opcodes.cont"/></entry><entry>yes</entry></row>
<row><entry>52</entry><entry><xref
linkend="internals2.opcodes.bool"/></entry><entry>yes</entry></row>
- <row><entry>53</entry><entry><xref
linkend="internals2.opcodes.init-string"/></entry><entry>yes</entry></row>
+ <row><entry>53</entry><entry><xref
linkend="internals2.opcodes.init-string"/>(removed)</entry><entry>yes</entry></row>
<row><entry>54</entry><entry><xref
linkend="internals2.opcodes.add-char"/></entry><entry>yes</entry></row>
<row><entry>55</entry><entry><xref
linkend="internals2.opcodes.add-string"/></entry><entry>yes</entry></row>
<row><entry>56</entry><entry><xref
linkend="internals2.opcodes.add-var"/></entry><entry>yes</entry></row>
@@ -90,7 +90,7 @@
<row><entry>63</entry><entry><xref
linkend="internals2.opcodes.recv"/></entry><entry>yes</entry></row>
<row><entry>64</entry><entry><xref
linkend="internals2.opcodes.recv-init"/></entry><entry>yes</entry></row>
<row><entry>65</entry><entry><xref
linkend="internals2.opcodes.send-val"/></entry><entry>yes</entry></row>
- <row><entry>66</entry><entry><xref
linkend="internals2.opcodes.send-var"/></entry><entry>yes</entry></row>
+
<row><entry>66</entry><entry>SEND_VAR_EX</entry><entry>no</entry></row>
<row><entry>67</entry><entry><xref
linkend="internals2.opcodes.send-ref"/></entry><entry>yes</entry></row>
<row><entry>68</entry><entry><xref
linkend="internals2.opcodes.new"/></entry><entry>yes</entry></row>
<row><entry>69</entry><entry><xref
linkend="internals2.opcodes.init-ns-fcall-by-name"/></entry><entry>no</entry></row>
@@ -101,8 +101,10 @@
<row><entry>74</entry><entry><xref
linkend="internals2.opcodes.unset-var"/></entry><entry>yes</entry></row>
<row><entry>75</entry><entry><xref
linkend="internals2.opcodes.unset-dim"/></entry><entry>yes</entry></row>
<row><entry>76</entry><entry><xref
linkend="internals2.opcodes.unset-obj"/></entry><entry>yes</entry></row>
- <row><entry>77</entry><entry><xref
linkend="internals2.opcodes.fe-reset"/></entry><entry>yes</entry></row>
- <row><entry>78</entry><entry><xref
linkend="internals2.opcodes.fe-fetch"/></entry><entry>yes</entry></row>
+ <row><entry>77 (outdated)</entry><entry><xref
linkend="internals2.opcodes.fe-reset"/></entry><entry>yes</entry></row>
+
<row><entry>77</entry><entry>FE_RESET_R</entry><entry>no</entry></row>
+ <row><entry>78 (outdate)</entry><entry><xref
linkend="internals2.opcodes.fe-fetch"/></entry><entry>yes</entry></row>
+
<row><entry>78</entry><entry>FE_FETCH_R</entry><entry>no</entry></row>
<row><entry>79</entry><entry><xref
linkend="internals2.opcodes.exit"/></entry><entry>yes</entry></row>
<row><entry>80</entry><entry><xref
linkend="internals2.opcodes.fetch-r"/></entry><entry>yes</entry></row>
<row><entry>81</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-r"/></entry><entry>yes</entry></row>
@@ -122,7 +124,7 @@
<row><entry>95</entry><entry><xref
linkend="internals2.opcodes.fetch-unset"/></entry><entry>no</entry></row>
<row><entry>96</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-unset"/></entry><entry>no</entry></row>
<row><entry>97</entry><entry><xref
linkend="internals2.opcodes.fetch-obj-unset"/></entry><entry>no</entry></row>
- <row><entry>98</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-tmp-var"/></entry><entry>yes</entry></row>
+ <row><entry>98 (outdated)</entry><entry><xref
linkend="internals2.opcodes.fetch-dim-tmp-var"/></entry><entry>yes</entry></row>
<row><entry>99</entry><entry><xref
linkend="internals2.opcodes.fetch-constant"/></entry><entry>yes</entry></row>
<row><entry>100</entry><entry><xref
linkend="internals2.opcodes.goto"/></entry><entry>no</entry></row>
<row><entry>101</entry><entry><xref
linkend="internals2.opcodes.ext-stmt"/></entry><entry>yes</entry></row>
@@ -140,22 +142,22 @@
<row><entry>113</entry><entry><xref
linkend="internals2.opcodes.init-static-method-call"/></entry><entry>yes</entry></row>
<row><entry>114</entry><entry><xref
linkend="internals2.opcodes.isset-isempty-var"/></entry><entry>yes</entry></row>
<row><entry>115</entry><entry><xref
linkend="internals2.opcodes.isset-isempty-dim-obj"/></entry><entry>yes</entry></row>
- <row><entry>116</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>117</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>118</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>119</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>120</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>121</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>122</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>123</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>124</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>125</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>126</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>127</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>128</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>129</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>130</entry><entry>not
documented</entry><entry>no</entry></row>
- <row><entry>131</entry><entry>not
documented</entry><entry>no</entry></row>
+
<row><entry>116</entry><entry>SEND_VAL_EX</entry><entry>no</entry></row>
+ <row><entry>117</entry><entry><xref
linkend="internals2.opcodes.send-var"/></entry><entry>yes</entry></row>
+
<row><entry>118</entry><entry>INIT_USER_CALL</entry><entry>no</entry></row>
+
<row><entry>119</entry><entry>SEND_ARRAY</entry><entry>no</entry></row>
+
<row><entry>120</entry><entry>SEND_USER</entry><entry>no</entry></row>
+
<row><entry>121</entry><entry>STRLEN</entry><entry>no</entry></row>
+
<row><entry>122</entry><entry>DEFINED</entry><entry>no</entry></row>
+
<row><entry>123</entry><entry>TYPE_CHECK</entry><entry>no</entry></row>
+
<row><entry>124</entry><entry>VERIFY_RETURN_TYPE</entry><entry>no</entry></row>
+
<row><entry>125</entry><entry>FE_RESET_RW</entry><entry>no</entry></row>
+
<row><entry>126</entry><entry>FE_FETCH_RW</entry><entry>no</entry></row>
+
<row><entry>127</entry><entry>FE_FREE</entry><entry>no</entry></row>
+
<row><entry>128</entry><entry>INIT_DYNAMIC_CALL</entry><entry>no</entry></row>
+
<row><entry>129</entry><entry>DO_ICALL</entry><entry>no</entry></row>
+
<row><entry>130</entry><entry>DO_UCALL</entry><entry>no</entry></row>
+
<row><entry>131</entry><entry>DO_FCALL_BY_NAME</entry><entry>no</entry></row>
<row><entry>132</entry><entry><xref
linkend="internals2.opcodes.pre-inc-obj"/></entry><entry>yes</entry></row>
<row><entry>133</entry><entry><xref
linkend="internals2.opcodes.pre-dec-obj"/></entry><entry>yes</entry></row>
<row><entry>134</entry><entry><xref
linkend="internals2.opcodes.post-inc-obj"/></entry><entry>yes</entry></row>
@@ -175,8 +177,26 @@
<row><entry>148</entry><entry><xref
linkend="internals2.opcodes.isset-isempty-prop-obj"/></entry><entry>yes</entry></row>
<row><entry>149</entry><entry><xref
linkend="internals2.opcodes.handle-exception"/></entry><entry>yes</entry></row>
<row><entry>150</entry><entry><xref
linkend="internals2.opcodes.user-opcode"/></entry><entry>no</entry></row>
+
<row><entry>151</entry><entry>ASSERT_CHECK</entry><entry>no</entry></row>
<row><entry>152</entry><entry><xref
linkend="internals2.opcodes.zend-jmp-set"/></entry><entry>no</entry></row>
<row><entry>153</entry><entry><xref
linkend="internals2.opcodes.zend-declare-lambda-function"/></entry><entry>no</entry></row>
+
<row><entry>154</entry><entry>ADD_TRAIT</entry><entry>no</entry></row>
+
<row><entry>155</entry><entry>BIND_TRAITS</entry><entry>no</entry></row>
+
<row><entry>156</entry><entry>SEPARATE</entry><entry>no</entry></row>
+
<row><entry>157</entry><entry>FETCH_CLASS_NAME</entry><entry>no</entry></row>
+
<row><entry>158</entry><entry>CALL_TRAMPOLINE</entry><entry>no</entry></row>
+
<row><entry>159</entry><entry>DISCARD_EXCEPTION</entry><entry>no</entry></row>
+
<row><entry>160</entry><entry>YIELD</entry><entry>no</entry></row>
+
<row><entry>161</entry><entry>GENERATOR_RETURN</entry><entry>no</entry></row>
+
<row><entry>162</entry><entry>FAST_CALL</entry><entry>no</entry></row>
+
<row><entry>163</entry><entry>FAST_RET</entry><entry>no</entry></row>
+
<row><entry>164</entry><entry>RECV_VARIADIC</entry><entry>no</entry></row>
+
<row><entry>165</entry><entry>SEND_UNPACK</entry><entry>no</entry></row>
+
<row><entry>166</entry><entry>POW</entry><entry>no</entry></row>
+
<row><entry>167</entry><entry>ASSIGN_POW</entry><entry>no</entry></row>
+
<row><entry>168</entry><entry>BIND_GLOBAL</entry><entry>no</entry></row>
+
<row><entry>169</entry><entry>COALESCE</entry><entry>no</entry></row>
+
<row><entry>170</entry><entry>SPACESHIP</entry><entry>no</entry></row>
</tbody>
</tgroup>
</table>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62136
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62136
------------------------------------------------------------------
Modified: en/language/types/string.xml
By: salathe on 2015-04-15 10:43:18
===================================================================
--- en/language/types/string.xml
+++ en/language/types/string.xml
@@ -594,7 +594,8 @@
<type>string</type>, and then wrap it in <literal>{</literal> and
<literal>}</literal>. Since <literal>{</literal> can not be escaped,
this
syntax will only be recognised when the <literal>$</literal> immediately
- follows the <literal>{</literal>. Use <literal>{$</literal> to get a
+ follows the <literal>{</literal> or <literal>{</literal> immediately
follows the<literal>$</literal>.
+ Use <literal>{$</literal> to get a
literal <literal>{$</literal>. Some examples to make it clear:
</simpara>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62158
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62158
------------------------------------------------------------------
Modified: en/reference/kadm5/setup.xml
By: salathe on 2015-04-15 11:18:34
===================================================================
--- en/reference/kadm5/setup.xml
+++ en/reference/kadm5/setup.xml
@@ -28,6 +28,11 @@
the client libraries installed by KADM5, avoiding any conflicts.
</para>
</note>
+ <note>
+ <para>
+ Kadm5 last release was 0.2.3 alpha which was on 2003-06-03.
+ </para>
+ </note>
<para>
&pecl.windows.download;
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62163
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62163
------------------------------------------------------------------
Modified: en/reference/filter/constants.xml
By: salathe on 2015-04-16 06:23:28
===================================================================
--- en/reference/filter/constants.xml
+++ en/reference/filter/constants.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 336648 $ -->
+<!-- $Revision: 335127 $ -->
<!-- Generated by xml_proto.php v2.4. Found in /scripts directory of phpdoc. -->
<appendix xml:id="filter.constants" xmlns="http://docbook.org/ns/docbook">
&reftitle.constants;
@@ -223,8 +223,7 @@
</term>
<listitem>
<simpara>
- ID of "validate_mac_address" filter.
- (Available as of PHP 5.5.0)
+ ID of "validate_mac" filter.
</simpara>
</listitem>
</varlistentry>
@@ -262,6 +261,17 @@
</simpara>
</listitem>
</varlistentry>
+ <varlistentry xml:id="constant.filter-sanitize-full-special-chars">
+ <term>
+ <constant>FILTER_SANITIZE_FULL_SPECIAL_CHARS</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ ID of "full special chars" filter.
+ </simpara>
+ </listitem>
+ </varlistentry>
<varlistentry xml:id="constant.filter-sanitize-stripped">
<term>
<constant>FILTER_SANITIZE_STRIPPED</constant>
@@ -560,6 +570,39 @@
</simpara>
</listitem>
</varlistentry>
+ <varlistentry xml:id="constant.filter-flag-strip-backtick">
+ <term>
+ <constant>FILTER_FLAG_STRIP_BACKTICK</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Removes backticks (`)
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="constant.filter-flag-scheme-required">
+ <term>
+ <constant>FILTER_FLAG_SCHEME_REQUIRED</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Requires url scheme.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry xml:id="constant.filter-flag-host-required">
+ <term>
+ <constant>FILTER_FLAG_HOST_REQUIRED</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Requires url host.
+ </simpara>
+ </listitem>
+ </varlistentry>
</variablelist>
</appendix>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62178
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62178
------------------------------------------------------------------
Modified: en/reference/haru/harupage/measuretext.xml
By: anonymous on 2015-04-18 00:37:33
===================================================================
--- en/reference/haru/harupage/measuretext.xml
+++ en/reference/haru/harupage/measuretext.xml
@@ -3,7 +3,7 @@
<refentry xml:id="harupage.measuretext" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>HaruPage::measureText</refname>
- <refpurpose>Calculate the number of characters which can be included within the specified
width</refpurpose>
+ <refpurpose>Calculate the byte length of characters which can be included on one line of
the specified width</refpurpose>
</refnamediv>
<refsect1 role="description">
@@ -15,7 +15,7 @@
<methodparam
choice="opt"><type>bool</type><parameter>wordwrap</parameter><initializer>false</initializer></methodparam>
</methodsynopsis>
<para>
- Get the number of characters which can be included within the specified width.
+ Get the byte length of characters which can be included on one line of the specified width.
</para>
</refsect1>
@@ -35,7 +35,7 @@
<term><parameter>width</parameter></term>
<listitem>
<para>
- The width of the area to put the text to.
+ The width of the line.
</para>
</listitem>
</varlistentry>
@@ -44,8 +44,8 @@
<listitem>
<para>
When this parameter is set to &true; the function "emulates" word
- wrapping and doesn't include the part of the current word if reached
- the end of the area.
+ wrapping by stopping after the last full word (delimited by whitespace)
+ that can fit on the line.
</para>
</listitem>
</varlistentry>
@@ -56,7 +56,9 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- Returns the number of characters which can be included within the specified width.
+ Returns the byte length of characters which can be included within the specified width.
+ For single-byte encodings, this is equal to the number of characters. For multi-byte encodings,
+ this is not necessarily the case.
</para>
</refsect1>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62242
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62242
------------------------------------------------------------------
Modified: en/language/control-structures/switch.xml
By: pasindu on 2015-04-19 06:04:30
===================================================================
--- en/language/control-structures/switch.xml
+++ en/language/control-structures/switch.xml
@@ -28,6 +28,33 @@
</para>
</note>
<para>
+ <table>
+ <title>Changelogs</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>7.0.0</entry>
+ <entry>
+ Multiple default cases will raise a <constant>E_COMPILE_ERROR</constant> error.
+ </entry>
+ </row>
+ <row>
+ <entry>5.7.0</entry>
+ <entry>
+ Multiple default cases will raise a <constant>E_DEPRECATED</constant> error.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </para>
+ <para>
The following two examples are two different ways to write the
same thing, one using a series of <literal>if</literal> and
<literal>elseif</literal> statements, and the other using the
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62267
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62267
------------------------------------------------------------------
Modified: en/reference/array/functions/list.xml
By: pasindu on 2015-04-19 07:09:53
===================================================================
--- en/reference/array/functions/list.xml
+++ en/reference/array/functions/list.xml
@@ -39,6 +39,29 @@
Returns the assigned array.
</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>7.0.0</entry>
+ <entry>
+ Will not work with string.
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </refsect1>
<refsect1 role="examples">
&reftitle.examples;
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62276
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62276
------------------------------------------------------------------
Modified: en/reference/dio/functions/dio-open.xml
By: cmb on 2015-04-22 14:39:49
===================================================================
--- en/reference/dio/functions/dio-open.xml
+++ en/reference/dio/functions/dio-open.xml
@@ -70,7 +70,7 @@
<para>
<constant>O_EXCL</constant> - if both
<constant>O_CREAT</constant>
and <constant>O_EXCL</constant> are set and the file already
- exists, causes <function>dio_open</function> to fail.
+ exists, <function>dio_open</function> will fail.
</para>
</listitem>
<listitem>
@@ -108,9 +108,9 @@
If <parameter>flags</parameter> contains
<constant>O_CREAT</constant>, <parameter>mode</parameter> will
set the permissions of the file (creation
- permissions). <parameter>Mode</parameter> is required for
+ permissions). <parameter>mode</parameter> is required for
correct operation when <constant>O_CREAT</constant> is
- specified in <constant>mode</constant> and is ignored
+ specified in <parameter>flags</parameter> and is ignored
otherwise.
</para>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62339
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62339
------------------------------------------------------------------
Modified: en/language/oop5/constants.xml
By: Ryan Pallas on 2015-04-24 11:16:46
===================================================================
--- en/language/oop5/constants.xml
+++ en/language/oop5/constants.xml
@@ -72,6 +72,32 @@
Nowdoc support was added in PHP 5.3.0.
</para>
</note>
+
+ <example>
+ <title>Constant expression example</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+const ONE = 1;
+
+class foo {
+ // As of PHP 5.6.0
+ const TWO = ONE * 2;
+ const THREE = ONE + self::TWO;
+ const SENTENCE = 'The value of THREE is '.self::THREE;
+}
+?>
+]]>
+ </programlisting>
+ <para>
+ It is possible to provide a scalar expression involving numeric and string literals and/or
constants in context of a class constant.
+ </para>
+ </example>
+ <note>
+ <para>
+ Constant expression support was added in PHP 5.6.0.
+ </para>
+ </note>
</sect1>
<!-- Keep this comment at the end of the file
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62379
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62379
------------------------------------------------------------------
Modified: en/reference/oci8/functions/oci-close.xml
By: cmb on 2015-04-24 11:31:49
===================================================================
--- en/reference/oci8/functions/oci-close.xml
+++ en/reference/oci8/functions/oci-close.xml
@@ -105,7 +105,7 @@
oci_close($conn);
-// $conn is no long usable in the script but the underlying database
+// $conn is no longer usable in the script but the underlying database
// connection is still held open until $stid is freed.
var_dump($conn); // prints NULL
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62380
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62380
------------------------------------------------------------------
Modified: en/reference/var/functions/isset.xml
By: cmb on 2015-04-24 13:49:19
===================================================================
--- en/reference/var/functions/isset.xml
+++ en/reference/var/functions/isset.xml
@@ -19,7 +19,7 @@
<para>
If a variable has been unset with <function>unset</function>, it will no
longer be set. <function>isset</function> will return &false; if testing a
- variable that has been set to &null;. Also note that a &null; byte
+ variable that has been set to &null;. Also note that a null character
(<literal>" "</literal>) is not equivalent to the PHP &null; constant.
</para>
<para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=58953
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=58953
------------------------------------------------------------------
Modified: en/reference/snmp/setup.xml
By: cmb on 2015-04-29 15:38:16
===================================================================
--- en/reference/snmp/setup.xml
+++ en/reference/snmp/setup.xml
@@ -17,7 +17,7 @@
On Windows <acronym>SNMP</acronym> functions are only available on NT and not on
Win95/98.
</para>
<para>
- Begining with PHP 5.4.0 Net-SNMP version 5.3+ is required for Unix
+ Beginning with PHP 5.4.0 Net-SNMP version 5.3+ is required for Unix
installations and Net-SNMP version 5.4+ for Windows.
</para>
</section>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62459
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62459
------------------------------------------------------------------
Modified: en/reference/soap/soapclient/getfunctions.xml
By: cmb on 2015-04-30 06:09:15
===================================================================
--- en/reference/soap/soapclient/getfunctions.xml
+++ en/reference/soap/soapclient/getfunctions.xml
@@ -28,7 +28,7 @@
&reftitle.returnvalues;
<para>
The <type>array</type> of SOAP function prototypes, detailing the return type,
- the function name and type-hinted paramaters.
+ the function name and type-hinted parameters.
</para>
</refsect1>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62469
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62469
------------------------------------------------------------------
Modified: en/reference/array/functions/array-udiff.xml
By: cmb on 2015-04-30 17:45:52
===================================================================
--- en/reference/array/functions/array-udiff.xml
+++ en/reference/array/functions/array-udiff.xml
@@ -133,7 +133,7 @@
<programlisting role="php">
<![CDATA[
<?php
-Class MyCalendar {
+class MyCalendar {
public $free = array();
public $booked = array();
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62486
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62486
------------------------------------------------------------------
Modified: en/reference/stream/functions/stream-context-get-options.xml
By: Hannes Van De Vreken on 2015-04-30 18:33:17
===================================================================
--- en/reference/stream/functions/stream-context-get-options.xml
+++ en/reference/stream/functions/stream-context-get-options.xml
@@ -50,7 +50,7 @@
<?php
$params = array("method" => "POST");
-stream_context_get_default(array("http" => $params));
+stream_context_set_default(array("http" => $params));
var_dump(stream_context_get_options(stream_context_get_default()));
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62487
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62487
------------------------------------------------------------------
Modified: en/reference/pdf/functions/pdf-setfont.xml
By: cmb on 2015-05-02 10:56:14
===================================================================
--- en/reference/pdf/functions/pdf-setfont.xml
+++ en/reference/pdf/functions/pdf-setfont.xml
@@ -14,7 +14,7 @@
<methodparam><type>float</type><parameter>fontsize</parameter></methodparam>
</methodsynopsis>
<para>
- Sets the current font in the specified <parameter>size</parameter>, using a
+ Sets the current font in the specified <parameter>fontsize</parameter>, using a
<parameter>font</parameter> handle returned by
<function>PDF_load_font</function>.
&return.success;
</para>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62505
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62505
------------------------------------------------------------------
Modified: en/reference/pdf/functions/pdf-skew.xml
By: cmb on 2015-05-02 11:30:33
===================================================================
--- en/reference/pdf/functions/pdf-skew.xml
+++ en/reference/pdf/functions/pdf-skew.xml
@@ -15,7 +15,7 @@
</methodsynopsis>
<para>
Skews the coordinate system in x and y direction by <parameter>alpha</parameter>
- and <parameter>beta</parameter> degrees. &return.success;
+ and <parameter>beta</parameter> degrees, respectively. &return.success;
</para>
</refsect1>
</refentry>
=> Put this change into your patches : https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=62506
=> Delete this change: https://edit.php.net/?project=php&action=deleteThisChange&idDB=62506
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.