svn: /phpdoc/ru/trunk/ appendices/migration74/incompatible.xml reference/array/functions/array-walk-recursive.xml reference/array/functions/array-walk.xml reference/exif/functions/exif-read-data.xml reference/imagick/imagick/getcopyright.xml reference/imagick/imagick/gethomeurl.xml reference/imagick/imagick/getquantumdepth.xml reference/imagick/imagick/getquantumrange.xml reference/imagick/imagick/getreleasedate.xml reference/imagick/imagick/getresource.xml reference/imagick/imagick/getresourcel
[email protected] (Sergey Panteleev) Sat, 05 Dec 2020 08:59:44 +0000
| Newsgroups | php.doc.ru |
|---|---|
| Message-ID | <[email protected]> |
sergey Sat, 05 Dec 2020 08:59:44 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=351886
Log:
docs(ru): Updated to English revision
Changed paths:
U phpdoc/ru/trunk/appendices/migration74/incompatible.xml
U phpdoc/ru/trunk/reference/array/functions/array-walk-recursive.xml
U phpdoc/ru/trunk/reference/array/functions/array-walk.xml
U phpdoc/ru/trunk/reference/exif/functions/exif-read-data.xml
U phpdoc/ru/trunk/reference/imagick/imagick/getcopyright.xml
U phpdoc/ru/trunk/reference/imagick/imagick/gethomeurl.xml
U phpdoc/ru/trunk/reference/imagick/imagick/getquantumdepth.xml
U phpdoc/ru/trunk/reference/imagick/imagick/getquantumrange.xml
U phpdoc/ru/trunk/reference/imagick/imagick/getreleasedate.xml
U phpdoc/ru/trunk/reference/imagick/imagick/getresource.xml
U phpdoc/ru/trunk/reference/imagick/imagick/getresourcelimit.xml
U phpdoc/ru/trunk/reference/imagick/imagick/getversion.xml
U phpdoc/ru/trunk/reference/info/ini.xml
U phpdoc/ru/trunk/reference/uopz/book.xml
U phpdoc/ru/trunk/reference/var/functions/unserialize.xml
svn-diffs-351886.txt
(text/x-diff, 16.2 KB)
Modified: phpdoc/ru/trunk/appendices/migration74/incompatible.xml
===================================================================
--- phpdoc/ru/trunk/appendices/migration74/incompatible.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/appendices/migration74/incompatible.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 350707 Maintainer: lex Status: ready -->
+<!-- EN-Revision: 351878 Maintainer: lex Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<sect1 xml:id="migration74.incompatible" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -278,7 +278,8 @@
</listitem>
<listitem>
<simpara>
- Вероятно, все остальное работает со свойствами объекта при доступе в виде списка.
+ Вероятно, все остальное работает со свойствами объекта при доступе в виде списка,
+ например, <function>array_walk</function>.
</simpara>
</listitem>
</itemizedlist>
Modified: phpdoc/ru/trunk/reference/array/functions/array-walk-recursive.xml
===================================================================
--- phpdoc/ru/trunk/reference/array/functions/array-walk-recursive.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/array/functions/array-walk-recursive.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350788 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 351878 Maintainer: shein Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<refentry xml:id="function.array-walk-recursive" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>array_walk_recursive</methodname>
- <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+ <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
<methodparam><type>callable</type><parameter>callback</parameter></methodparam>
<methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
Modified: phpdoc/ru/trunk/reference/array/functions/array-walk.xml
===================================================================
--- phpdoc/ru/trunk/reference/array/functions/array-walk.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/array/functions/array-walk.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 350788 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 351878 Maintainer: shein Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<refentry xml:id="function.array-walk" xmlns="http://docbook.org/ns/docbook">
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>array_walk</methodname>
- <methodparam><type>array</type><parameter role="reference">array</parameter></methodparam>
+ <methodparam><type class="union"><type>array</type><type>object</type></type><parameter role="reference">array</parameter></methodparam>
<methodparam><type>callable</type><parameter>callback</parameter></methodparam>
<methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
Modified: phpdoc/ru/trunk/reference/exif/functions/exif-read-data.xml
===================================================================
--- phpdoc/ru/trunk/reference/exif/functions/exif-read-data.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/exif/functions/exif-read-data.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351452 Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 351876 Maintainer: tmn Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<!-- $Revision$ -->
<!-- splitted from ./en/functions/image.xml, last change in rev 1.78 -->
@@ -179,6 +179,16 @@
вернет &false;.
</para>
</refsect1>
+
+ <refsect1 role="errors">
+ &reftitle.errors;
+ <para>
+ Ошибки уровня <constant>E_WARNING</constant> и/или <constant>E_NOTICE</constant>
+ могут возникать для неподдерживаемых тегов или других потенциальных условий ошибки, но функция
+ все равно пытается прочитать всю понятную информацию.
+ </para>
+ </refsect1>
+
<refsect1 role="changelog">
&reftitle.changelog;
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/getcopyright.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/getcopyright.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/getcopyright.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351871 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getcopyright">
<refnamediv>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>string</type><methodname>Imagick::getCopyright</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getCopyright</methodname>
<void/>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/gethomeurl.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/gethomeurl.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/gethomeurl.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351870 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.gethomeurl">
<refnamediv>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>string</type><methodname>Imagick::getHomeURL</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getHomeURL</methodname>
<void/>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/getquantumdepth.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/getquantumdepth.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/getquantumdepth.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351872 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getquantumdepth">
@@ -12,7 +12,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>array</type><methodname>Imagick::getQuantumDepth</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::getQuantumDepth</methodname>
<void/>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/getquantumrange.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/getquantumrange.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/getquantumrange.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351870 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<!-- $Revision$ -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getquantumrange">
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>array</type><methodname>Imagick::getQuantumRange</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::getQuantumRange</methodname>
<void/>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/getreleasedate.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/getreleasedate.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/getreleasedate.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351870 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getreleasedate">
<refnamediv>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>string</type><methodname>Imagick::getReleaseDate</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getReleaseDate</methodname>
<void/>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/getresource.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/getresource.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/getresource.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351870 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getresource">
<refnamediv>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>int</type><methodname>Imagick::getResource</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Imagick::getResource</methodname>
<methodparam><type>int</type><parameter>type</parameter></methodparam>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/getresourcelimit.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/getresourcelimit.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/getresourcelimit.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351870 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<!-- $Revision$ -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getresourcelimit">
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>int</type><methodname>Imagick::getResourceLimit</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Imagick::getResourceLimit</methodname>
<methodparam><type>int</type><parameter>type</parameter></methodparam>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/imagick/imagick/getversion.xml
===================================================================
--- phpdoc/ru/trunk/reference/imagick/imagick/getversion.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/imagick/imagick/getversion.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351852 Maintainer: alien Status: ready -->
+<!-- EN-Revision: 351870 Maintainer: alien Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getversion">
<refnamediv>
@@ -11,7 +11,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>array</type><methodname>Imagick::getVersion</methodname>
+ <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::getVersion</methodname>
<void/>
</methodsynopsis>
<para>
Modified: phpdoc/ru/trunk/reference/info/ini.xml
===================================================================
--- phpdoc/ru/trunk/reference/info/ini.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/info/ini.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351133 Maintainer: tmn Status: ready -->
+<!-- EN-Revision: 351866 Maintainer: tmn Status: ready -->
<!-- Reviewed: yes Maintainer: lex -->
<!-- $Revision$ -->
<section xml:id="info.configuration" xmlns="http://docbook.org/ns/docbook">
@@ -226,7 +226,7 @@
по умолчанию равно <literal>0</literal>.
</para>
<para>
- На максимальное время выполнения не влияют системные вызовы, потоковые
+ В системах, отличных от Windows, на максимальное время выполнения не влияют системные вызовы, потоковые
операции и т.п. За дополнительной информацией обращайтесь к документации к
функции <function>set_time_limit</function>.
</para>
Modified: phpdoc/ru/trunk/reference/uopz/book.xml
===================================================================
--- phpdoc/ru/trunk/reference/uopz/book.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/uopz/book.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 345278 Maintainer: lex Status: ready -->
+<!-- EN-Revision: 351877 Maintainer: lex Status: ready -->
<!-- Reviewed: yes Maintainer: sergey -->
<book xml:id="book.uopz" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -31,6 +31,12 @@
Все поддерживаемые действия совместимы с opcache
</para>
</note>
+ <caution>
+ <simpara>
+ PECL uopz 6.1.1 несовместим с Xdebug >= 2.9.4.
+ Более поздние версии uopz несовместимы с Xdebug < 2.9.4.
+ </simpara>
+ </caution>
</preface>
&reference.uopz.setup;
Modified: phpdoc/ru/trunk/reference/var/functions/unserialize.xml
===================================================================
--- phpdoc/ru/trunk/reference/var/functions/unserialize.xml 2020-12-04 23:25:41 UTC (rev 351885)
+++ phpdoc/ru/trunk/reference/var/functions/unserialize.xml 2020-12-05 08:59:44 UTC (rev 351886)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 351133 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 351869 Maintainer: shein Status: ready -->
<!-- Reviewed: yes -->
<!-- $Revision$ -->
<refentry xml:id="function.unserialize" xmlns="http://docbook.org/ns/docbook">
@@ -129,6 +129,13 @@
</para>
</refsect1>
+ <refsect1 role="errors">
+ &reftitle.errors;
+ <para>
+ Объекты могут выбрасывать <classname>Throwable</classname> в своих обработчиках десериализации.
+ </para>
+ </refsect1>
+
<refsect1 role="changelog">
&reftitle.changelog;
<para>