summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-doctrine-doctrine-bundle2.spec7
2 files changed, 7 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index 7aa7a5f..8c12796 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
},
"require-dev": {
"doctrine/coding-standard": "^9.0",
- "doctrine/orm": "^2.9 || ^3.0",
+ "doctrine/orm": "^2.10 || ^3.0",
"friendsofphp/proxy-manager-lts": "^1.0",
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.3 || ^10.0",
"psalm/plugin-phpunit": "^0.16.1",
@@ -66,7 +66,7 @@
}
},
"conflict": {
- "doctrine/orm": "<2.9|>=3.0",
+ "doctrine/orm": "<2.10|>=3.0",
"twig/twig": "<1.34|>=2.0,<2.4"
},
"suggest": {
diff --git a/php-doctrine-doctrine-bundle2.spec b/php-doctrine-doctrine-bundle2.spec
index 5af7203..cdc4625 100644
--- a/php-doctrine-doctrine-bundle2.spec
+++ b/php-doctrine-doctrine-bundle2.spec
@@ -13,8 +13,8 @@
%global github_owner doctrine
%global github_name DoctrineBundle
-%global github_version 2.5.7
-%global github_commit 1e0d1d7a5982eeebc37dcb4d77bb1a5c5961d96d
+%global github_version 2.6.0
+%global github_commit eca20633225fde77d042ecdac222bc9a5cb20f6a
%global major 2
%global composer_vendor doctrine
@@ -375,6 +375,9 @@ exit $RETURN_CODE
%changelog
+* Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.6.0-1
+- update to 2.6.0
+
* Mon Mar 7 2022 Remi Collet <remi@remirepo.net> - 2.5.7-1
- update to 2.5.7