[prev in list] [next in list] [prev in thread] [next in thread]
List: phpdoc
Subject: [PHP-DOC] Contributions are ready for review
From: phpdoc () lists ! php ! net
Date: 2017-06-26 12:00:03
Message-ID: 201706261200.v5QC03nq003366 () pb11 ! pair ! com
[Download RAW message or body]
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/swoole/configure.xml
By: BAOKUN DOU on 2017-06-23 04:36:00
===================================================================
--- en/reference/swoole/configure.xml
+++ en/reference/swoole/configure.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<section xml:id="swoole.installation" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> + &reftitle.install;
+
+ <para>
+ &pecl.info;
+ <link xlink:href="&url.pecl.package;swoole">&url.pecl.package;swoole</link>
+ </para>
+</section>
+
+<!-- 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=74293
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=74293
\
------------------------------------------------------------------
New file: en/reference/swoole/setup.xml
By: BAOKUN DOU on 2017-06-23 04:36:41
===================================================================
--- en/reference/swoole/setup.xml
+++ en/reference/swoole/setup.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<chapter xml:id="swoole.setup" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> + &reftitle.setup;
+
+ <!-- {{{ Requirements -->
+ <section xml:id="swoole.requirements">
+ &reftitle.required;
+ &no.requirement;
+ </section>
+ <!-- }}} -->
+
+ <!-- {{{ Installation -->
+ &reference.swoole.configure;
+ <!-- }}} -->
+
+ <!-- {{{ Configuration -->
+ <!-- &reference.swoole.ini; -->
+ <!-- }}} -->
+
+ <!-- {{{ Resources -->
+ <section xml:id="swoole.resources">
+ &reftitle.resources;
+ &no.resource;
+ </section>
+ <!-- }}} -->
+
+</chapter>
+
+<!-- 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=74294
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=74294
\
------------------------------------------------------------------
New file: en/reference/swoole/book.xml
By: BAOKUN DOU on 2017-06-23 04:47:34
===================================================================
--- en/reference/swoole/book.xml
+++ en/reference/swoole/book.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision: 295472 $ -->
+
+<book xml:id="book.swoole" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Swoole</title>
+
+ <!-- {{{ preface -->
+ <preface xml:id="intro.swoole">
+ &reftitle.intro;
+ <para>
+ Swoole is an high-performance network communication framework uses an \
event-driven, asynchronous, non-blocking I/O odel makes it scalable and efficient. It \
is written in C language without 3rd party libraries. + </para>
+ ¬e.no-windows.extension;
+ </preface>
+ <!-- }}} -->
+
+ &reference.swoole.setup;
+ <!-- &reference.swoole.constants; -->
+ <!-- &reference.swoole.reference; -->
+
+</book>
+
+<!-- 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=74292
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=74292
\
------------------------------------------------------------------
Modified: en/reference/mcrypt/constants.xml
By: leigh on 2017-01-11 07:16:44
===================================================================
--- en/reference/mcrypt/constants.xml
+++ en/reference/mcrypt/constants.xml
@@ -16,40 +16,40 @@
<listitem>
<simpara>
<constant>MCRYPT_MODE_ECB</constant> (<literal>electronic
- codebook</literal>) is suitable for random data,
- such as encrypting other keys. Since data there is short and random,
- the disadvantages of ECB have a favorable negative effect.
+ codebook</literal>) is a block cipher mode that is generally
+ unsuitable for most purposes. The use of this mode is not recommended.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_CBC</constant> (<literal>cipher block
- chaining</literal>) is especially suitable for
- encrypting files where the security is increased over <literal>ECB</literal>
- significantly.
+ chaining</literal>) is a block cipher mode that is significantly
+ more secure than <literal>ECB</literal> mode.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_CFB</constant> (<literal>cipher
- feedback</literal>) is the best mode for encrypting byte
- streams where single bytes must be encrypted.
+ feedback, in 8-bit mode</literal>) is a stream cipher mode.
+ It is recommended to use <literal>NCFB</literal> mode rather
+ than <literal>CFB</literal> mode.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_OFB</constant> (<literal>output feedback, in
- 8bit</literal>) is comparable to <literal>CFB</literal>, but
+ 8-bit mode</literal>) is a stream cipher mode comparable to \
<literal>CFB</literal>, but can be used in applications where error propagation \
cannot
- be tolerated. It's insecure (because it operates in 8bit
- mode) so it is not recommended to use it.
+ be tolerated.
+ It is recommended to use <literal>NOFB</literal> mode rather
+ than <literal>OFB</literal> mode.
</simpara>
</listitem>
<listitem>
<simpara>
<constant>MCRYPT_MODE_NOFB</constant> (<literal>output feedback,
- in nbit</literal>) is comparable to OFB, but
- more secure because it operates on the block size of the algorithm.
+ in n-bit mode</literal>) is comparable to <literal>OFB</literal> mode,
+ but operates on the full block size of the algorithm.
</simpara>
</listitem>
<listitem>
@@ -60,6 +60,25 @@
</listitem>
</itemizedlist>
</para>
+
+ <para>
+ Mcrypt supports some other modes of operation for which there are no predefined \
constants. + They can be utilised by passing a string in place of the missing \
constants. + <itemizedlist>
+ <listitem>
+ <simpara>
+ <constant>"ctr"</constant> (<literal>counter mode</literal>) is a stream cipher \
mode. + </simpara>
+ </listitem>
+ <listitem>
+ <simpara>
+ <constant>"ncfb"</constant> (<literal>cipher feedback,
+ in n-bit mode</literal>) is comparable to <literal>CFB</literal> mode,
+ but operates on the full block size of the algorithm.
+ </simpara>
+ </listitem>
+ </itemizedlist>
+ </para>
<para>
Some other mode and random device constants:
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=71828
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=71828
\
------------------------------------------------------------------
Modified: en/reference/win32service/functions/win32-get-last-control-message.xml
By: Jean-Baptiste Nahan on 2017-03-25 06:23:33
===================================================================
--- en/reference/win32service/functions/win32-get-last-control-message.xml
+++ en/reference/win32service/functions/win32-get-last-control-message.xml
@@ -33,6 +33,15 @@
</para>
</refsect1>
+<refsect1 role="notes">
+&reftitle.notes;
+<caution>
+<para>
+Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI the \
function is disabled. +</para>
+</caution>
+</refsect1>
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73075
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73075
\
------------------------------------------------------------------
Modified: en/reference/win32service/functions/win32-set-service-status.xml
By: Jean-Baptiste Nahan on 2017-03-25 06:23:46
===================================================================
--- en/reference/win32service/functions/win32-set-service-status.xml
+++ en/reference/win32service/functions/win32-set-service-status.xml
@@ -67,6 +67,15 @@
</para>
</refsect1>
+<refsect1 role="notes">
+&reftitle.notes;
+<caution>
+<para>
+Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI the \
function is disabled. +</para>
+</caution>
+</refsect1>
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73074
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73074
\
------------------------------------------------------------------
Modified: en/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
By: Jean-Baptiste Nahan on 2017-03-25 06:23:59
===================================================================
--- en/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
+++ en/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
@@ -90,6 +90,15 @@
</para>
</refsect1>
+<refsect1 role="notes">
+&reftitle.notes;
+<caution>
+<para>
+Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI the \
function is disabled. +</para>
+</caution>
+</refsect1>
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73073
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73073
\
------------------------------------------------------------------
Modified: en/reference/openssl/functions/openssl-pkcs12-export.xml
By: jelle van der Waa on 2017-05-10 02:12:23
===================================================================
--- en/reference/openssl/functions/openssl-pkcs12-export.xml
+++ en/reference/openssl/functions/openssl-pkcs12-export.xml
@@ -56,6 +56,8 @@
<term><parameter>args</parameter></term>
<listitem>
<para>
+ Optional Array, provide an key "extracerts" with as value an array of extra \
certificates or a single certificate to be included in the PKCS#12 file. + \
Provide an key "friendlyname" with as value an string to be used for the supplied \
certificate and key. </para>
</listitem>
</varlistentry>
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73938
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73938
\
------------------------------------------------------------------
Modified: en/reference/memcached/constants.xml
By: Martin Georgiev on 2017-05-15 05:40:48
===================================================================
--- en/reference/memcached/constants.xml
+++ en/reference/memcached/constants.xml
@@ -323,6 +323,37 @@
</listitem>
</varlistentry>
+ <varlistentry xml:id="memcached.constants.have-msgpack">
+ <term><constant>Memcached::HAVE_MSGPACK</constant></term>
+ <listitem>
+ <para>Indicates whether msgpack serializer support is available.</para>
+ <para>Type: <literal>boolean</literal>. Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.have-session">
+ <term><constant>Memcached::HAVE_SESSION</constant></term>
+ <listitem>
+ <para>Type: <literal>boolean</literal>. Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.have-sasl">
+ <term><constant>Memcached::HAVE_SASL</constant></term>
+ <listitem>
+ <para>Type: <literal>boolean</literal>. Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.get-extended">
+ <term><constant>Memcached::GET_EXTENDED</constant></term>
+ <listitem>
+ <para>A flag for <function>Memcached::get</function>, \
<function>Memcached::getMulti</function> and + \
<function>Memcached::getMultiByKey</function> to ensure that the CAS token values + \
are returned as well. Available since v3.0</para> + </listitem>
+ </varlistentry>
+
<varlistentry xml:id="memcached.constants.get-preserve-order">
<term><constant>Memcached::GET_PRESERVE_ORDER</constant></term>
<listitem>
@@ -484,6 +515,55 @@
</listitem>
</varlistentry>
+ <varlistentry xml:id="memcached.constants.res-auth-problem">
+ <term><constant>Memcached::RES_AUTH_PROBLEM</constant></term>
+ <listitem>
+ <para>Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.res-auth-failure">
+ <term><constant>Memcached::RES_AUTH_FAILURE</constant></term>
+ <listitem>
+ <para>Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.res-auth-continue">
+ <term><constant>Memcached::RES_AUTH_CONTINUE</constant></term>
+ <listitem>
+ <para>Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.res-e2big">
+ <term><constant>Memcached::RES_E2BIG</constant></term>
+ <listitem>
+ <para>Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.res-key-too-big">
+ <term><constant>Memcached::RES_KEY_TOO_BIG</constant></term>
+ <listitem>
+ <para>Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.res-server-temporarily-disabled">
+ <term><constant>Memcached::RES_SERVER_TEMPORARILY_DISABLED</constant></term>
+ <listitem>
+ <para>Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry xml:id="memcached.constants.res-server-memory-allocation-failure">
+ <term><constant>Memcached::RES_SERVER_MEMORY_ALLOCATION_FAILURE</constant></term>
+ <listitem>
+ <para>Available since v3.0</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</appendix>
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73966
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73966
\
------------------------------------------------------------------
Modified: en/reference/memcached/memcached/getmulti.xml
By: Martin Georgiev on 2017-05-15 06:05:00
===================================================================
--- en/reference/memcached/memcached/getmulti.xml
+++ en/reference/memcached/memcached/getmulti.xml
@@ -6,41 +6,39 @@
<refname>Memcached::getMulti</refname>
<refpurpose>Retrieve multiple items</refpurpose>
</refnamediv>
-
+
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
<modifier>public</modifier> \
<type>mixed</type><methodname>Memcached::getMulti</methodname> \
<methodparam><type>array</type><parameter>keys</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter \
role="reference">cas_tokens</parameter></methodparam> <methodparam \
choice="opt"><type>int</type><parameter>flags</parameter></methodparam> \
</methodsynopsis> <para>
<function>Memcached::getMulti</function> is similar to
<methodname>Memcached::get</methodname>, but instead of a single key
item, it retrieves multiple items the keys of which are specified in the
- <parameter>keys</parameter> array. If <parameter>cas_tokens</parameter>
- variable is provided, it is filled with the CAS token values for the found
- items.
+ <parameter>keys</parameter> array.
<note>
<para>
- Unlike <methodname>Memcached::get</methodname> it is not possible to
- specify a read-through cache callback for
- <function>Memcached::getMulti</function>, because the memcache protocol
- does not provide information on which keys were not found in the multi-key
- request.
+ Before v3.0 a second argument <parameter \
role="reference">cas_tokens</parameter> was in use. + It was filled with the CAS \
token values for the found items. + The <parameter \
role="reference">cas_tokens</parameter> parameter was removed in v3.0 of the \
extension. + It was replaced with a new flag \
<constant>Memcached::GET_EXTENDED</constant> + that needs is to be used as the \
value for <paramater>flags</paramater>. </para>
</note>
</para>
<para>
The <parameter>flags</parameter> parameter can be used to specify
- additional options for <function>Memcached::getMulti</function>. Currently,
- the only available option is
- <constant>Memcached::GET_PRESERVE_ORDER</constant> that ensures that the
+ additional options for <function>Memcached::getMulti</function>.
+ <constant>Memcached::GET_PRESERVE_ORDER</constant> ensures that the
keys are returned in the same order as they were requested in.
+ <constant>Memcached::GET_EXTENDED</constant> ensures that the
+ CAS tokens will be fetched too.
</para>
</refsect1>
-
+
<refsect1 role="parameters">
&reftitle.parameters;
<para>
@@ -54,14 +52,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>cas_tokens</parameter></term>
- <listitem>
- <para>
- The variable to store the CAS tokens for the found items.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><parameter>flags</parameter></term>
<listitem>
<para>
@@ -72,7 +62,7 @@
</variablelist>
</para>
</refsect1>
-
+
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
@@ -80,15 +70,53 @@
&memcached.result.getresultcode;
</para>
</refsect1>
-
+
<refsect1 role="examples">
&reftitle.examples;
<para>
<example>
- <title><function>Memcached::getMulti</function> example</title>
+ <title><function>Memcached::getMulti</function> example for Memcached v3</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+// Valid for v3 of the extension
+
+$m = new Memcached();
+$m->addServer('localhost', 11211);
+
+$items = array(
+ 'key1' => 'value1',
+ 'key2' => 'value2',
+ 'key3' => 'value3'
+);
+$m->setMulti($items);
+$result = $m->getMulti(array('key1', 'key3', 'badkey'));
+var_dump($result);
+?>
+]]>
+ </programlisting>
+ &example.outputs.similar;
+ <screen>
+<![CDATA[
+array(2) {
+ ["key1"]=>
+ string(6) "value1"
+ ["key3"]=>
+ string(6) "value3"
+}
+]]>
+ </screen>
+ </example>
+ </para>
+
+ <para>
+ <example>
+ <title><function>Memcached::getMulti</function> example for Memcached v1 and \
v2</title> <programlisting role="php">
<![CDATA[
<?php
+// Valid for v1 and v2 of the extension
+
$m = new Memcached();
$m->addServer('localhost', 11211);
@@ -122,12 +150,60 @@
</screen>
</example>
</para>
+
<para>
<example>
- <title><constant>Memcached::GET_PRESERVE_ORDER</constant> example</title>
+ <title><constant>Memcached::GET_PRESERVE_ORDER</constant> example for Memcached \
v3</title> <programlisting role="php">
<![CDATA[
<?php
+// Valid for v3 of the extension
+
+$m = new Memcached();
+$m->addServer('localhost', 11211);
+
+$data = array(
+ 'foo' => 'foo-data',
+ 'bar' => 'bar-data',
+ 'baz' => 'baz-data',
+ 'lol' => 'lol-data',
+ 'kek' => 'kek-data',
+);
+
+$m->setMulti($data, 3600);
+
+$keys = array_keys($data);
+$keys[] = 'zoo';
+$got = $m->getMulti($keys, Memcached::GET_PRESERVE_ORDER);
+
+foreach ($got as $k => $v) {
+ echo "$k $vn";
+}
+?>
+]]>
+ </programlisting>
+ &example.outputs.similar;
+ <screen>
+<![CDATA[
+foo foo-data
+bar bar-data
+baz baz-data
+lol lol-data
+kek kek-data
+zoo
+]]>
+ </screen>
+ </example>
+ </para>
+
+ <para>
+ <example>
+ <title><constant>Memcached::GET_PRESERVE_ORDER</constant> example for Memcached \
v1 and v2</title> + <programlisting role="php">
+<![CDATA[
+<?php
+// Valid for v1 and v2 of the extension
+
$m = new Memcached();
$m->addServer('localhost', 11211);
@@ -166,7 +242,31 @@
</example>
</para>
</refsect1>
-
+
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>3.0.0</entry>
+ <entry>
+ The <parameter role="reference">cas_tokens</parameter> parameter was removed.
+ The <constant>Memcached::GET_EXTENDED</constant> was added and when passed as \
a flag it ensures the CAS tokens to be fetched. + </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="seealso">
&reftitle.seealso;
<para>
@@ -177,7 +277,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=73964
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73964
\
------------------------------------------------------------------
Modified: en/reference/memcached/memcached/get.xml
By: Martin Georgiev on 2017-05-15 06:11:12
===================================================================
--- en/reference/memcached/memcached/get.xml
+++ en/reference/memcached/memcached/get.xml
@@ -13,13 +13,13 @@
<modifier>public</modifier> \
<type>mixed</type><methodname>Memcached::get</methodname> \
<methodparam><type>string</type><parameter>key</parameter></methodparam> \
<methodparam choice="opt"><type>callable</type><parameter>cache_cb</parameter></methodparam>
- <methodparam choice="opt"><type>float</type><parameter \
role="reference">cas_token</parameter></methodparam> + <methodparam \
choice="opt"><type>int</type><parameter>$flags</parameter></methodparam> \
</methodsynopsis> <para>
<function>Memcached::get</function> returns the item that was previously
stored under the <parameter>key</parameter>. If the item is found and
- <parameter>cas_token</parameter> variable is provided, it will contain the
- CAS token value for the item. See
+ for <parameter>flags</parameter> is given \
<constant>Memcached::GET_EXTENDED</constant>, + it will return the CAS token value \
for the item. See <methodname>Memcached::cas</methodname> for how to use CAS tokens. \
<link
linkend="memcached.callbacks">Read-through caching callback</link> may be
specified via <parameter>cache_cb</parameter> parameter.
@@ -49,10 +49,11 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>cas_token</parameter></term>
+ <term><parameter>flags</parameter></term>
<listitem>
<para>
- The variable to store the CAS token in.
+ Flags to control the returned result. When value of \
<constant>Memcached::GET_EXTENDED</constant> + is given will return the CAS \
token. </para>
</listitem>
</varlistentry>
@@ -115,6 +116,29 @@
</example>
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>3.0.0</entry>
+ <entry>
+ The <parameter role="reference">cas_token</parameter> parameter was removed.
+ Instead <parameter>flags</parameter> was added and when it is given the value \
of <constant>Memcached::GET_EXTENDED</constant> it will ensure the CAS token to be \
fetched. + </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73967
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73967
\
------------------------------------------------------------------
Modified: en/reference/memcached/memcached/getbykey.xml
By: Martin Georgiev on 2017-05-15 06:12:43
===================================================================
--- en/reference/memcached/memcached/getbykey.xml
+++ en/reference/memcached/memcached/getbykey.xml
@@ -14,7 +14,7 @@
<methodparam><type>string</type><parameter>server_key</parameter></methodparam>
<methodparam><type>string</type><parameter>key</parameter></methodparam>
<methodparam choice="opt"><type>callable</type><parameter>cache_cb</parameter></methodparam>
- <methodparam choice="opt"><type>float</type><parameter \
role="reference">cas_token</parameter></methodparam> + <methodparam \
choice="opt"><type>int</type><parameter>flags</parameter></methodparam> \
</methodsynopsis> <para>
<function>Memcached::getByKey</function> is functionally equivalent to
@@ -53,10 +53,11 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>cas_token</parameter></term>
+ <term><parameter>flags</parameter></term>
<listitem>
<para>
- The variable to store the CAS token in.
+ Flags to control the returned result. When value of \
<constant>Memcached::GET_EXTENDED</constant> + is given will return the CAS \
token. </para>
</listitem>
</varlistentry>
@@ -72,6 +73,29 @@
<constant>Memcached::RES_NOTFOUND</constant> if the key does not exist.
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>3.0.0</entry>
+ <entry>
+ The <parameter role="reference">cas_token</parameter> parameter was removed.
+ Instead <parameter>flags</parameter> was added and when it is given the value \
of <constant>Memcached::GET_EXTENDED</constant> it will ensure the CAS token to be \
fetched. + </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73968
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73968
\
------------------------------------------------------------------
Modified: en/reference/memcached/memcached/getmultibykey.xml
By: Martin Georgiev on 2017-05-15 06:13:33
===================================================================
--- en/reference/memcached/memcached/getmultibykey.xml
+++ en/reference/memcached/memcached/getmultibykey.xml
@@ -13,7 +13,6 @@
<modifier>public</modifier> \
<type>array</type><methodname>Memcached::getMultiByKey</methodname> \
<methodparam><type>string</type><parameter>server_key</parameter></methodparam> \
<methodparam><type>array</type><parameter>keys</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter \
role="reference">cas_tokens</parameter></methodparam> <methodparam \
choice="opt"><type>int</type><parameter>flags</parameter></methodparam> \
</methodsynopsis> <para>
@@ -45,14 +44,6 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>cas_tokens</parameter></term>
- <listitem>
- <para>
- The variable to store the CAS tokens for the found items.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
<term><parameter>flags</parameter></term>
<listitem>
<para>
@@ -71,6 +62,29 @@
&memcached.result.getresultcode;
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>3.0.0</entry>
+ <entry>
+ The <parameter role="reference">cas_tokens</parameter> parameter was removed.
+ The <constant>Memcached::GET_EXTENDED</constant> was added and when passed as \
a flag it ensures the CAS tokens to be fetched. + </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=73969
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=73969
\
------------------------------------------------------------------
Modified: en/reference/spl/splfixedarray/setsize.xml
By: Jordi Domènech on 2017-06-21 15:13:16
===================================================================
--- en/reference/spl/splfixedarray/setsize.xml
+++ en/reference/spl/splfixedarray/setsize.xml
@@ -9,7 +9,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> \
<type>int</type><methodname>SplFixedArray::setSize</methodname> + \
<modifier>public</modifier> \
<type>bool</type><methodname>SplFixedArray::setSize</methodname> \
<methodparam><type>int</type><parameter>size</parameter></methodparam> \
</methodsynopsis> <para>
@@ -39,7 +39,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- &return.void;
+ &return.success;
</para>
</refsect1>
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74279
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=74279
\
------------------------------------------------------------------
Modified: en/reference/session/sessionhandler.xml
By: Jordi Domènech on 2017-06-24 08:09:16
===================================================================
--- en/reference/session/sessionhandler.xml
+++ en/reference/session/sessionhandler.xml
@@ -32,7 +32,7 @@
<function>session_set_save_handler</function> it will wrap the current save \
handlers.
A class extending from <classname>SessionHandler</classname> allows you to \
override
the methods or intercept or filter them by calls the parent class methods which \
ultimately wrap
- the interal PHP session handlers.
+ the internal PHP session handlers.
</para>
<para>
This allows you, for example, to intercept the <parameter>read</parameter> and \
<parameter>write</parameter>
=> Put this change into your patches : \
https://edit.php.net/?project=php&action=putIntoMyPatches&idDB=74296
=> Delete this change: \
https://edit.php.net/?project=php&action=deleteThisChange&idDB=74296
\
------------------------------------------------------------------
--
https://edit.php.net/
This email is send automatically by the Php Docbook Online Editor.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic