Merge branch '6.1' into 6.2

chalasr · chalasr · commit e6d6bedc8466 · 2022-09-21T22:30:19.000+02:00
* 6.1:
  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
     {
diff --git a/src/Symfony/Component/Serializer/Context/Encoder/CsvEncoderContextBuilder.php b/src/Symfony/Component/Serializer/Context/Encoder/CsvEncoderContextBuilder.php
@@ -30,8 +30,6 @@ final class CsvEncoderContextBuilder implements ContextBuilderInterface
      *
      * Must be a single character.
      *
-     * @param non-empty-string|null $delimiter
-     *
      * @throws InvalidArgumentException
      */
     public function withDelimiter(?string $delimiter): static
@@ -48,8 +46,6 @@ public function withDelimiter(?string $delimiter): static
      *
      * Must be a single character.
      *
-     * @param non-empty-string|null $enclosure
-     *
      * @throws InvalidArgumentException
      */
     public function withEnclosure(?string $enclosure): static

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`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ final class CsvEncoderContextBuilder implements ContextBuilderInterface`
`30`	`30`	`*`
`31`	`31`	`* Must be a single character.`
`32`	`32`	`*`
`33`		`- * @param non-empty-string\|null $delimiter`
`34`		`- *`
`35`	`33`	`* @throws InvalidArgumentException`
`36`	`34`	`*/`
`37`	`35`	`public function withDelimiter(?string $delimiter): static`
`@@ -48,8 +46,6 @@ public function withDelimiter(?string $delimiter): static`
`48`	`46`	`*`
`49`	`47`	`* Must be a single character.`
`50`	`48`	`*`
`51`		`- * @param non-empty-string\|null $enclosure`
`52`		`- *`
`53`	`49`	`* @throws InvalidArgumentException`
`54`	`50`	`*/`
`55`	`51`	`public function withEnclosure(?string $enclosure): static`