Merge pull request #121 from Slamdunk/orm_v3

Add support for Doctrine ORM v3 and Doctrine DBAL v4
Roave · Feb 9, 2024 · f7d56b8 · f7d56b8
2 parents 4e07e5d + 4b445d7
commit f7d56b8
Show file tree

Hide file tree

Showing 30 changed files with 167 additions and 731 deletions.
diff --git a/Makefile b/Makefile
@@ -9,8 +9,8 @@ unit: ## run unit tests
 	vendor/bin/phpunit
 
 cs: ## verify code style rules
-	vendor/bin/phpcbf || true
-	vendor/bin/phpcs
+	vendor/bin/phpcbf -p || true
+	vendor/bin/phpcs -p
 
 static-analysis: ## verify that no static analysis issues were introduced
 	vendor/bin/psalm

diff --git a/composer.json b/composer.json
@@ -17,14 +17,12 @@
     "homepage": "https://github.com/Roave/psr-container-doctrine",
     "require": {
         "php": "~8.2.0 || ~8.3.0",
-        "doctrine/annotations": "^1.14.3 || ^2.0.1",
-        "doctrine/cache": "^2.2",
         "doctrine/common": "^3.4.3",
-        "doctrine/dbal": "^3.8.1",
-        "doctrine/event-manager": "^1.2.0 || ^2.0",
+        "doctrine/dbal": "^4.0",
+        "doctrine/event-manager": "^2",
         "doctrine/migrations": "^3.7.2",
-        "doctrine/orm": "^2.18.0",
-        "doctrine/persistence": "^2.5.7 || ^3.2",
+        "doctrine/orm": "^3.0",
+        "doctrine/persistence": "^3.2",
         "psr/cache": "^2.0.0 || ^3.0.0",
         "psr/container": "^1.1.2 || ^2.0.2"
     },