Skip to content

Commit

Permalink
Conflict broken DBAL 4 versions
Browse files Browse the repository at this point in the history
  • Loading branch information
michnovka authored and ogizanagi committed Oct 16, 2024
1 parent 503a7fb commit efe90d7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"require-dev": {
"ext-pdo_sqlite": "*",
"composer/semver": "^3.2",
"doctrine/dbal": "^3.8|^4.0",
"doctrine/dbal": "^3.8|^4.2",
"doctrine/doctrine-bundle": "^2.11",
"doctrine/orm": "^2.20|^3.0",
"phpstan/phpstan": "^1.10",
Expand All @@ -56,8 +56,12 @@
"symfony/phpunit-bridge": "^5.4.40|^6.4|^7.0",
"symfony/translation": "^5.4.40|^6.4|^7.0",
"symfony/var-dumper": "^5.4.40|^6.4|^7.0",
"symfony/var-exporter": "^5.4.40|^6.4|^7.0",
"symfony/yaml": "^5.4.40|^6.4|^7.0"
},
"conflict": {
"doctrine/dbal": ">=4.0,<4.2"
},
"extra": {
"branch-alias": {
"dev-2.x": "2.x-dev"
Expand Down
4 changes: 4 additions & 0 deletions tests/Fixtures/Integration/Symfony/config/config-64+.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ framework:
handle_all_throwables: true
php_errors:
log: true

doctrine:
orm:
enable_lazy_ghost_objects: true
1 change: 0 additions & 1 deletion tests/Fixtures/Integration/Symfony/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ doctrine:
orm:
auto_generate_proxy_classes: '%kernel.debug%'
report_fields_where_declared: true
enable_lazy_ghost_objects: true
controller_resolver:
auto_mapping: false

Expand Down

0 comments on commit efe90d7

Please sign in to comment.