diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 90a2aec..6b93814 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,17 +15,11 @@ jobs: strategy: matrix: include: - - php-version: 7.4 - symfony-version: 4.4.* - sonata-version: ^4.0 - - php-version: 8.0 - symfony-version: 5.4.* - sonata-version: ^4.0 - php-version: 8.1 - symfony-version: 6.1.* + symfony-version: 6.4.* sonata-version: ^4.0 - - php-version: 8.3 - symfony-version: 7.2.* + - php-version: 8.4 + symfony-version: 7.3.* sonata-version: ^4.0 steps: @@ -54,8 +48,8 @@ jobs: strategy: matrix: include: - - php-version: 8.1 - symfony-version: 6.1.* + - php-version: 8.4 + symfony-version: 7.3.* steps: - name: "Checkout" @@ -81,8 +75,8 @@ jobs: strategy: matrix: include: - - php-version: 8.1 - symfony-version: 6.1.* + - php-version: 8.4 + symfony-version: 7.3.* steps: - name: "Checkout" diff --git a/composer.json b/composer.json index 8172e5b..d235234 100644 --- a/composer.json +++ b/composer.json @@ -25,9 +25,9 @@ } }, "require": { - "php": "^7.4|^8.0", + "php": "^8.0", "sonata-project/admin-bundle": "^4.0", - "symfony/workflow": "^4.4|^5.0|^6.0|^7.0" + "symfony/workflow": "^6.0|^7.0" }, "require-dev": { "phpunit/phpunit": "^9.5", diff --git a/phpcs.xml.dist b/phpcs.xml.dist index b25a8a1..705c0f6 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -15,7 +15,11 @@ - + + + + + diff --git a/src/Admin/Extension/WorkflowExtension.php b/src/Admin/Extension/WorkflowExtension.php index 4e9260e..f5fd65e 100644 --- a/src/Admin/Extension/WorkflowExtension.php +++ b/src/Admin/Extension/WorkflowExtension.php @@ -107,7 +107,7 @@ public function getAccessMapping(AdminInterface $admin): array /** * @throws InvalidArgumentException */ - protected function getWorkflow(object $subject, string $workflowName = null): WorkflowInterface + protected function getWorkflow(object $subject, string|null $workflowName = null): WorkflowInterface { return $this->registry->get($subject, $workflowName); }