Clean up Psalm-specific annotations

BenMorel · BenMorel · commit 8ef37e5aa073 · 2025-09-07T00:20:58.000+02:00
These are now correctly understood at least by Psalm, PHPStan, PhpStorm.
diff --git a/src/Formatter/GBFormatter.php b/src/Formatter/GBFormatter.php
@@ -50,8 +50,7 @@ final class GBFormatter implements CountryPostcodeFormatter
     /**
      * The regular expression patterns, or null if not built yet.
      *
-     * @psalm-var non-empty-string[]|null
-     * @var string[]|null
+     * @var non-empty-string[]|null
      */
     private ?array $patterns = null;
 
@@ -87,9 +86,7 @@ public function format(string $postcode): ?string
      * - The area code (ex: WC) for additional checks
      * - The inward code (e.g. 9RZ) for formatting
      *
-     * @return string[]
-     *
-     * @psalm-return non-empty-string[]
+     * @return non-empty-string[]
      */
     private function getPatterns(): array
     {

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ final class GBFormatter implements CountryPostcodeFormatter`
`50`	`50`	`/**`
`51`	`51`	`* The regular expression patterns, or null if not built yet.`
`52`	`52`	`*`
`53`		`- * @psalm-var non-empty-string[]\|null`
`54`		`- * @var string[]\|null`
	`53`	`+ * @var non-empty-string[]\|null`
`55`	`54`	`*/`
`56`	`55`	`private ?array $patterns = null;`
`57`	`56`
`@@ -87,9 +86,7 @@ public function format(string $postcode): ?string`
`87`	`86`	`* - The area code (ex: WC) for additional checks`
`88`	`87`	`* - The inward code (e.g. 9RZ) for formatting`
`89`	`88`	`*`
`90`		`- * @return string[]`
`91`		`- *`
`92`		`- * @psalm-return non-empty-string[]`
	`89`	`+ * @return non-empty-string[]`
`93`	`90`	`*/`
`94`	`91`	`private function getPatterns(): array`
`95`	`92`	`{`