Fix conflixts strip countrycode prefixes

brick · Sep 20, 2024 · 6a111e0 · 6a111e0
2 parents c9a14fd + c501fa0
commit 6a111e0
Show file tree

Hide file tree

Showing 366 changed files with 13 additions and 1,647 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   "require-dev": {
     "phpunit/phpunit": "^9.0",
     "php-coveralls/php-coveralls": "^2.0",
-    "vimeo/psalm": "5.17.0"
+    "vimeo/psalm": "5.26.1"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Formatter/ADFormatter.php b/src/Formatter/ADFormatter.php
@@ -17,9 +17,6 @@
  */
 class ADFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (substr($postcode, 0, 2) === 'AD') {

diff --git a/src/Formatter/AFFormatter.php b/src/Formatter/AFFormatter.php
@@ -20,9 +20,6 @@
  */
 class AFFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/AIFormatter.php b/src/Formatter/AIFormatter.php
@@ -16,9 +16,6 @@
  */
 class AIFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if ($postcode === '2640' || $postcode === 'AI2640') {

diff --git a/src/Formatter/ALFormatter.php b/src/Formatter/ALFormatter.php
@@ -16,9 +16,6 @@
  */
 class ALFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/AMFormatter.php b/src/Formatter/AMFormatter.php
@@ -16,9 +16,6 @@
  */
 class AMFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/AQFormatter.php b/src/Formatter/AQFormatter.php
@@ -15,9 +15,6 @@
  */
 class AQFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if ($postcode === 'BIQQ1ZZ') {

diff --git a/src/Formatter/ARFormatter.php b/src/Formatter/ARFormatter.php
@@ -16,9 +16,6 @@
  */
 class ARFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^(([0-9]{4})|([A-Z][0-9]{4}[A-Z]{3}))$/', $postcode) !== 1) {

diff --git a/src/Formatter/ASFormatter.php b/src/Formatter/ASFormatter.php
@@ -17,9 +17,6 @@
  */
 class ASFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         $length = strlen($postcode);

diff --git a/src/Formatter/ATFormatter.php b/src/Formatter/ATFormatter.php
@@ -10,7 +10,7 @@
 /**
  * Validates and formats postcodes in Austria.
  *
- * Postcodes consist of 4 digits, without separator.
+ * Postcodes consist of 4 digits, without separator. The first digit must be 1-9.
  *
  * @see https://en.wikipedia.org/wiki/List_of_postal_codes
  * @see https://en.wikipedia.org/wiki/Postal_codes_in_Austria
@@ -19,14 +19,12 @@ class ATFormatter implements CountryPostcodeFormatter
 {
     use StripCountryCode;
 
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         $postcode = $this->stripCountryCode($postcode);
 
-        if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {
+        if (preg_match('/^[1-9][0-9]{3}$/', $postcode) !== 1) {
+
             return null;
         }
 

diff --git a/src/Formatter/AUFormatter.php b/src/Formatter/AUFormatter.php
@@ -16,9 +16,6 @@
  */
 class AUFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/AXFormatter.php b/src/Formatter/AXFormatter.php
@@ -17,9 +17,6 @@
  */
 class AXFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         $length = strlen($postcode);

diff --git a/src/Formatter/AZFormatter.php b/src/Formatter/AZFormatter.php
@@ -17,9 +17,6 @@
  */
 class AZFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (substr($postcode, 0, 2) === 'AZ') {

diff --git a/src/Formatter/BAFormatter.php b/src/Formatter/BAFormatter.php
@@ -15,9 +15,6 @@
  */
 class BAFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{5}$/', $postcode) !== 1) {

diff --git a/src/Formatter/BBFormatter.php b/src/Formatter/BBFormatter.php
@@ -17,9 +17,6 @@
  */
 class BBFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (substr($postcode, 0, 2) === 'BB') {

diff --git a/src/Formatter/BDFormatter.php b/src/Formatter/BDFormatter.php
@@ -16,9 +16,6 @@
  */
 class BDFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/BEFormatter.php b/src/Formatter/BEFormatter.php
@@ -19,9 +19,6 @@ class BEFormatter implements CountryPostcodeFormatter
 {
     use StripCountryCode;
 
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         $postcode = $this->stripCountryCode($postcode);

diff --git a/src/Formatter/BGFormatter.php b/src/Formatter/BGFormatter.php
@@ -16,9 +16,6 @@
  */
 class BGFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/BHFormatter.php b/src/Formatter/BHFormatter.php
@@ -16,9 +16,6 @@
  */
 class BHFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^(1?[0-9])([0-9]{2})$/', $postcode, $matches) !== 1) {

diff --git a/src/Formatter/BLFormatter.php b/src/Formatter/BLFormatter.php
@@ -15,9 +15,6 @@
  */
 class BLFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if ($postcode === '97133') {

diff --git a/src/Formatter/BMFormatter.php b/src/Formatter/BMFormatter.php
@@ -16,9 +16,6 @@
  */
 class BMFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^([A-Z]{2})([A-Z]{2}|[0-9]{2})$/', $postcode, $matches) !== 1) {

diff --git a/src/Formatter/BNFormatter.php b/src/Formatter/BNFormatter.php
@@ -16,9 +16,6 @@
  */
 class BNFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[A-Z]{2}[0-9]{4}$/', $postcode, $matches) !== 1) {

diff --git a/src/Formatter/BRFormatter.php b/src/Formatter/BRFormatter.php
@@ -17,9 +17,6 @@
  */
 class BRFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{8}$/', $postcode) !== 1) {

diff --git a/src/Formatter/BTFormatter.php b/src/Formatter/BTFormatter.php
@@ -15,9 +15,6 @@
  */
 class BTFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{5}$/', $postcode) !== 1) {

diff --git a/src/Formatter/BYFormatter.php b/src/Formatter/BYFormatter.php
@@ -15,9 +15,6 @@
  */
 class BYFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{6}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CAFormatter.php b/src/Formatter/CAFormatter.php
@@ -18,9 +18,6 @@
  */
 class CAFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^([ABCEGHJ-NPRSTV-Z][0-9]){3}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CCFormatter.php b/src/Formatter/CCFormatter.php
@@ -15,9 +15,6 @@
  */
 class CCFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CHFormatter.php b/src/Formatter/CHFormatter.php
@@ -16,9 +16,6 @@
  */
 class CHFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CLFormatter.php b/src/Formatter/CLFormatter.php
@@ -17,9 +17,6 @@
  */
 class CLFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{7}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CNFormatter.php b/src/Formatter/CNFormatter.php
@@ -17,9 +17,6 @@
  */
 class CNFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{6}$/', $postcode) !== 1) {

diff --git a/src/Formatter/COFormatter.php b/src/Formatter/COFormatter.php
@@ -29,16 +29,12 @@ class COFormatter implements CountryPostcodeFormatter
         '99'
     ];
 
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^\d{2}(?!0000)\d{4}$/', $postcode) !== 1) {
             return null;
         }
 
-
         $department = substr($postcode, 0, 2);
 
         if (!in_array($department, self::DEPARTMENTS, true)) {

diff --git a/src/Formatter/CRFormatter.php b/src/Formatter/CRFormatter.php
@@ -17,9 +17,6 @@
  */
 class CRFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]+$/', $postcode) !== 1) {

diff --git a/src/Formatter/CUFormatter.php b/src/Formatter/CUFormatter.php
@@ -15,9 +15,6 @@
  */
 class CUFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{5}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CVFormatter.php b/src/Formatter/CVFormatter.php
@@ -15,9 +15,6 @@
  */
 class CVFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CXFormatter.php b/src/Formatter/CXFormatter.php
@@ -15,9 +15,6 @@
  */
 class CXFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{4}$/', $postcode) !== 1) {

diff --git a/src/Formatter/CYFormatter.php b/src/Formatter/CYFormatter.php
@@ -18,9 +18,6 @@
  */
 class CYFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]+$/', $postcode) !== 1) {

diff --git a/src/Formatter/CZFormatter.php b/src/Formatter/CZFormatter.php
@@ -21,9 +21,6 @@
  */
 class CZFormatter implements CountryPostcodeFormatter
 {
-    /**
-     * {@inheritdoc}
-     */
     public function format(string $postcode) : ?string
     {
         if (preg_match('/^[0-9]{5}$/', $postcode) !== 1) {