docs(ru): Updated to English revision

git-svn-id: https://svn.php.net/repository/phpdoc/ru/trunk@349908 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Sergey Panteleev
2020-05-18 05:05:03 +00:00
parent b2c56a98e9
commit fcc7ffa54c
5 changed files with 79 additions and 27 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ --> <!-- $Revision$ -->
<!-- EN-Revision: b9271c0d58c90c9359444348192c7c3f7d9e178f Maintainer: rjhdby Status: ready --> <!-- EN-Revision: 78aa9e47fa0d18686db103a4362f41855b3b0511 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: yes Maintainer: lex --> <!-- Reviewed: yes Maintainer: lex -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openssl-random-pseudo-bytes"> <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openssl-random-pseudo-bytes">
@ -67,7 +67,7 @@
<programlisting role="php"> <programlisting role="php">
<![CDATA[ <![CDATA[
<?php <?php
for ($i = -1; $i <= 4; $i++) { for ($i = 1; $i <= 4; $i++) {
$bytes = openssl_random_pseudo_bytes($i, $cstrong); $bytes = openssl_random_pseudo_bytes($i, $cstrong);
$hex = bin2hex($bytes); $hex = bin2hex($bytes);
@ -82,14 +82,6 @@ for ($i = -1; $i <= 4; $i++) {
&example.outputs.similar; &example.outputs.similar;
<screen> <screen>
<![CDATA[ <![CDATA[
Lengths: Bytes: -1 and Hex: 0
string(0) ""
NULL
Lengths: Bytes: 0 and Hex: 0
string(0) ""
NULL
Lengths: Bytes: 1 and Hex: 2 Lengths: Bytes: 1 and Hex: 2
string(2) "42" string(2) "42"
bool(true) bool(true)

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ --> <!-- $Revision$ -->
<!-- EN-Revision: b21947c4f739fc2cf52da1f0e7c0c33e97581121 Maintainer: rjhdby Status: ready --> <!-- EN-Revision: c9596f7576ae7b476b9592522320f0f53ce1c0c0 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: yes --> <!-- Reviewed: yes -->
<appendix xml:id="password.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <appendix xml:id="password.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@ -12,7 +12,7 @@
<varlistentry xml:id="constant.password-bcrypt"> <varlistentry xml:id="constant.password-bcrypt">
<term> <term>
<constant>PASSWORD_BCRYPT</constant> <constant>PASSWORD_BCRYPT</constant>
(<type>integer</type>) (<type>string</type>)
</term> </term>
<listitem> <listitem>
<para> <para>
@ -57,7 +57,7 @@
<varlistentry xml:id="constant.password-argon2i"> <varlistentry xml:id="constant.password-argon2i">
<term> <term>
<constant>PASSWORD_ARGON2I</constant> <constant>PASSWORD_ARGON2I</constant>
(<type>integer</type>) (<type>string</type>)
</term> </term>
<listitem> <listitem>
<para> <para>
@ -98,17 +98,17 @@
<varlistentry xml:id="constant.password-argon2id"> <varlistentry xml:id="constant.password-argon2id">
<term> <term>
<constant>PASSWORD_ARGON2ID</constant> <constant>PASSWORD_ARGON2ID</constant>
(<type>integer</type>) (<type>string</type>)
</term> </term>
<listitem> <listitem>
<para> <para>
<constant>PASSWORD_ARGON2ID</constant> используется для создания хешей паролей <constant>PASSWORD_ARGON2ID</constant> используется для создания хешей паролей
с помощью алгоритма Argon2id. Поддерживаются те же опции, что и для с помощью алгоритма Argon2id. Поддерживаются те же опции, что и для
<link linkend="constant.password-argon2i"><constant>PASSWORD_ARGON2I</constant></link>. <link linkend="constant.password-argon2i"><constant>PASSWORD_ARGON2I</constant></link>.
</para> </para>
<para> <para>
Доступно с PHP 7.3.0. Доступно с PHP 7.3.0.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry xml:id="constant.password-argon2-default-memory-cost"> <varlistentry xml:id="constant.password-argon2-default-memory-cost">
@ -157,7 +157,7 @@
<varlistentry xml:id="constant.password-default"> <varlistentry xml:id="constant.password-default">
<term> <term>
<constant>PASSWORD_DEFAULT</constant> <constant>PASSWORD_DEFAULT</constant>
(<type>integer</type>) (<type>mixed</type>)
</term> </term>
<listitem> <listitem>
<para> <para>
@ -184,6 +184,33 @@
</varlistentry> </varlistentry>
</variablelist> </variablelist>
</para> </para>
<formalpara>
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>7.4.0</entry>
<entry>
Значения идентификаторов алгоритма пароля (<constant>PASSWORD_BCRYPT</constant>, <constant>PASSWORD_ARGON2I</constant>,
<constant>PASSWORD_ARGON2ID</constant> и <constant>PASSWORD_DEFAULT</constant>) теперь являются строками (&string;).
Ранее они были числами (&integer;).
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</formalpara>
</appendix> </appendix>
<!-- Keep this comment at the end of the file <!-- Keep this comment at the end of the file

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ --> <!-- $Revision$ -->
<!-- EN-Revision: 0b7542c9e336ff5d7731d5f808aed628d5a8b96d Maintainer: rjhdby Status: ready --> <!-- EN-Revision: c9596f7576ae7b476b9592522320f0f53ce1c0c0 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: yes --> <!-- Reviewed: yes -->
<refentry xml:id="function.password-hash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refentry xml:id="function.password-hash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@ -14,7 +14,7 @@
<methodsynopsis> <methodsynopsis>
<type>string</type><methodname>password_hash</methodname> <type>string</type><methodname>password_hash</methodname>
<methodparam><type>string</type><parameter>password</parameter></methodparam> <methodparam><type>string</type><parameter>password</parameter></methodparam>
<methodparam><type>int</type><parameter>algo</parameter></methodparam> <methodparam><type>mixed</type><parameter>algo</parameter></methodparam>
<methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
</methodsynopsis> </methodsynopsis>
<para> <para>
@ -357,6 +357,13 @@ echo 'Хеш Argon2i: ' . password_hash('rasmuslerdorf', PASSWORD_ARGON2I);
</row> </row>
</thead> </thead>
<tbody> <tbody>
<row>
<entry>7.4.0</entry>
<entry>
Параметр <parameter>algo</parameter> сейчас ожидает строку (&string;), но все еще принимает
число (&integer;) для обратной совместимости.
</entry>
</row>
<row> <row>
<entry>7.3.0</entry> <entry>7.3.0</entry>
<entry> <entry>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ --> <!-- $Revision$ -->
<!-- EN-Revision: be295015d068095fc92880baef4e47038646adbd Maintainer: rjhdby Status: ready --> <!-- EN-Revision: c9596f7576ae7b476b9592522320f0f53ce1c0c0 Maintainer: rjhdby Status: ready -->
<!-- Reviewed: yes --> <!-- Reviewed: yes -->
<refentry xml:id="function.password-needs-rehash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refentry xml:id="function.password-needs-rehash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@ -14,7 +14,7 @@
<methodsynopsis> <methodsynopsis>
<type>bool</type><methodname>password_needs_rehash</methodname> <type>bool</type><methodname>password_needs_rehash</methodname>
<methodparam><type>string</type><parameter>hash</parameter></methodparam> <methodparam><type>string</type><parameter>hash</parameter></methodparam>
<methodparam><type>int</type><parameter>algo</parameter></methodparam> <methodparam><type>mixed</type><parameter>algo</parameter></methodparam>
<methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam> <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
</methodsynopsis> </methodsynopsis>
<para> <para>
@ -94,6 +94,32 @@ if (password_verify($password, $hash)) {
или &false;, если нет. или &false;, если нет.
</para> </para>
</refsect1> </refsect1>
<refsect1 role="changelog">
&reftitle.changelog;
<para>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>&Version;</entry>
<entry>&Description;</entry>
</row>
</thead>
<tbody>
<row>
<entry>7.4.0</entry>
<entry>
Параметр <parameter>algo</parameter> сейчас ожидает строку (&string;), но все еще принимает
число (&integer;) для обратной совместимости.
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</para>
</refsect1>
</refentry> </refentry>
<!-- Keep this comment at the end of the file <!-- Keep this comment at the end of the file

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ --> <!-- $Revision$ -->
<!-- EN-Revision: 95e3ed68b8d9ef156040a65db087478e7c5e4005 Maintainer: northcat Status: ready --> <!-- EN-Revision: 6683589b3e093a3c45a3ee72051f686af153adec Maintainer: northcat Status: ready -->
<!-- Reviewed: yes Maintainer: lex --> <!-- Reviewed: yes Maintainer: lex -->
<refentry xml:id="splfileobject.fwrite" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refentry xml:id="splfileobject.fwrite" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@ -51,7 +51,7 @@
<refsect1 role="returnvalues"> <refsect1 role="returnvalues">
&reftitle.returnvalues; &reftitle.returnvalues;
<para> <para>
Возвращает количество записанных байт или 0 в случае ошибки. Возвращает количество записанных байт или &false; в случае возникновения ошибки.
</para> </para>
</refsect1> </refsect1>