From a2d4cd4541b56e76e2bc60fa0205889d8b79f1d4 Mon Sep 17 00:00:00 2001
From: Dmitry Kaufman <d.kaufman@pos-credit.ru>
Date: Wed, 22 Jan 2025 18:51:34 +0700
Subject: [PATCH] SPT-234 fix enum fias level, ci, composer.json

---
 .github/workflows/composer.yml                | 22 ++++++++++++++++---
 .php-cs-fixer.dist.php                        |  1 +
 composer.json                                 | 10 ++++-----
 src/Infrastructure/Composer/function.php      |  1 +
 .../HttpClient/ConfigurationClient.php        |  1 +
 .../Exception/BadRequestException.php         |  1 +
 .../HttpClient/Exception/DaDataException.php  |  1 +
 .../Exception/ForbiddenException.php          |  1 +
 .../InternalServerErrorException.php          |  1 +
 .../Exception/NotFoundException.php           |  1 +
 .../Exception/UnauthorizedException.php       |  1 +
 src/Infrastructure/HttpClient/HttpClient.php  |  1 +
 .../Middleware/AuthorizationMiddleware.php    |  1 +
 .../Middleware/ClientErrorMiddleware.php      |  1 +
 .../Middleware/InternalServerMiddleware.php   |  1 +
 .../HttpClient/Middleware/Middleware.php      |  1 +
 .../Middleware/PipelineMiddleware.php         |  1 +
 .../HttpClient/Middleware/UrlMiddleware.php   |  1 +
 .../Serializer/CountryIsoNormalizer.php       |  3 ++-
 .../Serializer/EnumNormalizer.php             |  1 +
 .../FiasActualityStateNormalizer.php          |  3 ++-
 .../Serializer/MoneyNormalizer.php            |  4 ++++
 .../Serializer/PhoneNumberNormalizer.php      |  3 ++-
 .../Serializer/RegionIsoNormalizer.php        |  3 ++-
 src/Response/CountryIso.php                   |  1 +
 src/Response/FiasActualityState.php           |  1 +
 src/Response/FiasLevel.php                    | 14 ++++++++++++
 src/Response/Metro.php                        |  1 +
 src/Response/Organization.php                 |  1 +
 src/Response/OrganizationBranchType.php       |  1 +
 src/Response/OrganizationName.php             |  1 +
 src/Response/OrganizationOpf.php              |  1 +
 src/Response/OrganizationState.php            |  1 +
 src/Response/OrganizationStateStatus.php      |  1 +
 src/Response/OrganizationType.php             |  1 +
 src/Response/RegionIso.php                    |  1 +
 src/Response/SuggestAddress.php               |  1 +
 src/Response/SuggestOrganization.php          |  1 +
 src/RestClientBuilder.php                     |  1 +
 src/SuggestAddressClient.php                  |  1 +
 src/SuggestOrganizationClient.php             |  1 +
 src/Transport/RestSuggestAddressClient.php    |  1 +
 .../RestSuggestOrganizationClient.php         |  1 +
 43 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml
index e6fc883..f039aa5 100644
--- a/.github/workflows/composer.yml
+++ b/.github/workflows/composer.yml
@@ -22,19 +22,35 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 7.4, 8.0, 8.1, 8.2 ]
+        data: [
+          { symfony: '5.4.*', php: 7.4 },
+          { symfony: '5.4.*', php: 8.0 },
+          { symfony: '5.4.*', php: 8.1 },
+          { symfony: '5.4.*', php: 8.2 },
+
+          { symfony: '6.4.*', php: 8.1 },
+          { symfony: '6.4.*', php: 8.2 },
+
+          { symfony: '7.1.*', php: 8.2 },
+
+          { symfony: '7.2.*', php: 8.2 },
+        ]
+
     steps:
       - uses: actions/checkout@v3.3.0
 
       - name: Install Infrastructure
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php }}
-          tools: composer:v2
+          php-version: ${{ matrix.data.php }}
+          tools: composer:v2, flex
           coverage: none
 
       - name: Install Dependence and audit
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.data.symfony }}
         uses: ramsey/composer-install@v2
         with:
           composer-options: --optimize-autoloader
+          dependency-versions: "highest"
       - run: composer audit
\ No newline at end of file
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 42a3d0f..00fc34d 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PosCredit MDM-Client
  *
diff --git a/composer.json b/composer.json
index edb8c43..4e9a826 100644
--- a/composer.json
+++ b/composer.json
@@ -30,9 +30,9 @@
         "psr/http-client": "^1.0",
         "psr/http-client-implementation": "^1.0",
         "guzzlehttp/psr7": "^2.0",
-        "symfony/uid": "^5.3|^5.4|^6.0|^7.0",
-        "symfony/serializer": "^5.3|^5.4|^6.0|^7.0",
-        "symfony/property-access": "^5.3|^5.4|^6.0|^7.0",
+        "symfony/uid": "^5.3|^6.0|^7.0",
+        "symfony/serializer": "^5.3|^6.0|^7.0",
+        "symfony/property-access": "^5.3|^6.0|^7.0",
         "phpstan/phpdoc-parser": "^1.0",
         "phpdocumentor/reflection-docblock": "^5.0",
         "doctrine/annotations": "^1.0|^2.0",
@@ -42,8 +42,8 @@
         "brick/phonenumber": "^0.4|^0.5|^0.6"
     },
     "require-dev": {
-        "symfony/http-client": "^5.3|^5.4|^6.0|^7.0",
-        "symfony/var-dumper": "^5.3|^5.4|^6.0|^7.0",
+        "symfony/http-client": "^5.3|^6.0|^7.0",
+        "symfony/var-dumper": "^5.3|^6.0|^7.0",
         "friendsofphp/php-cs-fixer": "^3.64",
         "vimeo/psalm": "^5.23",
         "psalm/plugin-symfony": "^5.1",
diff --git a/src/Infrastructure/Composer/function.php b/src/Infrastructure/Composer/function.php
index 6babbb9..077a677 100644
--- a/src/Infrastructure/Composer/function.php
+++ b/src/Infrastructure/Composer/function.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/ConfigurationClient.php b/src/Infrastructure/HttpClient/ConfigurationClient.php
index bc2c1f5..4bb6b65 100644
--- a/src/Infrastructure/HttpClient/ConfigurationClient.php
+++ b/src/Infrastructure/HttpClient/ConfigurationClient.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Exception/BadRequestException.php b/src/Infrastructure/HttpClient/Exception/BadRequestException.php
index cb95468..cf2381c 100644
--- a/src/Infrastructure/HttpClient/Exception/BadRequestException.php
+++ b/src/Infrastructure/HttpClient/Exception/BadRequestException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Exception/DaDataException.php b/src/Infrastructure/HttpClient/Exception/DaDataException.php
index bd4546e..6039fa2 100644
--- a/src/Infrastructure/HttpClient/Exception/DaDataException.php
+++ b/src/Infrastructure/HttpClient/Exception/DaDataException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Exception/ForbiddenException.php b/src/Infrastructure/HttpClient/Exception/ForbiddenException.php
index 5f741be..9829b66 100644
--- a/src/Infrastructure/HttpClient/Exception/ForbiddenException.php
+++ b/src/Infrastructure/HttpClient/Exception/ForbiddenException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Exception/InternalServerErrorException.php b/src/Infrastructure/HttpClient/Exception/InternalServerErrorException.php
index b8ef4cf..939b00e 100644
--- a/src/Infrastructure/HttpClient/Exception/InternalServerErrorException.php
+++ b/src/Infrastructure/HttpClient/Exception/InternalServerErrorException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Exception/NotFoundException.php b/src/Infrastructure/HttpClient/Exception/NotFoundException.php
index 7dd8031..252d8b8 100644
--- a/src/Infrastructure/HttpClient/Exception/NotFoundException.php
+++ b/src/Infrastructure/HttpClient/Exception/NotFoundException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Exception/UnauthorizedException.php b/src/Infrastructure/HttpClient/Exception/UnauthorizedException.php
index 3e92ed1..3b80b72 100644
--- a/src/Infrastructure/HttpClient/Exception/UnauthorizedException.php
+++ b/src/Infrastructure/HttpClient/Exception/UnauthorizedException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/HttpClient.php b/src/Infrastructure/HttpClient/HttpClient.php
index 6f85f65..22c5fb1 100644
--- a/src/Infrastructure/HttpClient/HttpClient.php
+++ b/src/Infrastructure/HttpClient/HttpClient.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Middleware/AuthorizationMiddleware.php b/src/Infrastructure/HttpClient/Middleware/AuthorizationMiddleware.php
index 8e2e7a6..99c95f4 100644
--- a/src/Infrastructure/HttpClient/Middleware/AuthorizationMiddleware.php
+++ b/src/Infrastructure/HttpClient/Middleware/AuthorizationMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Middleware/ClientErrorMiddleware.php b/src/Infrastructure/HttpClient/Middleware/ClientErrorMiddleware.php
index 8544dfa..7273ba6 100644
--- a/src/Infrastructure/HttpClient/Middleware/ClientErrorMiddleware.php
+++ b/src/Infrastructure/HttpClient/Middleware/ClientErrorMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Middleware/InternalServerMiddleware.php b/src/Infrastructure/HttpClient/Middleware/InternalServerMiddleware.php
index 2fbf647..e6133e0 100644
--- a/src/Infrastructure/HttpClient/Middleware/InternalServerMiddleware.php
+++ b/src/Infrastructure/HttpClient/Middleware/InternalServerMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Middleware/Middleware.php b/src/Infrastructure/HttpClient/Middleware/Middleware.php
index 0606d0b..248ec43 100644
--- a/src/Infrastructure/HttpClient/Middleware/Middleware.php
+++ b/src/Infrastructure/HttpClient/Middleware/Middleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Middleware/PipelineMiddleware.php b/src/Infrastructure/HttpClient/Middleware/PipelineMiddleware.php
index c9efd15..12e371c 100644
--- a/src/Infrastructure/HttpClient/Middleware/PipelineMiddleware.php
+++ b/src/Infrastructure/HttpClient/Middleware/PipelineMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/HttpClient/Middleware/UrlMiddleware.php b/src/Infrastructure/HttpClient/Middleware/UrlMiddleware.php
index 479b379..c40e4d8 100644
--- a/src/Infrastructure/HttpClient/Middleware/UrlMiddleware.php
+++ b/src/Infrastructure/HttpClient/Middleware/UrlMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/Serializer/CountryIsoNormalizer.php b/src/Infrastructure/Serializer/CountryIsoNormalizer.php
index e82ff77..a255c23 100644
--- a/src/Infrastructure/Serializer/CountryIsoNormalizer.php
+++ b/src/Infrastructure/Serializer/CountryIsoNormalizer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
@@ -84,7 +85,7 @@ public function supportsNormalization($data, ?string $format = null, array $cont
     }
 
     /**
-     * @psalm-suppress MoreSpecificImplementedParamType
+     * @psalm-suppress MoreSpecificImplementedParamType, ParamNameMismatch
      *
      * @param object               $object
      * @param array<string, mixed> $context
diff --git a/src/Infrastructure/Serializer/EnumNormalizer.php b/src/Infrastructure/Serializer/EnumNormalizer.php
index ddef9ac..5cb5d9e 100644
--- a/src/Infrastructure/Serializer/EnumNormalizer.php
+++ b/src/Infrastructure/Serializer/EnumNormalizer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php b/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php
index a0b8444..734d298 100644
--- a/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php
+++ b/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
@@ -36,7 +37,7 @@ public function supportsNormalization($data, ?string $format = null, array $cont
     }
 
     /**
-     * @psalm-suppress MoreSpecificImplementedParamType
+     * @psalm-suppress MoreSpecificImplementedParamType, ParamNameMismatch
      *
      * @param object               $object
      * @param array<string, mixed> $context
diff --git a/src/Infrastructure/Serializer/MoneyNormalizer.php b/src/Infrastructure/Serializer/MoneyNormalizer.php
index 4d10155..892e4c0 100644
--- a/src/Infrastructure/Serializer/MoneyNormalizer.php
+++ b/src/Infrastructure/Serializer/MoneyNormalizer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
@@ -100,6 +101,9 @@ public function supportsNormalization($data, ?string $format = null, array $cont
         return $data instanceof Money;
     }
 
+    /**
+     * @psalm-suppress ParamNameMismatch
+     */
     public function normalize($object, ?string $format = null, array $context = []): string
     {
         if (!$object instanceof Money) {
diff --git a/src/Infrastructure/Serializer/PhoneNumberNormalizer.php b/src/Infrastructure/Serializer/PhoneNumberNormalizer.php
index 5f03549..2ef7df2 100644
--- a/src/Infrastructure/Serializer/PhoneNumberNormalizer.php
+++ b/src/Infrastructure/Serializer/PhoneNumberNormalizer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
@@ -93,7 +94,7 @@ public function supportsNormalization($data, ?string $format = null, array $cont
     }
 
     /**
-     * @psalm-suppress MoreSpecificImplementedParamType, LessSpecificReturnStatement, MoreSpecificReturnType
+     * @psalm-suppress MoreSpecificImplementedParamType, LessSpecificReturnStatement, MoreSpecificReturnType, ParamNameMismatch
      *
      * @param object               $object
      * @param array<string, mixed> $context
diff --git a/src/Infrastructure/Serializer/RegionIsoNormalizer.php b/src/Infrastructure/Serializer/RegionIsoNormalizer.php
index 3d396e0..1f2f4c0 100644
--- a/src/Infrastructure/Serializer/RegionIsoNormalizer.php
+++ b/src/Infrastructure/Serializer/RegionIsoNormalizer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
@@ -84,7 +85,7 @@ public function supportsNormalization($data, ?string $format = null, array $cont
     }
 
     /**
-     * @psalm-suppress MoreSpecificImplementedParamType
+     * @psalm-suppress MoreSpecificImplementedParamType, ParamNameMismatch
      *
      * @param object               $object
      * @param array<string, mixed> $context
diff --git a/src/Response/CountryIso.php b/src/Response/CountryIso.php
index 0c27fe8..13dbf85 100644
--- a/src/Response/CountryIso.php
+++ b/src/Response/CountryIso.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/FiasActualityState.php b/src/Response/FiasActualityState.php
index 267607c..e54e203 100644
--- a/src/Response/FiasActualityState.php
+++ b/src/Response/FiasActualityState.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/FiasLevel.php b/src/Response/FiasLevel.php
index 8d53071..d0539f8 100644
--- a/src/Response/FiasLevel.php
+++ b/src/Response/FiasLevel.php
@@ -41,6 +41,10 @@ final class FiasLevel extends Enum
 
     private const LAND_PLOT = '75';
 
+    private const ADDITIONAL_TERRITORY = '90';
+
+    private const STREET_IN_ADDITIONAL_TERRITORY = '91';
+
     private const FOREIGN_OR_BLANK = '-1';
 
     public static function country(): self
@@ -98,6 +102,16 @@ public static function landPlot(): self
         return new self(self::LAND_PLOT);
     }
 
+    public static function additionalTerritory(): self
+    {
+        return new self(self::ADDITIONAL_TERRITORY);
+    }
+
+    public static function streetInAdditionalTerritory(): self
+    {
+        return new self(self::STREET_IN_ADDITIONAL_TERRITORY);
+    }
+
     public static function foreignOrBlank(): self
     {
         return new self(self::FOREIGN_OR_BLANK);
diff --git a/src/Response/Metro.php b/src/Response/Metro.php
index 6598ab3..955b40f 100644
--- a/src/Response/Metro.php
+++ b/src/Response/Metro.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/Organization.php b/src/Response/Organization.php
index c8eca21..70a2d85 100644
--- a/src/Response/Organization.php
+++ b/src/Response/Organization.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/OrganizationBranchType.php b/src/Response/OrganizationBranchType.php
index 4633888..5215b62 100644
--- a/src/Response/OrganizationBranchType.php
+++ b/src/Response/OrganizationBranchType.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/OrganizationName.php b/src/Response/OrganizationName.php
index 293212f..2b63b55 100644
--- a/src/Response/OrganizationName.php
+++ b/src/Response/OrganizationName.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/OrganizationOpf.php b/src/Response/OrganizationOpf.php
index bd65714..9057410 100644
--- a/src/Response/OrganizationOpf.php
+++ b/src/Response/OrganizationOpf.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/OrganizationState.php b/src/Response/OrganizationState.php
index 3c4e8d1..831f4b4 100644
--- a/src/Response/OrganizationState.php
+++ b/src/Response/OrganizationState.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/OrganizationStateStatus.php b/src/Response/OrganizationStateStatus.php
index e42bb37..ac345fa 100644
--- a/src/Response/OrganizationStateStatus.php
+++ b/src/Response/OrganizationStateStatus.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/OrganizationType.php b/src/Response/OrganizationType.php
index f6cc323..80ee1d6 100644
--- a/src/Response/OrganizationType.php
+++ b/src/Response/OrganizationType.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/RegionIso.php b/src/Response/RegionIso.php
index eee79c8..b6dd158 100644
--- a/src/Response/RegionIso.php
+++ b/src/Response/RegionIso.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/SuggestAddress.php b/src/Response/SuggestAddress.php
index 02863cc..0e956da 100644
--- a/src/Response/SuggestAddress.php
+++ b/src/Response/SuggestAddress.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Response/SuggestOrganization.php b/src/Response/SuggestOrganization.php
index 4f4b44f..8cbd94b 100644
--- a/src/Response/SuggestOrganization.php
+++ b/src/Response/SuggestOrganization.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/RestClientBuilder.php b/src/RestClientBuilder.php
index 59dca13..f2745e0 100644
--- a/src/RestClientBuilder.php
+++ b/src/RestClientBuilder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/SuggestAddressClient.php b/src/SuggestAddressClient.php
index 7d8274a..f0254bd 100644
--- a/src/SuggestAddressClient.php
+++ b/src/SuggestAddressClient.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/SuggestOrganizationClient.php b/src/SuggestOrganizationClient.php
index f54170e..ebff54e 100644
--- a/src/SuggestOrganizationClient.php
+++ b/src/SuggestOrganizationClient.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Transport/RestSuggestAddressClient.php b/src/Transport/RestSuggestAddressClient.php
index a2ee07b..ff737b5 100644
--- a/src/Transport/RestSuggestAddressClient.php
+++ b/src/Transport/RestSuggestAddressClient.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *
diff --git a/src/Transport/RestSuggestOrganizationClient.php b/src/Transport/RestSuggestOrganizationClient.php
index 458c5e7..3232c50 100644
--- a/src/Transport/RestSuggestOrganizationClient.php
+++ b/src/Transport/RestSuggestOrganizationClient.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DaData Client
  *