Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@

<rule ref="Generic.PHP.ForbiddenFunctions">
<properties>
<property name="forbiddenFunctions" type="array" value="dump=>null,var_dump=>null,die=>null"/>
<property name="forbiddenFunctions" type="array">
<element key="dump" value="null"/>
<element key="var_dump" value="null"/>
<element key="die" value="null"/>
</property>
</properties>
</rule>

Expand Down
2 changes: 1 addition & 1 deletion src/Admin/Extension/WorkflowExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading