Merge branch '5.4' into 6.0

chalasr · chalasr · commit 30a9506664ec · 2022-09-21T22:25:27.000+02:00
* 5.4:
  Remove non-empty-string PHPDoc annotations
diff --git a/src/Symfony/Component/Filesystem/Path.php b/src/Symfony/Component/Filesystem/Path.php
@@ -721,7 +721,7 @@ public static function isBasePath(string $basePath, string $ofPath): bool
     }
 
     /**
-     * @return non-empty-string[]
+     * @return string[]
      */
     private static function findCanonicalParts(string $root, string $pathWithoutRoot): array
     {

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ public static function isBasePath(string $basePath, string $ofPath): bool`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`/**`
`724`		`- * @return non-empty-string[]`
	`724`	`+ * @return string[]`
`725`	`725`	`*/`
`726`	`726`	`private static function findCanonicalParts(string $root, string $pathWithoutRoot): array`
`727`	`727`	`{`