diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index a4cacd9..fe32e5d 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -11,24 +11,24 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '8.1', '8.2', '8.3' ] + php-versions: ['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') }} 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 --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/phpunit/phpunit/phpunit --verbose + run: vendor/phpunit/phpunit/phpunit diff --git a/composer.json b/composer.json index 1125314..af965a3 100644 --- a/composer.json +++ b/composer.json @@ -10,15 +10,15 @@ } ], "require": { - "php": "^8.1", - "api-platform/core": "^2.1 || ^3.0", - "doctrine/orm": "^3.0", - "doctrine/doctrine-bundle": "^1.6 || ^2.0", + "php": ">=8.4", + "api-platform/symfony": "^4.2", + "doctrine/orm": "^3.5", + "doctrine/doctrine-bundle": "^3.1", "symfony/translation": "*", "symfony/dependency-injection": "*" }, "require-dev": { - "phpunit/phpunit": "^9.5.2" + "phpunit/phpunit": "^10.5" }, "prefer-stable": true, "autoload": { 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();