From 4645201618163dc998d2e77f8619112aea241e8e Mon Sep 17 00:00:00 2001
From: jdkfx <htazoe@jdkfx.com>
Date: Mon, 11 Nov 2024 21:10:49 +0900
Subject: [PATCH 1/2] =?UTF-8?q?strcspn=E3=81=AE=E5=A4=89=E6=9B=B4=E5=B1=A5?=
 =?UTF-8?q?=E6=AD=B4=E3=81=A8=E4=BE=8B=E3=82=92=E8=BF=BD=E8=A8=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 reference/strings/functions/strcspn.xml | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/reference/strings/functions/strcspn.xml b/reference/strings/functions/strcspn.xml
index 0d220f25e18..aba37388264 100644
--- a/reference/strings/functions/strcspn.xml
+++ b/reference/strings/functions/strcspn.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 422bb032237525aaf50e6a43f33362a2c610a1d7 Maintainer: hirokawa Status: ready -->
-<!-- CREDITS: shimooka,mumumu -->
+<!-- EN-Revision: 89990d6588947665d4e9c029ee83696f1a9d3d11 Maintainer: hirokawa Status: ready -->
+<!-- CREDITS: shimooka,mumumu,jdkfx -->
 <refentry xml:id="function.strcspn" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>strcspn</refname>
@@ -123,6 +123,15 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       <simpara>
+        PHP 8.4.0 以前では、 <parameter>characters</parameter> が空の文字列の場合、
+        <parameter>string</parameter> 内の最初の null バイトで探索が誤って停止してしまうことがありました。
+       </simpara>
+      </entry>
+     </row>
      <row>
       <entry>8.0.0</entry>
       <entry>
@@ -141,29 +150,26 @@
    <programlisting role="php">
 <![CDATA[
 <?php
-$a = strcspn('abcd',  'apple');
-$b = strcspn('abcd',  'banana');
-$c = strcspn('hello', 'l');
-$d = strcspn('hello', 'world');
-$e = strcspn('abcdhelloabcd', 'abcd', -9);
-$f = strcspn('abcdhelloabcd', 'abcd', -9, -5);
+$a = strcspn('banana', 'a');
+$b = strcspn('banana', 'abcd');
+$c = strcspn('banana', 'z');
+$d = strcspn('abcdhelloabcd', 'a', -9);
+$e = strcspn('abcdhelloabcd', 'a', -9, -5);
 
 var_dump($a);
 var_dump($b);
 var_dump($c);
 var_dump($d);
 var_dump($e);
-var_dump($f);
 ?>
 ]]>
    </programlisting>
    &example.outputs;
    <screen>
 <![CDATA[
+int(1)
 int(0)
-int(0)
-int(2)
-int(2)
+int(6)
 int(5)
 int(4)
 ]]>

From 5080d9bb52b3590b3a084491fc0595f6b6d9a408 Mon Sep 17 00:00:00 2001
From: KentarouTakeda <takeda@youmind.jp>
Date: Tue, 12 Nov 2024 14:56:48 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A8=E7=8F=BE=E3=81=AE=E6=94=B9?=
 =?UTF-8?q?=E5=96=84:=20=E4=BB=A5=E5=89=8D=20=E2=86=92=20=E3=82=88?=
 =?UTF-8?q?=E3=82=8A=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Haruki Tazoe <40142697+jdkfx@users.noreply.github.com>
---
 reference/strings/functions/strcspn.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/strings/functions/strcspn.xml b/reference/strings/functions/strcspn.xml
index aba37388264..d97968326ad 100644
--- a/reference/strings/functions/strcspn.xml
+++ b/reference/strings/functions/strcspn.xml
@@ -127,7 +127,7 @@
       <entry>8.4.0</entry>
       <entry>
        <simpara>
-        PHP 8.4.0 以前では、 <parameter>characters</parameter> が空の文字列の場合、
+        PHP 8.4.0 より前のバージョンでは、 <parameter>characters</parameter> が空の文字列の場合、
         <parameter>string</parameter> 内の最初の null バイトで探索が誤って停止してしまうことがありました。
        </simpara>
       </entry>