From 26d0e8d1f0254ef6612215cefaa7e0f88ea8ef5d Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Tue, 21 Jan 2025 17:16:15 +0700 Subject: [PATCH 01/40] ref #SPT-234 add enum to fias level --- src/Response/FiasLevel.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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); From 7d5bcef422b2152d91373621fa9585df8092f65f Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Tue, 21 Jan 2025 21:25:08 +0700 Subject: [PATCH 02/40] ref #SPT-234 fix CI --- src/Infrastructure/Serializer/CountryIsoNormalizer.php | 2 +- src/Infrastructure/Serializer/FiasActualityStateNormalizer.php | 2 +- src/Infrastructure/Serializer/MoneyNormalizer.php | 3 +++ src/Infrastructure/Serializer/PhoneNumberNormalizer.php | 2 +- src/Infrastructure/Serializer/RegionIsoNormalizer.php | 2 +- src/Response/RegionIso.php | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Infrastructure/Serializer/CountryIsoNormalizer.php b/src/Infrastructure/Serializer/CountryIsoNormalizer.php index e82ff77..7e6bfb2 100644 --- a/src/Infrastructure/Serializer/CountryIsoNormalizer.php +++ b/src/Infrastructure/Serializer/CountryIsoNormalizer.php @@ -84,7 +84,7 @@ public function supportsNormalization($data, ?string $format = null, array $cont } /** - * @psalm-suppress MoreSpecificImplementedParamType + * @psalm-suppress MoreSpecificImplementedParamType, ParamNameMismatch * * @param object $object * @param array $context diff --git a/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php b/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php index a0b8444..e15b734 100644 --- a/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php +++ b/src/Infrastructure/Serializer/FiasActualityStateNormalizer.php @@ -36,7 +36,7 @@ public function supportsNormalization($data, ?string $format = null, array $cont } /** - * @psalm-suppress MoreSpecificImplementedParamType + * @psalm-suppress MoreSpecificImplementedParamType, ParamNameMismatch * * @param object $object * @param array $context diff --git a/src/Infrastructure/Serializer/MoneyNormalizer.php b/src/Infrastructure/Serializer/MoneyNormalizer.php index 4d10155..50a5479 100644 --- a/src/Infrastructure/Serializer/MoneyNormalizer.php +++ b/src/Infrastructure/Serializer/MoneyNormalizer.php @@ -100,6 +100,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..f4aeb36 100644 --- a/src/Infrastructure/Serializer/PhoneNumberNormalizer.php +++ b/src/Infrastructure/Serializer/PhoneNumberNormalizer.php @@ -93,7 +93,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 $context diff --git a/src/Infrastructure/Serializer/RegionIsoNormalizer.php b/src/Infrastructure/Serializer/RegionIsoNormalizer.php index 3d396e0..79542f1 100644 --- a/src/Infrastructure/Serializer/RegionIsoNormalizer.php +++ b/src/Infrastructure/Serializer/RegionIsoNormalizer.php @@ -84,7 +84,7 @@ public function supportsNormalization($data, ?string $format = null, array $cont } /** - * @psalm-suppress MoreSpecificImplementedParamType + * @psalm-suppress MoreSpecificImplementedParamType, ParamNameMismatch * * @param object $object * @param array $context 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 @@ Date: Tue, 21 Jan 2025 21:27:32 +0700 Subject: [PATCH 03/40] ref #SPT-234 fix CI --- src/Response/SuggestAddress.php | 1 + 1 file changed, 1 insertion(+) 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 @@ Date: Tue, 21 Jan 2025 21:35:17 +0700 Subject: [PATCH 04/40] ref #SPT-234 fix CI --- src/Response/OrganizationStateStatus.php | 1 + src/Transport/RestSuggestAddressClient.php | 1 + 2 files changed, 2 insertions(+) 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 @@ Date: Tue, 21 Jan 2025 21:41:05 +0700 Subject: [PATCH 05/40] ref #SPT-234 fix CI --- .php-cs-fixer.dist.php | 1 + src/Infrastructure/Composer/function.php | 1 + src/Infrastructure/HttpClient/ConfigurationClient.php | 1 + src/Infrastructure/HttpClient/Exception/BadRequestException.php | 1 + src/Infrastructure/HttpClient/Exception/DaDataException.php | 1 + src/Infrastructure/HttpClient/Exception/ForbiddenException.php | 1 + .../HttpClient/Exception/InternalServerErrorException.php | 1 + src/Infrastructure/HttpClient/Exception/NotFoundException.php | 1 + .../HttpClient/Exception/UnauthorizedException.php | 1 + src/Infrastructure/HttpClient/HttpClient.php | 1 + .../HttpClient/Middleware/AuthorizationMiddleware.php | 1 + .../HttpClient/Middleware/ClientErrorMiddleware.php | 1 + .../HttpClient/Middleware/InternalServerMiddleware.php | 1 + src/Infrastructure/HttpClient/Middleware/Middleware.php | 1 + src/Infrastructure/HttpClient/Middleware/PipelineMiddleware.php | 1 + src/Infrastructure/HttpClient/Middleware/UrlMiddleware.php | 1 + src/Infrastructure/Serializer/CountryIsoNormalizer.php | 1 + src/Infrastructure/Serializer/EnumNormalizer.php | 1 + src/Infrastructure/Serializer/FiasActualityStateNormalizer.php | 1 + src/Infrastructure/Serializer/MoneyNormalizer.php | 1 + src/Infrastructure/Serializer/PhoneNumberNormalizer.php | 1 + src/Infrastructure/Serializer/RegionIsoNormalizer.php | 1 + src/Response/CountryIso.php | 1 + src/Response/FiasActualityState.php | 1 + 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/OrganizationType.php | 1 + src/Response/SuggestOrganization.php | 1 + src/RestClientBuilder.php | 1 + src/SuggestAddressClient.php | 1 + src/SuggestOrganizationClient.php | 1 + src/Transport/RestSuggestOrganizationClient.php | 1 + 36 files changed, 36 insertions(+) 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 @@ Date: Tue, 21 Jan 2025 21:58:30 +0700 Subject: [PATCH 06/40] ref #SPT-234 remove unsupported symfony versions with CVEs from composer-audit ci job --- .github/workflows/composer.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index e6fc883..fd9e819 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,7 +22,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: [ 7.4, 8.0, 8.1, 8.2 ] + php: [ 8.1, 8.2 ] + symfony: [ '6.4.*', '7.1.*' ] steps: - uses: actions/checkout@v3.3.0 @@ -30,11 +31,14 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - tools: composer:v2 + tools: composer:v2, flex coverage: none - name: Install Dependence and audit + env: + SYMFONY_REQUIRE: ${{ matrix.symfony }} uses: ramsey/composer-install@v2 with: composer-options: --optimize-autoloader + dependency-versions: "highest" - run: composer audit \ No newline at end of file From 6ab41d272b0c8f1d9be7fcab24010ed0a226f1c4 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 13:27:09 +0700 Subject: [PATCH 07/40] ref #SPT-234 test composer audit --- .github/workflows/composer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index fd9e819..dc1710c 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,8 +22,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: [ 8.1, 8.2 ] - symfony: [ '6.4.*', '7.1.*' ] + php: [ 7.4, 8.0, 8.1, 8.2 ] + symfony: [ '5.3.*', '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*' '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 8e963c58b550145bee8f5f0c21feeccab85fa6b1 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 13:32:07 +0700 Subject: [PATCH 08/40] ref #SPT-234 empty From dd859b6a96e8b56aac80db71e6979a68d859b3cb Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 13:34:29 +0700 Subject: [PATCH 09/40] ref #SPT-234 test composer audit --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index dc1710c..3c5f496 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: php: [ 7.4, 8.0, 8.1, 8.2 ] - symfony: [ '5.3.*', '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*' '7.1.*', '7.2.*' ] + symfony: [ '5.3.*', '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 31b6913f8ccd89f20550af3488ea6c073bdc6e4f Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 14:02:00 +0700 Subject: [PATCH 10/40] ref #SPT-234 fix CI --- .github/workflows/composer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 3c5f496..4395acd 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: php: [ 7.4, 8.0, 8.1, 8.2 ] - symfony: [ '5.3.*', '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] + symfony: [ '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 @@ -39,6 +39,6 @@ jobs: SYMFONY_REQUIRE: ${{ matrix.symfony }} uses: ramsey/composer-install@v2 with: - composer-options: --optimize-autoloader + composer-options: --optimize-autoloader --no-dev dependency-versions: "highest" - run: composer audit \ No newline at end of file From ed3269a8e632dbd0140e358419d3e16b5d32826e Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 14:06:47 +0700 Subject: [PATCH 11/40] ref #SPT-234 fix CI --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 4395acd..9e7e6b6 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: php: [ 7.4, 8.0, 8.1, 8.2 ] - symfony: [ '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] + symfony: [ '5.3.*', '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From b71582e73d28ad724918c2bac2db8815f388ef14 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 14:39:23 +0700 Subject: [PATCH 12/40] ref #SPT-234 empty From b13c821f754936de7dd95da78ae9f03c80ca101a Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 14:50:54 +0700 Subject: [PATCH 13/40] ref #SPT-234 fix CI --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 9e7e6b6..3c5f496 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -39,6 +39,6 @@ jobs: SYMFONY_REQUIRE: ${{ matrix.symfony }} uses: ramsey/composer-install@v2 with: - composer-options: --optimize-autoloader --no-dev + composer-options: --optimize-autoloader dependency-versions: "highest" - run: composer audit \ No newline at end of file From 1620f2d9443864a2276a3d1d6bc0f3592de7ca4a Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:01:20 +0700 Subject: [PATCH 14/40] ref #SPT-234 test CI --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index edb8c43..7400b79 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "require-dev": { "symfony/http-client": "^5.3|^5.4|^6.0|^7.0", "symfony/var-dumper": "^5.3|^5.4|^6.0|^7.0", - "friendsofphp/php-cs-fixer": "^3.64", + "friendsofphp/php-cs-fixer": "*", "vimeo/psalm": "^5.23", "psalm/plugin-symfony": "^5.1", "guzzlehttp/guzzle": "^7.7" From 9dfc6a7a41e7a5e6aef1d68683ef60e0842eb9ea Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:04:13 +0700 Subject: [PATCH 15/40] ref #SPT-234 test CI --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7400b79..ea7a1b0 100644 --- a/composer.json +++ b/composer.json @@ -45,8 +45,8 @@ "symfony/http-client": "^5.3|^5.4|^6.0|^7.0", "symfony/var-dumper": "^5.3|^5.4|^6.0|^7.0", "friendsofphp/php-cs-fixer": "*", - "vimeo/psalm": "^5.23", - "psalm/plugin-symfony": "^5.1", + "vimeo/psalm": "*", + "psalm/plugin-symfony": "*", "guzzlehttp/guzzle": "^7.7" }, "config": { From c491c8597c268afc9c76975f9f903d8a235239da Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:06:45 +0700 Subject: [PATCH 16/40] ref #SPT-234 empty From 34b9c1d76095f161330005c5722fdd4613364e33 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:21:39 +0700 Subject: [PATCH 17/40] ref #SPT-234F test CI --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 3c5f496..e3df6f3 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: php: [ 7.4, 8.0, 8.1, 8.2 ] - symfony: [ '5.3.*', '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] + symfony: [ '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From ac5e8561463df120d7e61733b3232448751c6803 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:24:36 +0700 Subject: [PATCH 18/40] ref #SPT-234F test CI --- .github/workflows/composer.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index e3df6f3..d81dcc9 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,7 +22,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: [ 7.4, 8.0, 8.1, 8.2 ] +# php: [ 7.4, 8.0, 8.1, 8.2 ] + php: [ 8.0, 8.1, 8.2 ] symfony: [ '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 697bd1155b7640b636b11e475d0479ed2b478687 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:26:46 +0700 Subject: [PATCH 19/40] ref #SPT-234F test CI --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index d81dcc9..db538a3 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: # php: [ 7.4, 8.0, 8.1, 8.2 ] - php: [ 8.0, 8.1, 8.2 ] + php: [ 8.2 ] symfony: [ '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 85894b55ac158589be30fe8f6a0623fbc3737e17 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:29:34 +0700 Subject: [PATCH 20/40] ref #SPT-234F test CI --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index db538a3..fd0449b 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -24,7 +24,7 @@ jobs: matrix: # php: [ 7.4, 8.0, 8.1, 8.2 ] php: [ 8.2 ] - symfony: [ '5.4.*', '6.0.*', '6.1.*', '6.2.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] + symfony: [ '5.4.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 4e56ab9775b9b7f2ffa684f6880327ee0c8748f6 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:30:51 +0700 Subject: [PATCH 21/40] ref #SPT-234F test CI --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index fd0449b..15fc806 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -24,7 +24,7 @@ jobs: matrix: # php: [ 7.4, 8.0, 8.1, 8.2 ] php: [ 8.2 ] - symfony: [ '5.4.*', '6.3.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] + symfony: [ '5.4.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 854cec94b8ddf179969082f4a6075e973a2c67e6 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:32:14 +0700 Subject: [PATCH 22/40] ref #SPT-234F test CI --- .github/workflows/composer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 15fc806..2dc429b 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -24,7 +24,7 @@ jobs: matrix: # php: [ 7.4, 8.0, 8.1, 8.2 ] php: [ 8.2 ] - symfony: [ '5.4.*', '6.4.*', '7.0.*', '7.1.*', '7.2.*' ] + symfony: [ '5.4.*', '6.4.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 2337428900266400626b89d903a22538c1ee74e2 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 15:33:28 +0700 Subject: [PATCH 23/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 2dc429b..e8d14c3 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,8 +22,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: -# php: [ 7.4, 8.0, 8.1, 8.2 ] - php: [ 8.2 ] + php: [ 7.4, 8.0, 8.1, 8.2 ] symfony: [ '5.4.*', '6.4.*', '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From fdd1bdbbc1efdc5945fc33d5ddb4b685fe4c9148 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:14:11 +0700 Subject: [PATCH 24/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index e8d14c3..3a2df7a 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,8 +22,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: [ 7.4, 8.0, 8.1, 8.2 ] - symfony: [ '5.4.*', '6.4.*', '7.1.*', '7.2.*' ] + include: + - php: [ 7.4, 8.0, 8.1, 8.2 ] + symfony: [ '5.4.*', '6.4.*', ] + - php: [ 8.2 ] + symfony: [ '7.1.*', '7.2.*' ] + steps: - uses: actions/checkout@v3.3.0 From 5f34e973cc7019debf5b48e81fa6f726536393f3 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:21:34 +0700 Subject: [PATCH 25/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 3a2df7a..003616e 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,11 +22,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - include: - - php: [ 7.4, 8.0, 8.1, 8.2 ] - symfony: [ '5.4.*', '6.4.*', ] - - php: [ 8.2 ] - symfony: [ '7.1.*', '7.2.*' ] + - php: [ 7.4, 8.0, 8.1, 8.2 ] + symfony: [ '5.4.*', '6.4.*', ] + - php: [ 8.2 ] + symfony: [ '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From 02629e147c4a9cf6d2add4147a310054894dbada Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:24:09 +0700 Subject: [PATCH 26/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 003616e..7b4fcaf 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,10 +22,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - - php: [ 7.4, 8.0, 8.1, 8.2 ] - symfony: [ '5.4.*', '6.4.*', ] - - php: [ 8.2 ] - symfony: [ '7.1.*', '7.2.*' ] + - matrix.php: [ 7.4, 8.0, 8.1, 8.2 ] + matrix.symfony: [ '5.4.*', '6.4.*', ] + - matrix.php: [ 8.2 ] + matrix.symfony: [ '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From cc6aa298706993026919971c5222855be175cca0 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:25:14 +0700 Subject: [PATCH 27/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 7b4fcaf..ab84f1a 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -21,11 +21,10 @@ jobs: composer-audit: runs-on: ubuntu-latest strategy: - matrix: - - matrix.php: [ 7.4, 8.0, 8.1, 8.2 ] - matrix.symfony: [ '5.4.*', '6.4.*', ] - - matrix.php: [ 8.2 ] - matrix.symfony: [ '7.1.*', '7.2.*' ] + - matrix.php: [ 7.4, 8.0, 8.1, 8.2 ] + matrix.symfony: [ '5.4.*', '6.4.*', ] + - matrix.php: [ 8.2 ] + matrix.symfony: [ '7.1.*', '7.2.*' ] steps: - uses: actions/checkout@v3.3.0 From ac3d34bd506798f0635a1841981f7f94951d6e62 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:52:46 +0700 Subject: [PATCH 28/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index ab84f1a..61b0430 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -21,10 +21,15 @@ jobs: composer-audit: runs-on: ubuntu-latest strategy: - - matrix.php: [ 7.4, 8.0, 8.1, 8.2 ] - matrix.symfony: [ '5.4.*', '6.4.*', ] - - matrix.php: [ 8.2 ] - matrix.symfony: [ '7.1.*', '7.2.*' ] + matrix: + [ + { php: 7.4, symfony: '5.4.*' }, { php: 7.4, symfony: '6.4.*' }, + { php: 8.0, symfony: '5.4.*' }, { php: 8.0, symfony: '6.4.*' }, + { php: 8.1, symfony: '5.4.*' }, { php: 8.1, symfony: '6.4.*' }, + { php: 8.2, symfony: '5.4.*' }, { php: 8.2, symfony: '6.4.*' }, + { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.1.*' }, + { php: 8.2, symfony: '7.2.*' }, { php: 8.2, symfony: '7.2.*' }, + ] steps: - uses: actions/checkout@v3.3.0 From 59f73cabb246360e91279e4b986c3957fdf4ff67 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:54:31 +0700 Subject: [PATCH 29/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 61b0430..4f84c91 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - [ + data: [ { php: 7.4, symfony: '5.4.*' }, { php: 7.4, symfony: '6.4.*' }, { php: 8.0, symfony: '5.4.*' }, { php: 8.0, symfony: '6.4.*' }, { php: 8.1, symfony: '5.4.*' }, { php: 8.1, symfony: '6.4.*' }, @@ -37,13 +37,13 @@ jobs: - name: Install Infrastructure uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} + php-version: ${{ matrix.data.php }} tools: composer:v2, flex coverage: none - name: Install Dependence and audit env: - SYMFONY_REQUIRE: ${{ matrix.symfony }} + SYMFONY_REQUIRE: ${{ matrix.data.symfony }} uses: ramsey/composer-install@v2 with: composer-options: --optimize-autoloader From 1207f496c0f4e62ee2fd79b87d5fecea3ea9ee6a Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:56:57 +0700 Subject: [PATCH 30/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 4f84c91..21aa483 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -27,8 +27,8 @@ jobs: { php: 8.0, symfony: '5.4.*' }, { php: 8.0, symfony: '6.4.*' }, { php: 8.1, symfony: '5.4.*' }, { php: 8.1, symfony: '6.4.*' }, { php: 8.2, symfony: '5.4.*' }, { php: 8.2, symfony: '6.4.*' }, - { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.1.*' }, - { php: 8.2, symfony: '7.2.*' }, { php: 8.2, symfony: '7.2.*' }, + { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.2.*' }, + { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.2.*' }, ] steps: From e8581a53617828fe48d69ba3efb421c195da94bb Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 16:58:21 +0700 Subject: [PATCH 31/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 21aa483..c0e2daa 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -27,6 +27,7 @@ jobs: { php: 8.0, symfony: '5.4.*' }, { php: 8.0, symfony: '6.4.*' }, { php: 8.1, symfony: '5.4.*' }, { php: 8.1, symfony: '6.4.*' }, { php: 8.2, symfony: '5.4.*' }, { php: 8.2, symfony: '6.4.*' }, + { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.2.*' }, { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.2.*' }, ] From 9f25eb2b907b5320510035c91b9c82d56c81ae8e Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 17:37:30 +0700 Subject: [PATCH 32/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index c0e2daa..75990f3 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -23,13 +23,19 @@ jobs: strategy: matrix: data: [ - { php: 7.4, symfony: '5.4.*' }, { php: 7.4, symfony: '6.4.*' }, - { php: 8.0, symfony: '5.4.*' }, { php: 8.0, symfony: '6.4.*' }, - { php: 8.1, symfony: '5.4.*' }, { php: 8.1, symfony: '6.4.*' }, - { php: 8.2, symfony: '5.4.*' }, { php: 8.2, symfony: '6.4.*' }, + { symfony: '5.4.*', php: 7.4 }, + { symfony: '5.4.*', php: 8.0 }, + { symfony: '5.4.*', php: 8.1 }, + { symfony: '5.4.*', php: 8.2 }, - { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.2.*' }, - { php: 8.2, symfony: '7.1.*' }, { php: 8.2, symfony: '7.2.*' }, + { symfony: '6.4.*', php: 7.4 }, + { symfony: '6.4.*', php: 8.0 }, + { 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: From 0ddaf9d2eae941ed0a719a11b00244555a6eb532 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 17:48:10 +0700 Subject: [PATCH 33/40] ref #SPT-234 test CI --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ea7a1b0..9228ee7 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "brick/phonenumber": "^0.4|^0.5|^0.6" }, "require-dev": { - "symfony/http-client": "^5.3|^5.4|^6.0|^7.0", + "symfony/http-client": "*", "symfony/var-dumper": "^5.3|^5.4|^6.0|^7.0", "friendsofphp/php-cs-fixer": "*", "vimeo/psalm": "*", From a294e812adcea9e2ef790011eb63981f89b29e18 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 17:52:03 +0700 Subject: [PATCH 34/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 75990f3..16f76e5 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -28,7 +28,6 @@ jobs: { symfony: '5.4.*', php: 8.1 }, { symfony: '5.4.*', php: 8.2 }, - { symfony: '6.4.*', php: 7.4 }, { symfony: '6.4.*', php: 8.0 }, { symfony: '6.4.*', php: 8.1 }, { symfony: '6.4.*', php: 8.2 }, From 3f9dbb2945f218bec8f5fe7925177eeb7a1530cc Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 17:52:54 +0700 Subject: [PATCH 35/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 16f76e5..f039aa5 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -28,7 +28,6 @@ jobs: { symfony: '5.4.*', php: 8.1 }, { symfony: '5.4.*', php: 8.2 }, - { symfony: '6.4.*', php: 8.0 }, { symfony: '6.4.*', php: 8.1 }, { symfony: '6.4.*', php: 8.2 }, From 6533bd78be7ca736ac66cca9fb2da133e2e5d2c5 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 17:56:40 +0700 Subject: [PATCH 36/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index f039aa5..53aade9 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,19 +22,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - 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: '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: '6.4.*', php: 8.1 }, + { symfony: '6.4.*', php: 8.2 }, - { symfony: '7.1.*', php: 8.2 }, + { symfony: '7.1.*', php: 8.2 }, - { symfony: '7.2.*', php: 8.2 }, - ] + { symfony: '7.2.*', php: 8.2 }, steps: - uses: actions/checkout@v3.3.0 @@ -42,13 +40,13 @@ jobs: - name: Install Infrastructure uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.data.php }} + php-version: ${{ matrix.php }} tools: composer:v2, flex coverage: none - name: Install Dependence and audit env: - SYMFONY_REQUIRE: ${{ matrix.data.symfony }} + SYMFONY_REQUIRE: ${{ matrix.symfony }} uses: ramsey/composer-install@v2 with: composer-options: --optimize-autoloader From 5c3ba688e746afd5c226b0f86d4c20e6082e04cd Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 17:57:36 +0700 Subject: [PATCH 37/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 53aade9..ecd8690 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,17 +22,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - { 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: '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: '6.4.*', php: 8.1 }, + { symfony: '6.4.*', php: 8.2 }, - { symfony: '7.1.*', php: 8.2 }, + { symfony: '7.1.*', php: 8.2 }, - { symfony: '7.2.*', php: 8.2 }, + { symfony: '7.2.*', php: 8.2 }, + ] steps: - uses: actions/checkout@v3.3.0 From 0556e2a789ce5b539f683a07b7d18c810275ec66 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 17:58:16 +0700 Subject: [PATCH 38/40] ref #SPT-234 test CI --- .github/workflows/composer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index ecd8690..f039aa5 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - [ + data: [ { symfony: '5.4.*', php: 7.4 }, { symfony: '5.4.*', php: 8.0 }, { symfony: '5.4.*', php: 8.1 }, @@ -42,13 +42,13 @@ jobs: - name: Install Infrastructure uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} + php-version: ${{ matrix.data.php }} tools: composer:v2, flex coverage: none - name: Install Dependence and audit env: - SYMFONY_REQUIRE: ${{ matrix.symfony }} + SYMFONY_REQUIRE: ${{ matrix.data.symfony }} uses: ramsey/composer-install@v2 with: composer-options: --optimize-autoloader From 22366fd8b166e934387e0f3330a1411191842220 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 18:00:12 +0700 Subject: [PATCH 39/40] ref #SPT-234F revert composer.json from main --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 9228ee7..edb8c43 100644 --- a/composer.json +++ b/composer.json @@ -42,11 +42,11 @@ "brick/phonenumber": "^0.4|^0.5|^0.6" }, "require-dev": { - "symfony/http-client": "*", + "symfony/http-client": "^5.3|^5.4|^6.0|^7.0", "symfony/var-dumper": "^5.3|^5.4|^6.0|^7.0", - "friendsofphp/php-cs-fixer": "*", - "vimeo/psalm": "*", - "psalm/plugin-symfony": "*", + "friendsofphp/php-cs-fixer": "^3.64", + "vimeo/psalm": "^5.23", + "psalm/plugin-symfony": "^5.1", "guzzlehttp/guzzle": "^7.7" }, "config": { From e8b14067f09fec816d16f4275f7d66f293225f58 Mon Sep 17 00:00:00 2001 From: Dmitry Kaufman Date: Wed, 22 Jan 2025 18:09:32 +0700 Subject: [PATCH 40/40] ref #SPT-234 update composer.json --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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",