Skip to content

Commit dfb8a06

Browse files
authored
Merge pull request #173 from PrestaShop/develop
Merge `develop` into `master`
2 parents 971251e + 789acf1 commit dfb8a06

File tree

7 files changed

+515
-641
lines changed

7 files changed

+515
-641
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"beberlei/doctrineextensions": "^1.3",
1111
"doctrine/doctrine-bundle": "^2.11",
1212
"doctrine/doctrine-migrations-bundle": "^3.3",
13-
"doctrine/orm": "^2.17",
13+
"doctrine/orm": "^3.1",
1414
"symfony/apache-pack": "^1.0",
1515
"symfony/console": "~7.0.0",
1616
"symfony/dotenv": "~7.0.0",
@@ -23,7 +23,7 @@
2323
"ergebnis/composer-normalize": "^2.41",
2424
"friendsofphp/php-cs-fixer": "^3.45",
2525
"phpstan/phpstan": "^1.10",
26-
"phpunit/phpunit": "^10.5",
26+
"phpunit/phpunit": "^11.0",
2727
"symfony/browser-kit": "~7.0.0",
2828
"symfony/css-selector": "~7.0.0",
2929
"symfony/maker-bundle": "^1.52",

0 commit comments

Comments
 (0)