com doc/ru: Обновлен ие до англи йской верси и: language/predefined/closure/bindto.xml language
/predefined/error/getprevious.xml language/predefined/excep tion/getprevious.xml reference/filesystem/functions/fgetcsv .xml
reference/image/functions/imagegrabwindow.xml refe rence/image/functions/imageinterlace.xml reference/image/fu nctions/imagerotate.xml
reference/mysqli/mysqli/affected-ro ws.xml reference/mysqli/mysqli/autocommit.xml reference /mysqli/mysq
| From: | Sergey Panteleev | Date: | Mon, 22 Mar 2021 06:40:42 +0000 |
| Subject: | com doc/ru: Обновлен ие до англи йской верси и: language/predefined/closure/bindto.xml language /predefined/error/getprevious.xml language/predefined/excep tion/getprevious.xml reference/filesystem/functions/fgetcsv .xml reference/image/functions/imagegrabwindow.xml refe rence/image/functions/imageinterlace.xml reference/image/fu nctions/imagerotate.xml reference/mysqli/mysqli/affected-ro ws.xml reference/mysqli/mysqli/autocommit.xml reference /mysqli/mysq |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8833@lists.php.net to get a copy of this message | ||
Commit: f607e5ec078e21e73f11b4deb865f127c74dadc6
Author: Sergey Panteleev <sergey@php.net> Mon, 22 Mar 2021 09:40:42 +0300
Parents: 9a7db17bcc7e1618e3179f2de030f38f64f8337c
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=f607e5ec078e21e73f11b4deb865f127c74dadc6
Log:
Обновление до английской версии
Changed paths:
M language/predefined/closure/bindto.xml
M language/predefined/error/getprevious.xml
M language/predefined/exception/getprevious.xml
M reference/filesystem/functions/fgetcsv.xml
M reference/image/functions/imagegrabwindow.xml
M reference/image/functions/imageinterlace.xml
M reference/image/functions/imagerotate.xml
M reference/mysqli/mysqli/affected-rows.xml
M reference/mysqli/mysqli/autocommit.xml
M reference/mysqli/mysqli/begin-transaction.xml
diff --git a/language/predefined/closure/bindto.xml b/language/predefined/closure/bindto.xml index 9a26dfedd..146c6ea5d 100644 --- a/language/predefined/closure/bindto.xml +++ b/language/predefined/closure/bindto.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: irker Status: ready --> +<!-- EN-Revision: 661e99fa9ddf0317aa2b70a12e260e0ba8fa3ca9 Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="closure.bindto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Closure::bindTo</refname> @@ -14,7 +13,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>public</modifier> <type class="union"><type>Closure</type><type>false</type></type><methodname>Closure::bindTo</methodname> + <modifier>public</modifier> <type class="union"><type>Closure</type><type>null</type></type><methodname>Closure::bindTo</methodname> <methodparam><type>object</type><parameter>newthis</parameter></methodparam> <methodparam choice="opt"><type>mixed</type><parameter>newscope</parameter> <initializer>"static"</initializer></methodparam> @@ -90,7 +89,7 @@ &reftitle.returnvalues; <para> Возвращает новый объект <classname>Closure</classname> - &return.falseforfailure; + или &null; в случае возникновения ошибки. </para> </refsect1> @@ -142,7 +141,6 @@ echo $cl(), "\n"; </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/language/predefined/error/getprevious.xml b/language/predefined/error/getprevious.xml index 4d1a271d5..afdc00eed 100644 --- a/language/predefined/error/getprevious.xml +++ b/language/predefined/error/getprevious.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: e9366ee458b2900c53a503b1ad97664e1d9a8859 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 6a89105fdc8fc94d843567c3738925289ef3a499 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="error.getprevious" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -11,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>final</modifier> <modifier>public</modifier> <type>Throwable</type><methodname>Error::getPrevious</methodname> + <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>Throwable</type><type>null</type></type> <methodname>Error::getPrevious</methodname> <void /> </methodsynopsis> <para> @@ -85,7 +85,6 @@ try { </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/language/predefined/exception/getprevious.xml b/language/predefined/exception/getprevious.xml index 29f4f2837..bbd6db0ea 100644 --- a/language/predefined/exception/getprevious.xml +++ b/language/predefined/exception/getprevious.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cdaea0421544885f02ff3d36bd203dc01b78299e Maintainer: mch Status: ready --> +<!-- EN-Revision: 6a89105fdc8fc94d843567c3738925289ef3a499 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="exception.getprevious" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Exception::getPrevious</refname> @@ -12,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>final</modifier> <modifier>public</modifier> <type>Throwable</type><methodname>Exception::getPrevious</methodname> + <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>Throwable</type><type>null</type></type> <methodname>Exception::getPrevious</methodname> <void /> </methodsynopsis> <para> @@ -83,7 +82,6 @@ try { </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/filesystem/functions/fgetcsv.xml b/reference/filesystem/functions/fgetcsv.xml index 10c73a8bd..31fbaebf7 100644 --- a/reference/filesystem/functions/fgetcsv.xml +++ b/reference/filesystem/functions/fgetcsv.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: be5b0f33a18415823da76389915b49aae4ee6835 Maintainer: shein Status: ready --> +<!-- EN-Revision: 397f37e9308c5946fe98229711d19c43421aeee6 Maintainer: shein Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fgetcsv"> @@ -12,9 +12,9 @@ &reftitle.description; <methodsynopsis> <type>array</type><methodname>fgetcsv</methodname> - <methodparam><type>resource</type><parameter>handle</parameter></methodparam> + <methodparam><type>resource</type><parameter>stream</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>","</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>separator</parameter><initializer>","</initializer></methodparam> <methodparam choice="opt"><type>string</type><parameter>enclosure</parameter><initializer>'"'</initializer></methodparam> <methodparam choice="opt"><type>string</type><parameter>escape</parameter><initializer>"\\"</initializer></methodparam> </methodsynopsis> @@ -39,7 +39,7 @@ <para> <variablelist> <varlistentry> - <term><parameter>handle</parameter></term> + <term><parameter>stream</parameter></term> <listitem> <para> Корректный файловый указатель на файл, успешно открытый при помощи @@ -64,10 +64,10 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>delimiter</parameter></term> + <term><parameter>separator</parameter></term> <listitem> <para> - Необязательный параметр <parameter>delimiter</parameter> устанавливает + Необязательный параметр <parameter>separator</parameter> устанавливает разделитель поля (только один символ). </para> </listitem> @@ -118,7 +118,7 @@ ¬e.line-endings; <para> <function>fgetcsv</function> возвращает &null;, если передаётся неверный - параметр <parameter>handle</parameter> или &false; при других ошибках, + параметр <parameter>stream</parameter> или &false; при других ошибках, в том числе и при достижении конца файла. </para> </refsect1> @@ -189,7 +189,6 @@ if (($handle = fopen("test.csv", "r")) !== FALSE) { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/image/functions/imagegrabwindow.xml b/reference/image/functions/imagegrabwindow.xml index 381c7ea48..6f9d2d249 100644 --- a/reference/image/functions/imagegrabwindow.xml +++ b/reference/image/functions/imagegrabwindow.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: tmn Status: ready --> +<!-- EN-Revision: 34316e9ecfcffa5ebefe7cd37f5fbd629d50e5f9 Maintainer: tmn Status: ready --> <!-- Reviewed: no --> <!-- $Revision$ --> <refentry xml:id="function.imagegrabwindow" xmlns="http://docbook.org/ns/docbook"> @@ -13,7 +13,7 @@ <methodsynopsis> <type>resource</type><methodname>imagegrabwindow</methodname> <methodparam><type>int</type><parameter>window_handle</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>client_area</parameter><initializer>0</initializer></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>client_area</parameter><initializer>0</initializer></methodparam> </methodsynopsis> <para> Делает снимок окна или его клиентской части, используя windows обработчик @@ -67,6 +67,30 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>client_area</parameter> теперь ожидает + логическое значение (<type>bool</type>); + ранее ожидалось целое число (<type>int</type>). + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> diff --git a/reference/image/functions/imageinterlace.xml b/reference/image/functions/imageinterlace.xml index 3f258af34..815645855 100644 --- a/reference/image/functions/imageinterlace.xml +++ b/reference/image/functions/imageinterlace.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 2f00a6fcf430822f19914ca47ea378651591b1eb Maintainer: tmn Status: ready --> <!-- Reviewed: no --> <!-- $Revision$ --> <refentry xml:id="function.imageinterlace" xmlns="http://docbook.org/ns/docbook"> @@ -10,9 +10,9 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>int</type><methodname>imageinterlace</methodname> + <type>bool</type><methodname>imageinterlace</methodname> <methodparam><type>resource</type><parameter>image</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>interlace</parameter><initializer>0</initializer></methodparam> + <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>enable</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> <function>imageinterlace</function> переключает состояние бита интерлейсинга. @@ -32,8 +32,8 @@ <term><parameter>interlace</parameter></term> <listitem> <para> - Если значение отлично от нуля, изображение будет разбито на чередующиеся - строки, в противном случае бит интерлейсинга будет установлен в 0. + Если значение &true;, изображение будет разбито на чередующиеся + строки, в противном случае бит интерлейсинга будет установлен в &false;. </para> </listitem> </varlistentry> @@ -43,9 +43,43 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Возвращает 1, если бит интерлейсинга установлен, 0 в противном случае. + Возвращает &true;, если бит интерлейсинга установлен, &false; в противном случае. </para> </refsect1> + + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.5</entry> + <entry> + <function>imageinterlace</function> теперь возвращает + логическое значение (<type>bool</type>); + ранее она возвращала целое число (<type>int</type>). + (ненулевое значение для изображений с интерлейсингом, в противном случае - ноль). + </entry> + </row> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>enable</parameter> теперь ожидает + логическое значение (<type>bool</type>); + ранее ожидалось целое число (<type>int</type>). + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -72,7 +106,6 @@ imagedestroy($im); </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/image/functions/imagerotate.xml b/reference/image/functions/imagerotate.xml index 7d5142f75..d9184aedf 100644 --- a/reference/image/functions/imagerotate.xml +++ b/reference/image/functions/imagerotate.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: aur Status: ready --> +<!-- EN-Revision: 34316e9ecfcffa5ebefe7cd37f5fbd629d50e5f9 Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.imagerotate" xmlns="http://docbook.org/ns/docbook"> @@ -14,7 +14,7 @@ <methodparam><type>resource</type><parameter>image</parameter></methodparam> <methodparam><type>float</type><parameter>angle</parameter></methodparam> <methodparam><type>int</type><parameter>bgd_color</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>dummy</parameter><initializer>0</initializer></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>ignore_transparent</parameter><initializer>&false;</initializer></methodparam> </methodsynopsis> <para> Поворот изображения <parameter>image</parameter> на заданный @@ -47,7 +47,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>dummy</parameter></term> + <term><parameter>ignore_transparent</parameter></term> <listitem> <para> Параметр не используется. @@ -64,6 +64,30 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + Неиспользуемый <parameter>v</parameter> теперь ожидает + логическое значение (<type>bool</type>); + ранее ожидалось целое число (<type>int</type>). + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -120,7 +144,6 @@ imagedestroy($rotate); </simplelist> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/affected-rows.xml b/reference/mysqli/mysqli/affected-rows.xml index a9c33890b..fd842516d 100644 --- a/reference/mysqli/mysqli/affected-rows.xml +++ b/reference/mysqli/mysqli/affected-rows.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: f5beedad8a6331fc6d88c5425f21aca35424c60a Maintainer: mch Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: mch Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.affected-rows" xmlns="http://docbook.org/ns/docbook"> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.affected-rows">mysqli->affected_rows</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.affected-rows">mysqli->affected_rows</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>int</type><methodname>mysqli_affected_rows</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_affected_rows</methodname> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает число строк, затронутых последним запросом <literal>INSERT</literal>, @@ -59,7 +59,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->affected_rows</varname></title> + <title>Пример использования <varname>$mysqli->affected_rows</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -162,7 +162,6 @@ mysqli_close($link); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/autocommit.xml b/reference/mysqli/mysqli/autocommit.xml index 1edf52cfe..5a6c3967a 100644 --- a/reference/mysqli/mysqli/autocommit.xml +++ b/reference/mysqli/mysqli/autocommit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.autocommit" xmlns="http://docbook.org/ns/docbook"> @@ -14,13 +14,13 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::autocommit</methodname> - <methodparam><type>bool</type><parameter>mode</parameter></methodparam> + <methodparam><type>bool</type><parameter>enable</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_autocommit</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> - <methodparam><type>bool</type><parameter>mode</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> + <methodparam><type>bool</type><parameter>enable</parameter></methodparam> </methodsynopsis> <para> Включает или отключает режим автоматической фиксации изменений для @@ -38,7 +38,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>mode</parameter></term> + <term><parameter>enable</parameter></term> <listitem> <para> Включает или отключает режим автоматической фиксации изменений. @@ -224,7 +224,6 @@ try { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/begin-transaction.xml b/reference/mysqli/mysqli/begin-transaction.xml index 8c89bf422..c2bd4e471 100644 --- a/reference/mysqli/mysqli/begin-transaction.xml +++ b/reference/mysqli/mysqli/begin-transaction.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> - <refentry xml:id="mysqli.begin-transaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>mysqli::begin_transaction</refname> @@ -16,14 +15,14 @@ <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::begin_transaction</methodname> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para>&style.procedural;:</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_begin_transaction</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> Стартует транзакцию. Требуется InnoDB @@ -96,6 +95,28 @@ </note> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>name</parameter> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <example xml:id="mysqli.begin-transaction.example.basic"> @@ -193,7 +214,6 @@ try { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml
diff --git a/language/predefined/closure/bindto.xml b/language/predefined/closure/bindto.xml index 9a26dfedd..146c6ea5d 100644 --- a/language/predefined/closure/bindto.xml +++ b/language/predefined/closure/bindto.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: irker Status: ready --> +<!-- EN-Revision: 661e99fa9ddf0317aa2b70a12e260e0ba8fa3ca9 Maintainer: irker Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="closure.bindto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Closure::bindTo</refname> @@ -14,7 +13,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>public</modifier> <type class="union"><type>Closure</type><type>false</type></type><methodname>Closure::bindTo</methodname> + <modifier>public</modifier> <type class="union"><type>Closure</type><type>null</type></type><methodname>Closure::bindTo</methodname> <methodparam><type>object</type><parameter>newthis</parameter></methodparam> <methodparam choice="opt"><type>mixed</type><parameter>newscope</parameter> <initializer>"static"</initializer></methodparam> @@ -90,7 +89,7 @@ &reftitle.returnvalues; <para> Возвращает новый объект <classname>Closure</classname> - &return.falseforfailure; + или &null; в случае возникновения ошибки. </para> </refsect1> @@ -142,7 +141,6 @@ echo $cl(), "\n"; </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/language/predefined/error/getprevious.xml b/language/predefined/error/getprevious.xml index 4d1a271d5..afdc00eed 100644 --- a/language/predefined/error/getprevious.xml +++ b/language/predefined/error/getprevious.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: e9366ee458b2900c53a503b1ad97664e1d9a8859 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 6a89105fdc8fc94d843567c3738925289ef3a499 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="error.getprevious" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> @@ -11,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>final</modifier> <modifier>public</modifier> <type>Throwable</type><methodname>Error::getPrevious</methodname> + <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>Throwable</type><type>null</type></type> <methodname>Error::getPrevious</methodname> <void /> </methodsynopsis> <para> @@ -85,7 +85,6 @@ try { </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/language/predefined/exception/getprevious.xml b/language/predefined/exception/getprevious.xml index 29f4f2837..bbd6db0ea 100644 --- a/language/predefined/exception/getprevious.xml +++ b/language/predefined/exception/getprevious.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cdaea0421544885f02ff3d36bd203dc01b78299e Maintainer: mch Status: ready --> +<!-- EN-Revision: 6a89105fdc8fc94d843567c3738925289ef3a499 Maintainer: mch Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> - <refentry xml:id="exception.getprevious" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>Exception::getPrevious</refname> @@ -12,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>final</modifier> <modifier>public</modifier> <type>Throwable</type><methodname>Exception::getPrevious</methodname> + <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>Throwable</type><type>null</type></type> <methodname>Exception::getPrevious</methodname> <void /> </methodsynopsis> <para> @@ -83,7 +82,6 @@ try { </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/filesystem/functions/fgetcsv.xml b/reference/filesystem/functions/fgetcsv.xml index 10c73a8bd..31fbaebf7 100644 --- a/reference/filesystem/functions/fgetcsv.xml +++ b/reference/filesystem/functions/fgetcsv.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: be5b0f33a18415823da76389915b49aae4ee6835 Maintainer: shein Status: ready --> +<!-- EN-Revision: 397f37e9308c5946fe98229711d19c43421aeee6 Maintainer: shein Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fgetcsv"> @@ -12,9 +12,9 @@ &reftitle.description; <methodsynopsis> <type>array</type><methodname>fgetcsv</methodname> - <methodparam><type>resource</type><parameter>handle</parameter></methodparam> + <methodparam><type>resource</type><parameter>stream</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>","</initializer></methodparam> + <methodparam choice="opt"><type>string</type><parameter>separator</parameter><initializer>","</initializer></methodparam> <methodparam choice="opt"><type>string</type><parameter>enclosure</parameter><initializer>'"'</initializer></methodparam> <methodparam choice="opt"><type>string</type><parameter>escape</parameter><initializer>"\\"</initializer></methodparam> </methodsynopsis> @@ -39,7 +39,7 @@ <para> <variablelist> <varlistentry> - <term><parameter>handle</parameter></term> + <term><parameter>stream</parameter></term> <listitem> <para> Корректный файловый указатель на файл, успешно открытый при помощи @@ -64,10 +64,10 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>delimiter</parameter></term> + <term><parameter>separator</parameter></term> <listitem> <para> - Необязательный параметр <parameter>delimiter</parameter> устанавливает + Необязательный параметр <parameter>separator</parameter> устанавливает разделитель поля (только один символ). </para> </listitem> @@ -118,7 +118,7 @@ ¬e.line-endings; <para> <function>fgetcsv</function> возвращает &null;, если передаётся неверный - параметр <parameter>handle</parameter> или &false; при других ошибках, + параметр <parameter>stream</parameter> или &false; при других ошибках, в том числе и при достижении конца файла. </para> </refsect1> @@ -189,7 +189,6 @@ if (($handle = fopen("test.csv", "r")) !== FALSE) { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/image/functions/imagegrabwindow.xml b/reference/image/functions/imagegrabwindow.xml index 381c7ea48..6f9d2d249 100644 --- a/reference/image/functions/imagegrabwindow.xml +++ b/reference/image/functions/imagegrabwindow.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: e41806c30bf6975e452c0d4ce35ab0984c2fa68c Maintainer: tmn Status: ready --> +<!-- EN-Revision: 34316e9ecfcffa5ebefe7cd37f5fbd629d50e5f9 Maintainer: tmn Status: ready --> <!-- Reviewed: no --> <!-- $Revision$ --> <refentry xml:id="function.imagegrabwindow" xmlns="http://docbook.org/ns/docbook"> @@ -13,7 +13,7 @@ <methodsynopsis> <type>resource</type><methodname>imagegrabwindow</methodname> <methodparam><type>int</type><parameter>window_handle</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>client_area</parameter><initializer>0</initializer></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>client_area</parameter><initializer>0</initializer></methodparam> </methodsynopsis> <para> Делает снимок окна или его клиентской части, используя windows обработчик @@ -67,6 +67,30 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>client_area</parameter> теперь ожидает + логическое значение (<type>bool</type>); + ранее ожидалось целое число (<type>int</type>). + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> diff --git a/reference/image/functions/imageinterlace.xml b/reference/image/functions/imageinterlace.xml index 3f258af34..815645855 100644 --- a/reference/image/functions/imageinterlace.xml +++ b/reference/image/functions/imageinterlace.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 96c9d88bad9a7d7d44bfb7f26c226df7ee9ddf26 Maintainer: tmn Status: ready --> +<!-- EN-Revision: 2f00a6fcf430822f19914ca47ea378651591b1eb Maintainer: tmn Status: ready --> <!-- Reviewed: no --> <!-- $Revision$ --> <refentry xml:id="function.imageinterlace" xmlns="http://docbook.org/ns/docbook"> @@ -10,9 +10,9 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <type>int</type><methodname>imageinterlace</methodname> + <type>bool</type><methodname>imageinterlace</methodname> <methodparam><type>resource</type><parameter>image</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>interlace</parameter><initializer>0</initializer></methodparam> + <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>enable</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> <function>imageinterlace</function> переключает состояние бита интерлейсинга. @@ -32,8 +32,8 @@ <term><parameter>interlace</parameter></term> <listitem> <para> - Если значение отлично от нуля, изображение будет разбито на чередующиеся - строки, в противном случае бит интерлейсинга будет установлен в 0. + Если значение &true;, изображение будет разбито на чередующиеся + строки, в противном случае бит интерлейсинга будет установлен в &false;. </para> </listitem> </varlistentry> @@ -43,9 +43,43 @@ <refsect1 role="returnvalues"> &reftitle.returnvalues; <para> - Возвращает 1, если бит интерлейсинга установлен, 0 в противном случае. + Возвращает &true;, если бит интерлейсинга установлен, &false; в противном случае. </para> </refsect1> + + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.5</entry> + <entry> + <function>imageinterlace</function> теперь возвращает + логическое значение (<type>bool</type>); + ранее она возвращала целое число (<type>int</type>). + (ненулевое значение для изображений с интерлейсингом, в противном случае - ноль). + </entry> + </row> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>enable</parameter> теперь ожидает + логическое значение (<type>bool</type>); + ранее ожидалось целое число (<type>int</type>). + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -72,7 +106,6 @@ imagedestroy($im); </para> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/image/functions/imagerotate.xml b/reference/image/functions/imagerotate.xml index 7d5142f75..d9184aedf 100644 --- a/reference/image/functions/imagerotate.xml +++ b/reference/image/functions/imagerotate.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: b95d28e6ec86e4a71e012737d36ebdc1cf009180 Maintainer: aur Status: ready --> +<!-- EN-Revision: 34316e9ecfcffa5ebefe7cd37f5fbd629d50e5f9 Maintainer: aur Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="function.imagerotate" xmlns="http://docbook.org/ns/docbook"> @@ -14,7 +14,7 @@ <methodparam><type>resource</type><parameter>image</parameter></methodparam> <methodparam><type>float</type><parameter>angle</parameter></methodparam> <methodparam><type>int</type><parameter>bgd_color</parameter></methodparam> - <methodparam choice="opt"><type>int</type><parameter>dummy</parameter><initializer>0</initializer></methodparam> + <methodparam choice="opt"><type>bool</type><parameter>ignore_transparent</parameter><initializer>&false;</initializer></methodparam> </methodsynopsis> <para> Поворот изображения <parameter>image</parameter> на заданный @@ -47,7 +47,7 @@ </listitem> </varlistentry> <varlistentry> - <term><parameter>dummy</parameter></term> + <term><parameter>ignore_transparent</parameter></term> <listitem> <para> Параметр не используется. @@ -64,6 +64,30 @@ </para> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + Неиспользуемый <parameter>v</parameter> теперь ожидает + логическое значение (<type>bool</type>); + ранее ожидалось целое число (<type>int</type>). + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <para> @@ -120,7 +144,6 @@ imagedestroy($rotate); </simplelist> </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/affected-rows.xml b/reference/mysqli/mysqli/affected-rows.xml index a9c33890b..fd842516d 100644 --- a/reference/mysqli/mysqli/affected-rows.xml +++ b/reference/mysqli/mysqli/affected-rows.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: f5beedad8a6331fc6d88c5425f21aca35424c60a Maintainer: mch Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: mch Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="mysqli.affected-rows" xmlns="http://docbook.org/ns/docbook"> @@ -12,11 +12,11 @@ <refsect1 role="description"> &reftitle.description; <para>&style.oop;</para> - <fieldsynopsis><type>int</type><varname linkend="mysqli.affected-rows">mysqli->affected_rows</varname></fieldsynopsis> + <fieldsynopsis><type>int</type><varname linkend="mysqli.affected-rows">mysqli->affected_rows</varname></fieldsynopsis> <para>&style.procedural;</para> <methodsynopsis> - <type>int</type><methodname>mysqli_affected_rows</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <type class="union"><type>int</type><type>string</type></type><methodname>mysqli_affected_rows</methodname> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> </methodsynopsis> <para> Возвращает число строк, затронутых последним запросом <literal>INSERT</literal>, @@ -59,7 +59,7 @@ <refsect1 role="examples"> &reftitle.examples; <example> - <title>Пример использования <varname>$mysqli->affected_rows</varname></title> + <title>Пример использования <varname>$mysqli->affected_rows</varname></title> <para>&style.oop;</para> <programlisting role="php"> <![CDATA[ @@ -162,7 +162,6 @@ mysqli_close($link); </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/autocommit.xml b/reference/mysqli/mysqli/autocommit.xml index 1edf52cfe..5a6c3967a 100644 --- a/reference/mysqli/mysqli/autocommit.xml +++ b/reference/mysqli/mysqli/autocommit.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: bfl Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: bfl Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="mysqli.autocommit" xmlns="http://docbook.org/ns/docbook"> @@ -14,13 +14,13 @@ <para>&style.oop;</para> <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::autocommit</methodname> - <methodparam><type>bool</type><parameter>mode</parameter></methodparam> + <methodparam><type>bool</type><parameter>enable</parameter></methodparam> </methodsynopsis> <para>&style.procedural;</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_autocommit</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> - <methodparam><type>bool</type><parameter>mode</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> + <methodparam><type>bool</type><parameter>enable</parameter></methodparam> </methodsynopsis> <para> Включает или отключает режим автоматической фиксации изменений для @@ -38,7 +38,7 @@ <variablelist> &mysqli.link.description; <varlistentry> - <term><parameter>mode</parameter></term> + <term><parameter>enable</parameter></term> <listitem> <para> Включает или отключает режим автоматической фиксации изменений. @@ -224,7 +224,6 @@ try { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml diff --git a/reference/mysqli/mysqli/begin-transaction.xml b/reference/mysqli/mysqli/begin-transaction.xml index 8c89bf422..c2bd4e471 100644 --- a/reference/mysqli/mysqli/begin-transaction.xml +++ b/reference/mysqli/mysqli/begin-transaction.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 3742d36be1e1d0d9249ce7e093f4f05ead85b8e8 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 7e5d0d1bb69180c9de1992edf9613215c975fa57 Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes --> - <refentry xml:id="mysqli.begin-transaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>mysqli::begin_transaction</refname> @@ -16,14 +15,14 @@ <methodsynopsis role="oop"> <modifier>public</modifier> <type>bool</type><methodname>mysqli::begin_transaction</methodname> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para>&style.procedural;:</para> - <methodsynopsis> + <methodsynopsis role="procedural"> <type>bool</type><methodname>mysqli_begin_transaction</methodname> - <methodparam><type>mysqli</type><parameter>link</parameter></methodparam> + <methodparam><type>mysqli</type><parameter>mysql</parameter></methodparam> <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam> - <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam> + <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>name</parameter><initializer>&null;</initializer></methodparam> </methodsynopsis> <para> Стартует транзакцию. Требуется InnoDB @@ -96,6 +95,28 @@ </note> </refsect1> + <refsect1 role="changelog"> + &reftitle.changelog; + <informaltable> + <tgroup cols="2"> + <thead> + <row> + <entry>&Version;</entry> + <entry>&Description;</entry> + </row> + </thead> + <tbody> + <row> + <entry>8.0.0</entry> + <entry> + <parameter>name</parameter> теперь допускает значение null. + </entry> + </row> + </tbody> + </tgroup> + </informaltable> + </refsect1> + <refsect1 role="examples"> &reftitle.examples; <example xml:id="mysqli.begin-transaction.example.basic"> @@ -193,7 +214,6 @@ try { </refsect1> </refentry> - <!-- Keep this comment at the end of the file Local variables: mode: sgml