From f17b13fe961d14593aa844db1450c7da7143c94d Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 14:07:59 +0530 Subject: [PATCH 01/12] Dependency version update --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 1125314..0731fc9 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ ], "require": { "php": "^8.1", - "api-platform/core": "^2.1 || ^3.0", - "doctrine/orm": "^3.0", - "doctrine/doctrine-bundle": "^1.6 || ^2.0", + "api-platform/core": "^2.1 || ^3.0 || ^4.2", + "doctrine/orm": "^3.0 || ^3.5", + "doctrine/doctrine-bundle": "^1.6 || ^2.0 || ^3.1", "symfony/translation": "*", "symfony/dependency-injection": "*" }, From dd6359c71ea87d93c57d88fbdc55619e6232c071 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 14:18:18 +0530 Subject: [PATCH 02/12] Dependency version update --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 0731fc9..2e8d9a7 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ ], "require": { "php": "^8.1", - "api-platform/core": "^2.1 || ^3.0 || ^4.2", - "doctrine/orm": "^3.0 || ^3.5", - "doctrine/doctrine-bundle": "^1.6 || ^2.0 || ^3.1", + "api-platform/symfony": "^4.2", + "doctrine/orm": "^3.5", + "doctrine/doctrine-bundle": "^3.1", "symfony/translation": "*", "symfony/dependency-injection": "*" }, From 18553c8c497189439c5e162e89ffab9c69ee69fa Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 14:55:37 +0530 Subject: [PATCH 03/12] Dependency version update --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2e8d9a7..72dd30f 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^8.1", + "php": ">=8.2", "api-platform/symfony": "^4.2", "doctrine/orm": "^3.5", "doctrine/doctrine-bundle": "^3.1", From 36a3d9c57fa05fad4df2d5695bf1e971d39d4736 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 15:21:33 +0530 Subject: [PATCH 04/12] Remove deprecation warnings --- src/DependencyInjection/ApiPlatformTranslationExtension.php | 2 +- src/Translation/Translator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DependencyInjection/ApiPlatformTranslationExtension.php b/src/DependencyInjection/ApiPlatformTranslationExtension.php index bfe70cc..7eeb7d8 100644 --- a/src/DependencyInjection/ApiPlatformTranslationExtension.php +++ b/src/DependencyInjection/ApiPlatformTranslationExtension.php @@ -7,7 +7,7 @@ use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\Extension\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Translation/Translator.php b/src/Translation/Translator.php index cc5e408..cc1c849 100644 --- a/src/Translation/Translator.php +++ b/src/Translation/Translator.php @@ -22,7 +22,7 @@ public function __construct( /** * {@inheritdoc} */ - public function trans($id, array $parameters = [], string $domain = null, string $locale = null): string + public function trans($id, array $parameters = [], ?string $domain = null, ?string $locale = null): string { if ($locale === null) { $locale = $this->loadCurrentLocale(); From d2a274e49e5bc3b043eecfceb25aef8f2fa97728 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 15:52:08 +0530 Subject: [PATCH 05/12] Workflow changes --- .github/workflows/phpunit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index a4cacd9..e2a6164 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -11,17 +11,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '8.1', '8.2', '8.3' ] + php-versions: ['8.2', '8.3', '8.4', '8.5'] steps: - uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Copy .env.test.local run: php -r "file_exists('.env.test.local') || copy('.env.test', '.env.test.local');" - name: Cache Composer packages id: composer-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: vendor key: ${{ runner.os }}-php-${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }} From 7e474700c28d1ac688c96dc062c9d0defd839187 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 15:59:28 +0530 Subject: [PATCH 06/12] Workflow changes --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index e2a6164..bbc24c8 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['8.2', '8.3', '8.4', '8.5'] + php-versions: ['8.2', '8.3'] steps: - uses: shivammathur/setup-php@v2 with: From 126dfcd47c32b0d19b7b36a84df5e4c286e06a37 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 16:05:09 +0530 Subject: [PATCH 07/12] Workflow changes --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index bbc24c8..5df97c7 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -28,7 +28,7 @@ jobs: restore-keys: | ${{ runner.os }}-php- - name: Install Dependencies - run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist + run: composer install --no-interaction --no-scripts --prefer-dist -vvv - name: Create Database run: | mkdir -p data From 50d943c44352c5e4300fed44b52852ad2f690225 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 16:07:32 +0530 Subject: [PATCH 08/12] Workflow changes --- .github/workflows/phpunit.yml | 2 +- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 5df97c7..70fb8de 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['8.2', '8.3'] + php-versions: ['8.4', '8.5'] steps: - uses: shivammathur/setup-php@v2 with: diff --git a/composer.json b/composer.json index 72dd30f..af965a3 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": ">=8.2", + "php": ">=8.4", "api-platform/symfony": "^4.2", "doctrine/orm": "^3.5", "doctrine/doctrine-bundle": "^3.1", @@ -18,7 +18,7 @@ "symfony/dependency-injection": "*" }, "require-dev": { - "phpunit/phpunit": "^9.5.2" + "phpunit/phpunit": "^10.5" }, "prefer-stable": true, "autoload": { From 1e535ad68a8efaf18158bb63292c4311f3e347b2 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 16:09:31 +0530 Subject: [PATCH 09/12] Workflow changes --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 70fb8de..42ba131 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -36,4 +36,4 @@ jobs: - name: Execute tests (Unit and Feature tests) via PHPUnit env: DATABASE_URL: sqlite:///%kernel.project_dir%/data/database.sqlite - run: vendor/phpunit/phpunit/phpunit --verbose + run: vendor/phpunit/phpunit/phpunit --display-details=always From 45de9919a37fd0650c7fbdf2d514a3f30ee9d4c6 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 16:12:30 +0530 Subject: [PATCH 10/12] Workflow changes --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 42ba131..bb509b0 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -36,4 +36,4 @@ jobs: - name: Execute tests (Unit and Feature tests) via PHPUnit env: DATABASE_URL: sqlite:///%kernel.project_dir%/data/database.sqlite - run: vendor/phpunit/phpunit/phpunit --display-details=always + run: vendor/bin/phpunit --display From c93f9de86227c7eba9c4ff81828df1364605c087 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 16:19:40 +0530 Subject: [PATCH 11/12] Workflow changes --- .github/workflows/phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index bb509b0..614569a 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -28,7 +28,7 @@ jobs: restore-keys: | ${{ runner.os }}-php- - name: Install Dependencies - run: composer install --no-interaction --no-scripts --prefer-dist -vvv + run: composer install --no-interaction --prefer-dist - name: Create Database run: | mkdir -p data @@ -36,4 +36,4 @@ jobs: - name: Execute tests (Unit and Feature tests) via PHPUnit env: DATABASE_URL: sqlite:///%kernel.project_dir%/data/database.sqlite - run: vendor/bin/phpunit --display + run: vendor/bin/phpunit --testdox --colors=always From 16c7cc8bdc12f5022dde423755005187ae967ac7 Mon Sep 17 00:00:00 2001 From: Nirav Ranpara Date: Tue, 9 Dec 2025 16:20:26 +0530 Subject: [PATCH 12/12] Workflow changes --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 614569a..fe32e5d 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -36,4 +36,4 @@ jobs: - name: Execute tests (Unit and Feature tests) via PHPUnit env: DATABASE_URL: sqlite:///%kernel.project_dir%/data/database.sqlite - run: vendor/bin/phpunit --testdox --colors=always + run: vendor/phpunit/phpunit/phpunit