From 88a16600e31ff44a9f7011d8fe99955c8021a74c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Feb 2022 09:58:43 +0100 Subject: update to 2.5.6 --- composer.json | 4 ++-- php-doctrine-doctrine-bundle2.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index bcae79c..7aa7a5f 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "php": "^7.1 || ^8.0", "doctrine/annotations": "^1", "doctrine/cache": "^1.11 || ^2.0", - "doctrine/dbal": "^2.13.1|^3.1", + "doctrine/dbal": "^2.13.1|^3.3.2", "doctrine/persistence": "^2.2", "doctrine/sql-formatter": "^1.0.1", "symfony/cache": "^4.3.3|^5.0|^6.0", @@ -66,7 +66,7 @@ } }, "conflict": { - "doctrine/orm": "<2.9", + "doctrine/orm": "<2.9|>=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 0df0487..7598547 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.5 -%global github_commit 5c086cbbe5327937dd6f90da075f7d421b0f28bc +%global github_version 2.5.6 +%global github_commit f1423b2a640b6ac545b6e0c02575427a4dc1e9dc %global major 2 %global composer_vendor doctrine @@ -28,7 +28,7 @@ # "doctrine/cache": "^1.11|^2.0" %global cache_min_ver 1.11 %global cache_max_ver 3 -# "doctrine/dbal": "^2.13.1|^3.1" +# "doctrine/dbal": "^2.13.1|^3.3.2" %global dbal_min_ver 2.13.1 %global dbal_max_ver 4 # "doctrine/persistence": "^2.2", @@ -375,6 +375,9 @@ exit $RETURN_CODE %changelog +* Tue Feb 15 2022 Remi Collet - 2.5.6-1 +- update to 2.5.6 + * Thu Jan 6 2022 Remi Collet - 2.5.5-1 - update to 2.5.5 -- cgit