Sync math (#788)

php · Sep 12, 2023 · 2099460 · 2099460
1 parent 3655926
commit 2099460
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/reference/apcu/apcuiterator.xml b/reference/apcu/apcuiterator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: c44e9cb68b9b65771f9c45db2c07a06c63d71359 Maintainer: haytoo Status: ready -->
+<!-- EN-Revision: b1ef3427055358ff6d092ddb0a8b5e748a7bbbb2 Maintainer: haytoo Status: ready -->
 <!-- CREDITS: Luffy -->
 <phpdoc:classref xml:id="class.apcuiterator" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -39,7 +39,7 @@
     </classsynopsisinfo>
 <!-- }}} -->
 
-    <classsynopsisinfo role="comment">方法</classsynopsisinfo>
+    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.apcuiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])">
      <xi:fallback/>
     </xi:include>

diff --git a/reference/math/functions/max.xml b/reference/math/functions/max.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: aeda3e7df99fbfa4680f9eb038bfc7f847e031aa Maintainer: dallas Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 9d044185431afc63026546899216053820ac5d64 Maintainer: dallas Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.max" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>max</refname>
@@ -101,6 +101,13 @@
        &false; 并发出 <constant>E_WARNING</constant> 错误。
       </entry>
      </row>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       由于 <link linkend="migration80.incompatible.core.string-number-comparision">字符串到数字的比较</link>
+       已经改变，<function>max</function> 在这些情况下不再根据参数的顺序返回不同的值。
+      </entry>
+     </row>
     </tbody>
    </tgroup>
   </informaltable>
@@ -117,11 +124,6 @@
 echo max(2, 3, 1, 6, 7);  // 7
 echo max(array(2, 4, 5)); // 5
 
-// The string 'hello' when compared to an int is treated as 0
-// Since the two values are equal, the order they are provided determines the result
-echo max(0, 'hello');     // 0
-echo max('hello', 0);     // hello
-
 // Here we are comparing -1 < 0, so 'hello' is the highest value
 echo max('hello', -1);    // hello
 

diff --git a/reference/math/functions/min.xml b/reference/math/functions/min.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: aeda3e7df99fbfa4680f9eb038bfc7f847e031aa Maintainer: dallas Status: ready -->
-<!-- CREDITS: mowangjuanzi -->
+<!-- EN-Revision: 9d044185431afc63026546899216053820ac5d64 Maintainer: dallas Status: ready -->
+<!-- CREDITS: mowangjuanzi, Luffy -->
 <refentry xml:id="function.min" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>min</refname>
@@ -101,6 +101,13 @@
        &false; 并发出 <constant>E_WARNING</constant> 错误。
       </entry>
      </row>
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       由于 <link linkend="migration80.incompatible.core.string-number-comparision">字符串到数字的比较</link>
+       已经改变，<function>min</function> 在这些情况下不再根据参数的顺序返回不同的值。
+      </entry>
+     </row>
     </tbody>
    </tgroup>
   </informaltable>
@@ -117,11 +124,6 @@
 echo min(2, 3, 1, 6, 7);  // 1
 echo min(array(2, 4, 5)); // 2
 
-// The string 'hello' when compared to an int is treated as 0
-// Since the two values are equal, the order they are provided determines the result
-echo min(0, 'hello');     // 0
-echo min('hello', 0);     // hello
-
 // Here we are comparing -1 < 0, so -1 is the lowest value
 echo min('hello', -1);    // -1