Merge pull request #173 from PrestaShop/develop

Merge `develop` into `master`
PrestaShop · Mar 26, 2024 · dfb8a06 · dfb8a06
2 parents 971251e + 789acf1
commit dfb8a06
Show file tree

Hide file tree

Showing 7 changed files with 515 additions and 641 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         "beberlei/doctrineextensions": "^1.3",
         "doctrine/doctrine-bundle": "^2.11",
         "doctrine/doctrine-migrations-bundle": "^3.3",
-        "doctrine/orm": "^2.17",
+        "doctrine/orm": "^3.1",
         "symfony/apache-pack": "^1.0",
         "symfony/console": "~7.0.0",
         "symfony/dotenv": "~7.0.0",
@@ -23,7 +23,7 @@
         "ergebnis/composer-normalize": "^2.41",
         "friendsofphp/php-cs-fixer": "^3.45",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^11.0",
         "symfony/browser-kit": "~7.0.0",
         "symfony/css-selector": "~7.0.0",
         "symfony/maker-bundle": "^1.52",