Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 4fa5cb4e1ef5 · 2025-08-05T12:26:20.000+02:00
* 7.4:
  Use phpunit attribute
  Remove some implicit bool type juggling
  [Scheduler] Fix `scheduler.task` tag arguments optionality
  use false instead of null to hide the currency symbol
  [FrameworkBundle] Fix block type from `OK` to `ERROR` when local vault is disabled in `SecretsRemoveCommand`
  run tests with PHPUnit 12.1 on PHP &gt;= 8.3
  Fix wrong boolean values
  minor #61328 [FrameworkBundle] Decouple ControllerResolverTest from HttpKernel (nicolas-grekas)
  [Messenger] Fix NoAutoAckStamp handling in Worker::flush()
  [DependencyInjection] Dump XML using plain PHP, no DOM needed
diff --git a/UnicodeString.php b/UnicodeString.php
@@ -106,11 +106,13 @@ public function endsWith(string|iterable|AbstractString $suffix): bool
             return false;
         }
 
+        $grapheme = grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix)) ?: '';
+
         if ($this->ignoreCase) {
-            return 0 === mb_stripos(grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix)), $suffix, 0, 'UTF-8');
+            return 0 === mb_stripos($grapheme, $suffix, 0, 'UTF-8');
         }
 
-        return $suffix === grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix));
+        return $suffix === $grapheme;
     }
 
     public function equalsTo(string|iterable|AbstractString $string): bool
@@ -355,11 +357,13 @@ public function startsWith(string|iterable|AbstractString $prefix): bool
             return false;
         }
 
+        $grapheme = grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES) ?: '';
+
         if ($this->ignoreCase) {
-            return 0 === mb_stripos(grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES), $prefix, 0, 'UTF-8');
+            return 0 === mb_stripos($grapheme, $prefix, 0, 'UTF-8');
         }
 
-        return $prefix === grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES);
+        return $prefix === $grapheme;
     }
 
     public function __wakeup(): void

Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,13 @@ public function endsWith(string\|iterable\|AbstractString $suffix): bool`
`106`	`106`	`return false;`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ $grapheme = grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix)) ?: '';`
	`110`	`+`
`109`	`111`	`if ($this->ignoreCase) {`
`110`		`- return 0 === mb_stripos(grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix)), $suffix, 0, 'UTF-8');`
	`112`	`+ return 0 === mb_stripos($grapheme, $suffix, 0, 'UTF-8');`
`111`	`113`	`}`
`112`	`114`
`113`		`- return $suffix === grapheme_extract($this->string, \strlen($suffix), \GRAPHEME_EXTR_MAXBYTES, \strlen($this->string) - \strlen($suffix));`
	`115`	`+ return $suffix === $grapheme;`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`public function equalsTo(string\|iterable\|AbstractString $string): bool`
`@@ -355,11 +357,13 @@ public function startsWith(string\|iterable\|AbstractString $prefix): bool`
`355`	`357`	`return false;`
`356`	`358`	`}`
`357`	`359`
	`360`	`+ $grapheme = grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES) ?: '';`
	`361`	`+`
`358`	`362`	`if ($this->ignoreCase) {`
`359`		`- return 0 === mb_stripos(grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES), $prefix, 0, 'UTF-8');`
	`363`	`+ return 0 === mb_stripos($grapheme, $prefix, 0, 'UTF-8');`
`360`	`364`	`}`
`361`	`365`
`362`		`- return $prefix === grapheme_extract($this->string, \strlen($prefix), \GRAPHEME_EXTR_MAXBYTES);`
	`366`	`+ return $prefix === $grapheme;`
`363`	`367`	`}`
`364`	`368`
`365`	`369`	`public function __wakeup(): void`