Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit 1fed468fc526 · 2025-08-20T10:04:18.000+02:00
* 6.4:
  fix session cookie options assertions on PHP 8.5
  [String] Fix issues singular
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -195,6 +195,10 @@ public function testCookieOptions()
             'cookie_samesite' => 'lax',
         ];
 
+        if (\PHP_VERSION_ID >= 80500) {
+            $options['cookie_partitioned'] = false;
+        }
+
         $this->getStorage($options);
         $temp = session_get_cookie_params();
         $gco = [];
diff --git a/src/Symfony/Component/String/Inflector/EnglishInflector.php b/src/Symfony/Component/String/Inflector/EnglishInflector.php
@@ -28,6 +28,9 @@ final class EnglishInflector implements InflectorInterface
         // bacteria (bacterium)
         ['airetcab', 8, true, true, 'bacterium'],
 
+        // issues (issue)
+        ['seussi', 6, true, true, 'issue'],
+
         // corpora (corpus)
         ['aroproc', 7, true, true, 'corpus'],
 
diff --git a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
@@ -103,6 +103,7 @@ public static function singularizeProvider()
             ['indices', ['index', 'indix', 'indice']],
             ['ions', 'ion'],
             ['irises', ['iris', 'irise', 'irisis']],
+            ['issues', 'issue'],
             ['kisses', 'kiss'],
             ['knives', 'knife'],
             ['lamps', 'lamp'],
@@ -262,6 +263,7 @@ public static function pluralizeProvider()
             ['index', ['indicies', 'indexes']],
             ['ion', 'ions'],
             ['iris', 'irises'],
+            ['issue', 'issues'],
             ['kiss', 'kisses'],
             ['knife', 'knives'],
             ['lamp', 'lamps'],
