svn: /phpdoc/ru/trunk/reference/ openssl/functions/openssl-random-pseudo-bytes.xml password/constants.xml password/functions/password-hash.xml password/functions/password-needs-rehash.xml spl/splfileobject/fwrite.xml

[email protected] (Sergey Panteleev)
Newsgroups php.doc.ru
Message-ID <[email protected]> 
sergey                                   Mon, 18 May 2020 05:05:03 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=349908

Log:
docs(ru): Updated to English revision

Changed paths:
    U   phpdoc/ru/trunk/reference/openssl/functions/openssl-random-pseudo-bytes.xml
    U   phpdoc/ru/trunk/reference/password/constants.xml
    U   phpdoc/ru/trunk/reference/password/functions/password-hash.xml
    U   phpdoc/ru/trunk/reference/password/functions/password-needs-rehash.xml
    U   phpdoc/ru/trunk/reference/spl/splfileobject/fwrite.xml
svn-diffs-349908.txt (text/x-diff, 9.1 KB) 
Modified: phpdoc/ru/trunk/reference/openssl/functions/openssl-random-pseudo-bytes.xml
===================================================================
--- phpdoc/ru/trunk/reference/openssl/functions/openssl-random-pseudo-bytes.xml	2020-05-18 04:47:51 UTC (rev 349907)
+++ phpdoc/ru/trunk/reference/openssl/functions/openssl-random-pseudo-bytes.xml	2020-05-18 05:05:03 UTC (rev 349908)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 336957 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 349902 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->

 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openssl-random-pseudo-bytes">
@@ -67,7 +67,7 @@
     <programlisting role="php">
 <![CDATA[
 <?php
-for ($i = -1; $i <= 4; $i++) {
+for ($i = 1; $i <= 4; $i++) {
     $bytes = openssl_random_pseudo_bytes($i, $cstrong);
     $hex   = bin2hex($bytes);

@@ -82,14 +82,6 @@
     &example.outputs.similar;
     <screen>
 <![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
 string(2) "42"
 bool(true)

Modified: phpdoc/ru/trunk/reference/password/constants.xml
===================================================================
--- phpdoc/ru/trunk/reference/password/constants.xml	2020-05-18 04:47:51 UTC (rev 349907)
+++ phpdoc/ru/trunk/reference/password/constants.xml	2020-05-18 05:05:03 UTC (rev 349908)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 347683 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 349903 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->

 <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">
     <term>
      <constant>PASSWORD_BCRYPT</constant>
-     (<type>integer</type>)
+     (<type>string</type>)
     </term>
     <listitem>
      <para>
@@ -57,7 +57,7 @@
    <varlistentry xml:id="constant.password-argon2i">
     <term>
      <constant>PASSWORD_ARGON2I</constant>
-     (<type>integer</type>)
+     (<type>string</type>)
     </term>
     <listitem>
      <para>
@@ -98,17 +98,17 @@
    <varlistentry xml:id="constant.password-argon2id">
     <term>
      <constant>PASSWORD_ARGON2ID</constant>
-     (<type>integer</type>)
+     (<type>string</type>)
     </term>
     <listitem>
      <para>
       <constant>PASSWORD_ARGON2ID</constant> используется для создания хешей паролей
-         с помощью алгоритма Argon2id. Поддерживаются те же опции, что и для
-         <link linkend="constant.password-argon2i"><constant>PASSWORD_ARGON2I</constant></link>.
-        </para>
-        <para>
-         Доступно с PHP 7.3.0.
-        </para>
+      с помощью алгоритма Argon2id. Поддерживаются те же опции, что и для
+      <link linkend="constant.password-argon2i"><constant>PASSWORD_ARGON2I</constant></link>.
+     </para>
+     <para>
+      Доступно с PHP 7.3.0.
+     </para>
     </listitem>
    </varlistentry>
    <varlistentry xml:id="constant.password-argon2-default-memory-cost">
@@ -157,7 +157,7 @@
    <varlistentry xml:id="constant.password-default">
     <term>
      <constant>PASSWORD_DEFAULT</constant>
-     (<type>integer</type>)
+     (<type>mixed</type>)
     </term>
     <listitem>
      <para>
@@ -184,6 +184,33 @@
    </varlistentry>
   </variablelist>
  </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>

 <!-- Keep this comment at the end of the file

Modified: phpdoc/ru/trunk/reference/password/functions/password-hash.xml
===================================================================
--- phpdoc/ru/trunk/reference/password/functions/password-hash.xml	2020-05-18 04:47:51 UTC (rev 349907)
+++ phpdoc/ru/trunk/reference/password/functions/password-hash.xml	2020-05-18 05:05:03 UTC (rev 349908)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 346125 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 349903 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->

 <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>
    <type>string</type><methodname>password_hash</methodname>
    <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>
   </methodsynopsis>
   <para>
@@ -358,6 +358,13 @@
      </thead>
      <tbody>
       <row>
+       <entry>7.4.0</entry>
+       <entry>
+        Параметр <parameter>algo</parameter> сейчас ожидает строку (&string;), но все еще принимает
+        число (&integer;) для обратной совместимости.
+       </entry>
+      </row>
+      <row>
        <entry>7.3.0</entry>
        <entry>
         Добавлена поддержка алгоритма хеширования паролей Argon2id с помощью <constant>PASSWORD_ARGON2ID</constant>.

Modified: phpdoc/ru/trunk/reference/password/functions/password-needs-rehash.xml
===================================================================
--- phpdoc/ru/trunk/reference/password/functions/password-needs-rehash.xml	2020-05-18 04:47:51 UTC (rev 349907)
+++ phpdoc/ru/trunk/reference/password/functions/password-needs-rehash.xml	2020-05-18 05:05:03 UTC (rev 349908)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 343891 Maintainer: rjhdby Status: ready -->
+<!-- EN-Revision: 349903 Maintainer: rjhdby Status: ready -->
 <!-- Reviewed: yes -->

 <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>
    <type>bool</type><methodname>password_needs_rehash</methodname>
    <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>
   </methodsynopsis>
   <para>
@@ -94,6 +94,32 @@
    или &false;, если нет.
   </para>
  </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>

 <!-- Keep this comment at the end of the file

Modified: phpdoc/ru/trunk/reference/spl/splfileobject/fwrite.xml
===================================================================
--- phpdoc/ru/trunk/reference/spl/splfileobject/fwrite.xml	2020-05-18 04:47:51 UTC (rev 349907)
+++ phpdoc/ru/trunk/reference/spl/splfileobject/fwrite.xml	2020-05-18 05:05:03 UTC (rev 349908)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 342511 Maintainer: northcat Status: ready -->
+<!-- EN-Revision: 349901 Maintainer: northcat Status: ready -->
 <!-- Reviewed: yes Maintainer: lex -->

 <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">
   &reftitle.returnvalues;
   <para>
-   Возвращает количество записанных байт или 0 в случае ошибки.
+   Возвращает количество записанных байт или &false; в случае возникновения ошибки.
   </para>
  </refsect1>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.