Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: [skip ci] Fix NEWS entry
php · Sep 14, 2023 · b15e9b5 · b15e9b5
2 parents 0e9d658 + f6a038d
commit b15e9b5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.3.0RC3
 
+- Filter:
+  . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov)
 
 14 Sep 2023, PHP 8.3.0RC2
 
@@ -21,9 +23,6 @@ PHP                                                                        NEWS
   . Fixed bug GH-12123 (Compile error on MacOS with C++ extension when using
     ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX). (kocsismate)
 
-- Filter:
-  . Fix explicit FILTER_REQUIRE_SCALAR with FILTER_CALLBACK (ilutov)
-
 - FPM:
   . Fixed GH-12077 (PHP 8.3.0RC1 borked socket-close-on-exec.phpt).
     (Jakub Zelenka)