Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit f8033e2ecd46 · 2022-04-01T14:54:51.000+02:00
* 5.4:
  Missing return type in getFilenameWithoutExtension function
diff --git a/src/Symfony/Component/Filesystem/Path.php b/src/Symfony/Component/Filesystem/Path.php
@@ -257,7 +257,7 @@ public static function getRoot(string $path): string
      * @param string|null $extension if specified, only that extension is cut
      *                               off (may contain leading dot)
      */
-    public static function getFilenameWithoutExtension(string $path, string $extension = null)
+    public static function getFilenameWithoutExtension(string $path, string $extension = null): string
     {
         if ('' === $path) {
             return '';

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public static function getRoot(string $path): string`
`257`	`257`	`* @param string\|null $extension if specified, only that extension is cut`
`258`	`258`	`* off (may contain leading dot)`
`259`	`259`	`*/`
`260`		`- public static function getFilenameWithoutExtension(string $path, string $extension = null)`
	`260`	`+ public static function getFilenameWithoutExtension(string $path, string $extension = null): string`
`261`	`261`	`{`
`262`	`262`	`if ('' === $path) {`
`263`	`263`	`return '';`