From 758dec536b1ef6c606301e49dcb1d8bdbb5cf597 Mon Sep 17 00:00:00 2001
From: Anatoliy Melnikau <amelnikov@aristeksystems.com>
Date: Wed, 15 Feb 2023 21:54:11 +0300
Subject: [PATCH 1/4] Fix PHPStan errors

---
 src/Service/Translator/TranslatorV6P0.php  | 3 +++
 tests/Unit/Service/Yaml/KeysParserTest.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Service/Translator/TranslatorV6P0.php b/src/Service/Translator/TranslatorV6P0.php
index 1fd0030..b9410f7 100644
--- a/src/Service/Translator/TranslatorV6P0.php
+++ b/src/Service/Translator/TranslatorV6P0.php
@@ -14,6 +14,9 @@ public function getCatalogue(string $locale = null): MessageCatalogueInterface
         return $this->getCatalogueInner($locale);
     }
 
+    /**
+     * @return MessageCatalogueInterface[]
+     */
     public function getCatalogues(): array
     {
         return $this->translator->getCatalogues();
diff --git a/tests/Unit/Service/Yaml/KeysParserTest.php b/tests/Unit/Service/Yaml/KeysParserTest.php
index 297f385..5949f26 100644
--- a/tests/Unit/Service/Yaml/KeysParserTest.php
+++ b/tests/Unit/Service/Yaml/KeysParserTest.php
@@ -14,7 +14,7 @@ final class KeysParserTest extends TestCase
     /**
      * @dataProvider getDataForTestGetOmittedKeys
      *
-     * @param string[] $expected
+     * @param array<string,array<string>> $expected
      * @param array<string,array<string>> $localesKeys
      */
     public function testGetOmittedKeys(array $expected, array $localesKeys): void

From 6cb46a345b9e8dff2c2fa2249ba708a23e337a9a Mon Sep 17 00:00:00 2001
From: Anatoliy Melnikau <amelnikov@aristeksystems.com>
Date: Wed, 15 Feb 2023 21:54:23 +0300
Subject: [PATCH 2/4] Update dependencies

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c7362d9..b1049aa 100644
--- a/composer.json
+++ b/composer.json
@@ -37,9 +37,10 @@
   "require-dev": {
     "aeliot-tm/phpunit-codecoverage-baseline": "^2.0",
     "dg/bypass-finals": "^1.1",
-    "friendsofphp/php-cs-fixer": "^3.8",
+    "friendsofphp/php-cs-fixer": "^2.19.3|^3.8",
     "phpstan/extension-installer": "^1.1",
     "phpstan/phpstan": "^1.8",
+    "phpstan/phpstan-phpunit": "^1.3",
     "phpstan/phpstan-symfony": "^1.2",
     "phpunit/phpunit": "^9.5",
     "symfony/dotenv": "^3.4|^4.0|5.0|^6.0",

From ee17c050017b08b52d9e1e9c9af06dfa7aceb84b Mon Sep 17 00:00:00 2001
From: Aeliot <5785276@gmail.com>
Date: Mon, 2 Dec 2024 18:52:54 +0300
Subject: [PATCH 3/4] CI: rename workflow

---
 .github/workflows/{php.yml => automated_testing.yaml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{php.yml => automated_testing.yaml} (99%)

diff --git a/.github/workflows/php.yml b/.github/workflows/automated_testing.yaml
similarity index 99%
rename from .github/workflows/php.yml
rename to .github/workflows/automated_testing.yaml
index 53e85cf..01ede0b 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/automated_testing.yaml
@@ -1,4 +1,4 @@
-name: PHP Composer
+name: Automated Testing
 
 on:
   push:

From ed3b3e7c93ac5f7959e8e0b19587a2559c58232e Mon Sep 17 00:00:00 2001
From: Aeliot <5785276@gmail.com>
Date: Mon, 2 Dec 2024 19:31:34 +0300
Subject: [PATCH 4/4] Change version of PHP used for PHP SC Fixer

---
 .github/workflows/automated_testing.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automated_testing.yaml b/.github/workflows/automated_testing.yaml
index 01ede0b..b6f00ff 100644
--- a/.github/workflows/automated_testing.yaml
+++ b/.github/workflows/automated_testing.yaml
@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: 'shivammathur/setup-php@v2'
         with:
-          php-version: '8.0'
+          php-version: 7.4
 
       - uses: actions/checkout@v3