com doc/ru: Обновлен ие до англи йской верси и: reference/array/functions/array-column.xml refe
rence/ev/evprepare/construct.xml reference/ev/evprepare/cre atestopped.xml reference/ev/evsignal/set.xml reference/ luasandbox/book.xml
reference/luasandbox/setup.xml refe rence/pdo/pdo/construct.xml reference/pdo/pdostatement/bind column.xml reference/pdo/pdostatement/fetch.xml
referen ce/pdo/pdostatement/setfetchmode.xml reference/simplexml/si mplexmlelement/a
| From: | Sergey Panteleev | Date: | Wed, 10 Mar 2021 16:10:34 +0000 |
| Subject: | com doc/ru: Обновлен ие до англи йской верси и: reference/array/functions/array-column.xml refe rence/ev/evprepare/construct.xml reference/ev/evprepare/cre atestopped.xml reference/ev/evsignal/set.xml reference/ luasandbox/book.xml reference/luasandbox/setup.xml refe rence/pdo/pdo/construct.xml reference/pdo/pdostatement/bind column.xml reference/pdo/pdostatement/fetch.xml referen ce/pdo/pdostatement/setfetchmode.xml reference/simplexml/si mplexmlelement/a |
||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-8825@lists.php.net to get a copy of this message | ||
Commit: ce02c81586e96d3edbf0182fbe0f559204f283be
Author: Sergey Panteleev <sergey@php.net> Wed, 10 Mar 2021 19:10:34 +0300
Parents: 04774e3943eda49875f21f637a5f4f5ee26421e7
Branches: master
Link: http://git.php.net/?p=doc/ru.git;a=commitdiff;h=ce02c81586e96d3edbf0182fbe0f559204f283be
Log:
Обновление до английской версии
Changed paths:
M reference/array/functions/array-column.xml
M reference/ev/evprepare/construct.xml
M reference/ev/evprepare/createstopped..xml
M reference/ev/evsignal/set.xml
M reference/luasandbox/book.xml
M reference/luasandbox/setup.xml
M reference/pdo/pdo/construct.xml
M reference/pdo/pdostatement/bindcolumn.xml
M reference/pdo/pdostatement/fetch.xml
M reference/pdo/pdostatement/setfetchmode.xml
M reference/simplexml/simplexmlelement/attributes.xml
diff --git a/reference/array/functions/array-column.xml b/reference/array/functions/array-column.xml index 8c73ba868..fbc8edbf7 100644 --- a/reference/array/functions/array-column.xml +++ b/reference/array/functions/array-column.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cd943f94a013b74df8765ab8e1a620a916a64a85 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 67268fc2685dbe8f8928571c1da4571ff4e1b6cb Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="function.array-column" xmlns="http://docbook.org/ns/docbook"> @@ -57,7 +57,7 @@ возвращаемого массива. Может быть как целочисленным ключом, так и строковым. Тип значения <link linkend="language.types.array.key-casts">приводится</link>, - как обычно для ключей массива (однако, объекты, поддерживающие + как обычно для ключей массива (однако до PHP 8.0.0 объекты, поддерживающие преобразование к строке также разрешены). </para> </listitem> @@ -84,6 +84,13 @@ </thead> <tbody> <row> + <entry>8.0.0</entry> + <entry> + Объекты в столбцах, обозначенные параметром <parameter>index_key</parameter>, + больше не будут преобразованы в строку и вместо этого будут выдавать <classname>TypeError</classname>. + </entry> + </row> + <row> <entry>7.0.0</entry> <entry> Добавлена возможность использовать массив объектов в <parameter>array</parameter>. diff --git a/reference/ev/evprepare/construct.xml b/reference/ev/evprepare/construct.xml index e5bc25b78..74e60bf37 100644 --- a/reference/ev/evprepare/construct.xml +++ b/reference/ev/evprepare/construct.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 8d666e819852f6b0561b40fcf8689b747568865c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 8b82a7e7627d2e197b283bd03933a6b60e18bea9 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="evprepare.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>EvPrepare::__construct</refname> diff --git a/reference/ev/evprepare/createstopped.xml b/reference/ev/evprepare/createstopped.xml index d9261a67c..a6d75659a 100644 --- a/reference/ev/evprepare/createstopped.xml +++ b/reference/ev/evprepare/createstopped.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 8d666e819852f6b0561b40fcf8689b747568865c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: da1f814030f9d4f11ae57608add98e51b558b881 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="evprepare.createstopped" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>EvPrepare::createStopped</refname> diff --git a/reference/ev/evsignal/set.xml b/reference/ev/evsignal/set.xml index 80bdfd4da..3dc62d437 100644 --- a/reference/ev/evsignal/set.xml +++ b/reference/ev/evsignal/set.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 8d666e819852f6b0561b40fcf8689b747568865c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 8b82a7e7627d2e197b283bd03933a6b60e18bea9 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="evsignal.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>EvSignal::set</refname> diff --git a/reference/luasandbox/book.xml b/reference/luasandbox/book.xml index edd54ba33..cb2b02886 100644 --- a/reference/luasandbox/book.xml +++ b/reference/luasandbox/book.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 990521c9ca64fe7d83016a613b850177d3a90776 Maintainer: sergey Status: ready --> +<!-- EN-Revision: 5145d40353d9b62e83ca21cbdd6f9ae98e903807 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> <book xml:id="book.luasandbox" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>LuaSandbox</title> @@ -9,7 +9,7 @@ <preface xml:id="intro.luasandbox"> &reftitle.intro; <para> - LuaSandbox - это модуль для PHP 5, PHP 7 и HHVM, позволяющий безопасно + LuaSandbox - это модуль для PHP 7 и PHP 8, позволяющий безопасно запускать ненадёжный код Lua 5.1 из PHP. </para> <para> diff --git a/reference/luasandbox/setup.xml b/reference/luasandbox/setup.xml index 19123229b..2d0801367 100644 --- a/reference/luasandbox/setup.xml +++ b/reference/luasandbox/setup.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 990521c9ca64fe7d83016a613b850177d3a90776 Maintainer: sergey Status: ready --> +<!-- EN-Revision: 5145d40353d9b62e83ca21cbdd6f9ae98e903807 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> <chapter xml:id="luasandbox.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.setup; @@ -34,7 +34,7 @@ <link xlink:href="&url.pecl.package;luasandbox">&url.pecl.package;luasandbox</link>. </para> <para> - Если операционная система - Debian 9 и новее или Ubuntu 18.04 и новее, то + Если операционная система - Debian 10 и новее или Ubuntu 18.04 и новее, то LuaSandbox обычно следует устанавливать из пакета <literal>php-luasandbox</literal>: <screen> @@ -43,15 +43,6 @@ sudo apt-get install php-luasandbox ]]> </screen> </para> - <para> - Пользователям Debian 9 может потребоваться добавить - <screen> -<![CDATA[ -deb http://ftp.debian.org/debian stretch-backports main -]]> - </screen> - в их <link xlink:href="https://manpages.debian.org/stretch/apt/sources.list.5.en.html">sources.list</link>. - </para> </section> <section xml:id="luasandbox.configuration"> diff --git a/reference/pdo/pdo/construct.xml b/reference/pdo/pdo/construct.xml index bd7feabb8..b406c49e0 100644 --- a/reference/pdo/pdo/construct.xml +++ b/reference/pdo/pdo/construct.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 7f569e1f175adf1fbd0e462eba8d6bc82214c939 Maintainer: mch Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: mch Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="pdo.construct" xmlns="http://docbook.org/ns/docbook"> @@ -120,7 +120,8 @@ &reftitle.errors; <para> <function>PDO::__construct</function> выбрасывает исключение <classname>PDOException</classname>, если попытка - подключения к запрашиваемой базе данных завершается с ошибкой. + подключения к запрашиваемой базе данных завершается с ошибкой, независимо от того, + какой <constant>PDO::ATTR_ERRMODE</constant> установлен в данный момент. </para> </refsect1> @@ -136,11 +137,7 @@ $dsn = 'mysql:dbname=testdb;host=127.0.0.1'; $user = 'dbuser'; $password = 'dbpass'; -try { - $dbh = new PDO($dsn, $user, $password); -} catch (PDOException $e) { - echo 'Подключение не удалось: ' . $e->getMessage(); -} +$dbh = new PDO($dsn, $user, $password); ?> ]]> @@ -171,11 +168,7 @@ $dsn = 'uri:file:///usr/local/dbconnect'; $user = ''; $password = ''; -try { - $dbh = new PDO($dsn, $user, $password); -} catch (PDOException $e) { - echo 'Подключение не удалось: ' . $e->getMessage(); -} +$dbh = new PDO($dsn, $user, $password); ?> ]]> @@ -199,11 +192,7 @@ $dsn = 'mydb'; $user = ''; $password = ''; -try { - $dbh = new PDO($dsn, $user, $password); -} catch (PDOException $e) { - echo 'Подключение не удалось: ' . $e->getMessage(); -} +$dbh = new PDO($dsn, $user, $password); ?> ]]> diff --git a/reference/pdo/pdostatement/bindcolumn.xml b/reference/pdo/pdostatement/bindcolumn.xml index 2f237ed8f..aa34662ec 100644 --- a/reference/pdo/pdostatement/bindcolumn.xml +++ b/reference/pdo/pdostatement/bindcolumn.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 14af302c9c0e561fa6f9cdd956268758ba9a89c5 Maintainer: tmn Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="pdostatement.bindcolumn" xmlns="http://docbook.org/ns/docbook"> @@ -118,31 +118,20 @@ <programlisting role="php"> <![CDATA[ <?php -function readData($dbh) { - $sql = 'SELECT name, colour, calories FROM fruit'; - try { - $stmt = $dbh->prepare($sql); - $stmt->execute(); +$stmt = $dbh->prepare('SELECT name, colour, calories FROM fruit'); +$stmt->execute(); - /* Связывание по номеру столбца */ - $stmt->bindColumn(1, $name); - $stmt->bindColumn(2, $colour); +/* Bind by column number */ +$stmt->bindColumn(1, $name); +$stmt->bindColumn(2, $colour); - /* Связывание по имени столбца */ - $stmt->bindColumn('calories', $cals); +/* Bind by column name */ +$stmt->bindColumn('calories', $cals); - while ($row = $stmt->fetch(PDO::FETCH_BOUND)) { - $data = $name . "\t" . $colour . "\t" . $cals . "\n"; - print $data; - } - } - catch (PDOException $e) { - print $e->getMessage(); - } +while ($stmt->fetch(PDO::FETCH_BOUND)) { + print $name . "\t" . $colour . "\t" . $cals . "\n"; } -readData($dbh); -?> - ]]> +]]> </programlisting> &example.outputs; <screen> diff --git a/reference/pdo/pdostatement/fetch.xml b/reference/pdo/pdostatement/fetch.xml index f017411af..d3a25f1b6 100644 --- a/reference/pdo/pdostatement/fetch.xml +++ b/reference/pdo/pdostatement/fetch.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: e440c79af15cf829549736b2a292b5f8f6887142 Maintainer: tmn Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: tmn Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="pdostatement.fetch" xmlns="http://docbook.org/ns/docbook"> @@ -216,35 +216,23 @@ kiwi <![CDATA[ <?php function readDataForwards($dbh) { - $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY BET'; - try { + $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY BET'; $stmt = $dbh->prepare($sql, array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL)); $stmt->execute(); while ($row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_NEXT)) { - $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; - print $data; + $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; + print $data; } - $stmt = null; - } - catch (PDOException $e) { - print $e->getMessage(); - } } function readDataBackwards($dbh) { - $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY bet'; - try { + $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY bet'; $stmt = $dbh->prepare($sql, array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL)); $stmt->execute(); $row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_LAST); do { - $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; - print $data; + $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; + print $data; } while ($row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_PRIOR)); - $stmt = null; - } - catch (PDOException $e) { - print $e->getMessage(); - } } print "Читаем в прямой последовательности:\n"; diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml index 88a90ea65..b76314d50 100644 --- a/reference/pdo/pdostatement/setfetchmode.xml +++ b/reference/pdo/pdostatement/setfetchmode.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 9267d8b70e8fa541c5d464e56f94fef7b1b1a849 Maintainer: tmn Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="pdostatement.setfetchmode" xmlns="http://docbook.org/ns/docbook"> @@ -105,18 +105,11 @@ <programlisting role="php"> <![CDATA[ <?php -$sql = 'SELECT name, colour, calories FROM fruit'; -try { - $stmt = $dbh->query($sql); - $result = $stmt->setFetchMode(PDO::FETCH_NUM); - while ($row = $stmt->fetch()) { +$stmt = $dbh->query('SELECT name, colour, calories FROM fruit'); +$stmt->setFetchMode(PDO::FETCH_NUM); +foreach ($stmt as $row) { print $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; - } } -catch (PDOException $e) { - print $e->getMessage(); -} -?> ]]> </programlisting> &example.outputs; @@ -128,7 +121,6 @@ orange orange 300 kiwi brown 75 lemon yellow 25 pear green 150 -watermelon pink 90 ]]> </screen> </example> diff --git a/reference/simplexml/simplexmlelement/attributes.xml b/reference/simplexml/simplexmlelement/attributes.xml index f9a16aa09..f8179e48a 100644 --- a/reference/simplexml/simplexmlelement/attributes.xml +++ b/reference/simplexml/simplexmlelement/attributes.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cd38bc2a916cbf9687c52f8b4af371cae8a182e4 Maintainer: mch Status: ready --> +<!-- EN-Revision: 793c9fc579641578ad0c13dddc8d222ed6ff5280 Maintainer: mch Status: ready --> <!-- $Revision$ --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="simplexmlelement.attributes" xmlns="http://docbook.org/ns/docbook"> @@ -11,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>public</modifier> <type>SimpleXMLElement</type><methodname>SimpleXMLElement::attributes</methodname> + <modifier>public</modifier> <type class="union"><type>SimpleXMLElement</type><type>null</type></type><methodname>SimpleXMLElement::attributes</methodname> <methodparam choice="opt"><type>string</type><parameter>ns</parameter><initializer>&null;</initializer></methodparam> <methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam> </methodsynopsis>
diff --git a/reference/array/functions/array-column.xml b/reference/array/functions/array-column.xml index 8c73ba868..fbc8edbf7 100644 --- a/reference/array/functions/array-column.xml +++ b/reference/array/functions/array-column.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cd943f94a013b74df8765ab8e1a620a916a64a85 Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 67268fc2685dbe8f8928571c1da4571ff4e1b6cb Maintainer: rjhdby Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="function.array-column" xmlns="http://docbook.org/ns/docbook"> @@ -57,7 +57,7 @@ возвращаемого массива. Может быть как целочисленным ключом, так и строковым. Тип значения <link linkend="language.types.array.key-casts">приводится</link>, - как обычно для ключей массива (однако, объекты, поддерживающие + как обычно для ключей массива (однако до PHP 8.0.0 объекты, поддерживающие преобразование к строке также разрешены). </para> </listitem> @@ -84,6 +84,13 @@ </thead> <tbody> <row> + <entry>8.0.0</entry> + <entry> + Объекты в столбцах, обозначенные параметром <parameter>index_key</parameter>, + больше не будут преобразованы в строку и вместо этого будут выдавать <classname>TypeError</classname>. + </entry> + </row> + <row> <entry>7.0.0</entry> <entry> Добавлена возможность использовать массив объектов в <parameter>array</parameter>. diff --git a/reference/ev/evprepare/construct.xml b/reference/ev/evprepare/construct.xml index e5bc25b78..74e60bf37 100644 --- a/reference/ev/evprepare/construct.xml +++ b/reference/ev/evprepare/construct.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 8d666e819852f6b0561b40fcf8689b747568865c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 8b82a7e7627d2e197b283bd03933a6b60e18bea9 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="evprepare.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>EvPrepare::__construct</refname> diff --git a/reference/ev/evprepare/createstopped.xml b/reference/ev/evprepare/createstopped.xml index d9261a67c..a6d75659a 100644 --- a/reference/ev/evprepare/createstopped.xml +++ b/reference/ev/evprepare/createstopped.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 8d666e819852f6b0561b40fcf8689b747568865c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: da1f814030f9d4f11ae57608add98e51b558b881 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="evprepare.createstopped" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>EvPrepare::createStopped</refname> diff --git a/reference/ev/evsignal/set.xml b/reference/ev/evsignal/set.xml index 80bdfd4da..3dc62d437 100644 --- a/reference/ev/evsignal/set.xml +++ b/reference/ev/evsignal/set.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 8d666e819852f6b0561b40fcf8689b747568865c Maintainer: rjhdby Status: ready --> +<!-- EN-Revision: 8b82a7e7627d2e197b283bd03933a6b60e18bea9 Maintainer: rjhdby Status: ready --> <!-- Reviewed: no --> - <refentry xml:id="evsignal.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> <refname>EvSignal::set</refname> diff --git a/reference/luasandbox/book.xml b/reference/luasandbox/book.xml index edd54ba33..cb2b02886 100644 --- a/reference/luasandbox/book.xml +++ b/reference/luasandbox/book.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 990521c9ca64fe7d83016a613b850177d3a90776 Maintainer: sergey Status: ready --> +<!-- EN-Revision: 5145d40353d9b62e83ca21cbdd6f9ae98e903807 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> <book xml:id="book.luasandbox" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>LuaSandbox</title> @@ -9,7 +9,7 @@ <preface xml:id="intro.luasandbox"> &reftitle.intro; <para> - LuaSandbox - это модуль для PHP 5, PHP 7 и HHVM, позволяющий безопасно + LuaSandbox - это модуль для PHP 7 и PHP 8, позволяющий безопасно запускать ненадёжный код Lua 5.1 из PHP. </para> <para> diff --git a/reference/luasandbox/setup.xml b/reference/luasandbox/setup.xml index 19123229b..2d0801367 100644 --- a/reference/luasandbox/setup.xml +++ b/reference/luasandbox/setup.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- $Revision$ --> -<!-- EN-Revision: 990521c9ca64fe7d83016a613b850177d3a90776 Maintainer: sergey Status: ready --> +<!-- EN-Revision: 5145d40353d9b62e83ca21cbdd6f9ae98e903807 Maintainer: sergey Status: ready --> <!-- Reviewed: no --> <chapter xml:id="luasandbox.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.setup; @@ -34,7 +34,7 @@ <link xlink:href="&url.pecl.package;luasandbox">&url.pecl.package;luasandbox</link>. </para> <para> - Если операционная система - Debian 9 и новее или Ubuntu 18.04 и новее, то + Если операционная система - Debian 10 и новее или Ubuntu 18.04 и новее, то LuaSandbox обычно следует устанавливать из пакета <literal>php-luasandbox</literal>: <screen> @@ -43,15 +43,6 @@ sudo apt-get install php-luasandbox ]]> </screen> </para> - <para> - Пользователям Debian 9 может потребоваться добавить - <screen> -<![CDATA[ -deb http://ftp.debian.org/debian stretch-backports main -]]> - </screen> - в их <link xlink:href="https://manpages.debian.org/stretch/apt/sources.list.5.en.html">sources.list</link>. - </para> </section> <section xml:id="luasandbox.configuration"> diff --git a/reference/pdo/pdo/construct.xml b/reference/pdo/pdo/construct.xml index bd7feabb8..b406c49e0 100644 --- a/reference/pdo/pdo/construct.xml +++ b/reference/pdo/pdo/construct.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 7f569e1f175adf1fbd0e462eba8d6bc82214c939 Maintainer: mch Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: mch Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="pdo.construct" xmlns="http://docbook.org/ns/docbook"> @@ -120,7 +120,8 @@ &reftitle.errors; <para> <function>PDO::__construct</function> выбрасывает исключение <classname>PDOException</classname>, если попытка - подключения к запрашиваемой базе данных завершается с ошибкой. + подключения к запрашиваемой базе данных завершается с ошибкой, независимо от того, + какой <constant>PDO::ATTR_ERRMODE</constant> установлен в данный момент. </para> </refsect1> @@ -136,11 +137,7 @@ $dsn = 'mysql:dbname=testdb;host=127.0.0.1'; $user = 'dbuser'; $password = 'dbpass'; -try { - $dbh = new PDO($dsn, $user, $password); -} catch (PDOException $e) { - echo 'Подключение не удалось: ' . $e->getMessage(); -} +$dbh = new PDO($dsn, $user, $password); ?> ]]> @@ -171,11 +168,7 @@ $dsn = 'uri:file:///usr/local/dbconnect'; $user = ''; $password = ''; -try { - $dbh = new PDO($dsn, $user, $password); -} catch (PDOException $e) { - echo 'Подключение не удалось: ' . $e->getMessage(); -} +$dbh = new PDO($dsn, $user, $password); ?> ]]> @@ -199,11 +192,7 @@ $dsn = 'mydb'; $user = ''; $password = ''; -try { - $dbh = new PDO($dsn, $user, $password); -} catch (PDOException $e) { - echo 'Подключение не удалось: ' . $e->getMessage(); -} +$dbh = new PDO($dsn, $user, $password); ?> ]]> diff --git a/reference/pdo/pdostatement/bindcolumn.xml b/reference/pdo/pdostatement/bindcolumn.xml index 2f237ed8f..aa34662ec 100644 --- a/reference/pdo/pdostatement/bindcolumn.xml +++ b/reference/pdo/pdostatement/bindcolumn.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 14af302c9c0e561fa6f9cdd956268758ba9a89c5 Maintainer: tmn Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="pdostatement.bindcolumn" xmlns="http://docbook.org/ns/docbook"> @@ -118,31 +118,20 @@ <programlisting role="php"> <![CDATA[ <?php -function readData($dbh) { - $sql = 'SELECT name, colour, calories FROM fruit'; - try { - $stmt = $dbh->prepare($sql); - $stmt->execute(); +$stmt = $dbh->prepare('SELECT name, colour, calories FROM fruit'); +$stmt->execute(); - /* Связывание по номеру столбца */ - $stmt->bindColumn(1, $name); - $stmt->bindColumn(2, $colour); +/* Bind by column number */ +$stmt->bindColumn(1, $name); +$stmt->bindColumn(2, $colour); - /* Связывание по имени столбца */ - $stmt->bindColumn('calories', $cals); +/* Bind by column name */ +$stmt->bindColumn('calories', $cals); - while ($row = $stmt->fetch(PDO::FETCH_BOUND)) { - $data = $name . "\t" . $colour . "\t" . $cals . "\n"; - print $data; - } - } - catch (PDOException $e) { - print $e->getMessage(); - } +while ($stmt->fetch(PDO::FETCH_BOUND)) { + print $name . "\t" . $colour . "\t" . $cals . "\n"; } -readData($dbh); -?> - ]]> +]]> </programlisting> &example.outputs; <screen> diff --git a/reference/pdo/pdostatement/fetch.xml b/reference/pdo/pdostatement/fetch.xml index f017411af..d3a25f1b6 100644 --- a/reference/pdo/pdostatement/fetch.xml +++ b/reference/pdo/pdostatement/fetch.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: e440c79af15cf829549736b2a292b5f8f6887142 Maintainer: tmn Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: tmn Status: ready --> <!-- Reviewed: yes --> <!-- $Revision$ --> <refentry xml:id="pdostatement.fetch" xmlns="http://docbook.org/ns/docbook"> @@ -216,35 +216,23 @@ kiwi <![CDATA[ <?php function readDataForwards($dbh) { - $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY BET'; - try { + $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY BET'; $stmt = $dbh->prepare($sql, array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL)); $stmt->execute(); while ($row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_NEXT)) { - $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; - print $data; + $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; + print $data; } - $stmt = null; - } - catch (PDOException $e) { - print $e->getMessage(); - } } function readDataBackwards($dbh) { - $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY bet'; - try { + $sql = 'SELECT hand, won, bet FROM mynumbers ORDER BY bet'; $stmt = $dbh->prepare($sql, array(PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL)); $stmt->execute(); $row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_LAST); do { - $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; - print $data; + $data = $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; + print $data; } while ($row = $stmt->fetch(PDO::FETCH_NUM, PDO::FETCH_ORI_PRIOR)); - $stmt = null; - } - catch (PDOException $e) { - print $e->getMessage(); - } } print "Читаем в прямой последовательности:\n"; diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml index 88a90ea65..b76314d50 100644 --- a/reference/pdo/pdostatement/setfetchmode.xml +++ b/reference/pdo/pdostatement/setfetchmode.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: 9267d8b70e8fa541c5d464e56f94fef7b1b1a849 Maintainer: tmn Status: ready --> +<!-- EN-Revision: a3a310ccc23af2710c307fb4c6535b123ae2223c Maintainer: tmn Status: ready --> <!-- Reviewed: yes Maintainer: lex --> <!-- $Revision$ --> <refentry xml:id="pdostatement.setfetchmode" xmlns="http://docbook.org/ns/docbook"> @@ -105,18 +105,11 @@ <programlisting role="php"> <![CDATA[ <?php -$sql = 'SELECT name, colour, calories FROM fruit'; -try { - $stmt = $dbh->query($sql); - $result = $stmt->setFetchMode(PDO::FETCH_NUM); - while ($row = $stmt->fetch()) { +$stmt = $dbh->query('SELECT name, colour, calories FROM fruit'); +$stmt->setFetchMode(PDO::FETCH_NUM); +foreach ($stmt as $row) { print $row[0] . "\t" . $row[1] . "\t" . $row[2] . "\n"; - } } -catch (PDOException $e) { - print $e->getMessage(); -} -?> ]]> </programlisting> &example.outputs; @@ -128,7 +121,6 @@ orange orange 300 kiwi brown 75 lemon yellow 25 pear green 150 -watermelon pink 90 ]]> </screen> </example> diff --git a/reference/simplexml/simplexmlelement/attributes.xml b/reference/simplexml/simplexmlelement/attributes.xml index f9a16aa09..f8179e48a 100644 --- a/reference/simplexml/simplexmlelement/attributes.xml +++ b/reference/simplexml/simplexmlelement/attributes.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- EN-Revision: cd38bc2a916cbf9687c52f8b4af371cae8a182e4 Maintainer: mch Status: ready --> +<!-- EN-Revision: 793c9fc579641578ad0c13dddc8d222ed6ff5280 Maintainer: mch Status: ready --> <!-- $Revision$ --> <!-- Reviewed: yes Maintainer: lex --> <refentry xml:id="simplexmlelement.attributes" xmlns="http://docbook.org/ns/docbook"> @@ -11,7 +11,7 @@ <refsect1 role="description"> &reftitle.description; <methodsynopsis> - <modifier>public</modifier> <type>SimpleXMLElement</type><methodname>SimpleXMLElement::attributes</methodname> + <modifier>public</modifier> <type class="union"><type>SimpleXMLElement</type><type>null</type></type><methodname>SimpleXMLElement::attributes</methodname> <methodparam choice="opt"><type>string</type><parameter>ns</parameter><initializer>&null;</initializer></methodparam> <methodparam choice="opt"><type>bool</type><parameter>is_prefix</parameter><initializer>&false;</initializer></methodparam> </methodsynopsis>