Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Symfony 7 #1780

Merged
merged 9 commits into from
Dec 4, 2023
Merged

Allow Symfony 7 #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
816d620
Allow Symfony 7
jordisala1991 Nov 28, 2023
697cd73
Test with Symfony 7
jordisala1991 Nov 28, 2023
6bf2292
Allow Doctrine Test Bundle 8.0
jordisala1991 Nov 28, 2023
d312d86
Allow Symfony Dep Injection Test 5.0
jordisala1991 Nov 28, 2023
43ea40f
Enable savepoints
jordisala1991 Dec 4, 2023
4dec93d
Fix psalm
jordisala1991 Dec 4, 2023
a38ae47
Try with newer dbal version
jordisala1991 Dec 4, 2023
980bdfb
Try with only 8.0 of doctrine test bundle
jordisala1991 Dec 4, 2023
d259818
Revert up of doctrine dbal
jordisala1991 Dec 4, 2023
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
5 changes: 5 additions & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ jobs:
allowed-to-fail: false
symfony-require: 6.3.*
variant: symfony/symfony:"6.3.*"
- php-version: '8.2'
dmaicher marked this conversation as resolved.
Show resolved Hide resolved
dependencies: highest
allowed-to-fail: false
symfony-require: 7.0.*
variant: symfony/symfony:"7.0.*"

steps:
- name: Checkout
Expand Down
36 changes: 18 additions & 18 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@
"sonata-project/admin-bundle": "^4.18",
"sonata-project/exporter": "^2.0 || ^3.0",
"sonata-project/form-extensions": "^1.19 || ^2.0",
"symfony/config": "^5.4 || ^6.2",
"symfony/console": "^5.4 || ^6.2",
"symfony/dependency-injection": "^5.4 || ^6.2",
"symfony/doctrine-bridge": "^5.4 || ^6.2",
"symfony/form": "^5.4 || ^6.2",
"symfony/framework-bundle": "^5.4 || ^6.2",
"symfony/http-foundation": "^5.4 || ^6.2",
"symfony/http-kernel": "^5.4 || ^6.2",
"symfony/options-resolver": "^5.4 || ^6.2",
"symfony/property-access": "^5.4 || ^6.2",
"symfony/config": "^5.4 || ^6.2 || ^7.0",
"symfony/console": "^5.4 || ^6.2 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
"symfony/doctrine-bridge": "^5.4 || ^6.2 || ^7.0",
"symfony/form": "^5.4 || ^6.2 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
"symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
"symfony/options-resolver": "^5.4 || ^6.2 || ^7.0",
"symfony/property-access": "^5.4 || ^6.2 || ^7.0",
"symfony/security-acl": "^3.0",
"twig/twig": "^3.0"
},
"require-dev": {
"dama/doctrine-test-bundle": "^7.0",
"dama/doctrine-test-bundle": "^8.0",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"friendsofphp/php-cs-fixer": "^3.4",
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^5.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
Expand All @@ -62,13 +62,13 @@
"rector/rector": "^0.18",
"sonata-project/block-bundle": "^5.0",
"sonata-project/entity-audit-bundle": "^1.1",
"symfony/browser-kit": "^5.4 || ^6.2",
"symfony/css-selector": "^5.4 || ^6.2",
"symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
"symfony/css-selector": "^5.4 || ^6.2 || ^7.0",
"symfony/panther": "^2.0.1",
"symfony/phpunit-bridge": "^6.2",
"symfony/templating": "^5.4 || ^6.2",
"symfony/uid": "^5.4 || ^6.2",
"symfony/yaml": "^5.4 || ^6.2",
"symfony/phpunit-bridge": "^6.2 || ^7.0",
"symfony/templating": "^5.4 || ^6.2 || ^7.0",
"symfony/uid": "^5.4 || ^6.2 || ^7.0",
"symfony/yaml": "^5.4 || ^6.2 || ^7.0",
"vimeo/psalm": "^5.7",
"weirdan/doctrine-psalm-plugin": "^2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
final class Configuration implements ConfigurationInterface
{
/**
* @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod
* @psalm-suppress UndefinedInterfaceMethod
*
* @see https://github.com/psalm/psalm-plugin-symfony/issues/174
*/
Expand Down
1 change: 1 addition & 0 deletions tests/App/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ parameters:
doctrine:
dbal:
url: "%env(resolve:DATABASE_URL)%"
use_savepoints: true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Enabled for: dmaicher/doctrine-test-bundle#249

They seem to be required for Doctrine Test Bundle but also enabled by default on DBAL 4 (deprecated not enabling them on DBAL 3)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah indeed I did not find any other way to have DBAL 4 compatibility 😕

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lowest build fails with: Doctrine\DBAL\ConnectionException: May not alter the nested transaction with savepoints behavior while a transaction is open.

I am trying to up a bit the DBAL version, but do you know if it is related to something else?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was more related to doctrine test bundle 7.0 not supporting the use of savepoints (I think), because now the build works using only 8.0

orm:
auto_generate_proxy_classes: true
auto_mapping: true
Expand Down