diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | php-symfony4.spec | 11 | ||||
| -rw-r--r-- | src/Symfony/Bridge/Doctrine/composer.json | 4 | ||||
| -rw-r--r-- | src/Symfony/Component/Cache/composer.json | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/composer.json b/composer.json index da8e66b..1e73439 100644 --- a/composer.json +++ b/composer.json @@ -123,7 +123,7 @@ "doctrine/cache": "^1.6|^2.0", "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "doctrine/orm": "^2.6.3", "guzzlehttp/promises": "^1.4", "masterminds/html5": "^2.6", @@ -143,6 +143,7 @@ "twig/markdown-extra": "^2.12|^3" }, "conflict": { + "doctrine/dbal": "<2.7", "egulias/email-validator": "~3.0.0", "masterminds/html5": "<2.6", "monolog/monolog": ">=2", diff --git a/php-symfony4.spec b/php-symfony4.spec index 8617319..83fb1d4 100644 --- a/php-symfony4.spec +++ b/php-symfony4.spec @@ -13,8 +13,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 4.4.30 -%global github_commit 7f3a52493554912a2a8df0cd71d6f4d5b6f519ed +%global github_version 4.4.32 +%global github_commit 70674a2bd2e08f357d8bb98642fa47273d7f8940 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor symfony @@ -45,8 +45,8 @@ # ignore max version %global doctrine_datafixtures_min_ver 1.1 %global doctrine_datafixtures_max_ver 2 -# "doctrine/dbal": "^2.6|^3.0" -%global doctrine_dbal_min_ver 2.6 +# "doctrine/dbal": "^2.7|^3.0" +%global doctrine_dbal_min_ver 2.7 %global doctrine_dbal_max_ver 4 # "doctrine/doctrine-bundle": "^1.5|^2.0" %global doctrine_bundle_min_ver 1.5 @@ -3312,6 +3312,9 @@ exit $RET # ############################################################################## %changelog +* Tue Sep 28 2021 Remi Collet <remi@remirepo.net> - 4.4.32-1 +- update to 4.4.32 + * Thu Sep 2 2021 Remi Collet <remi@remirepo.net> - 4.4.30-1 - update to 4.4.30 diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 0da7703..7996103 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -43,10 +43,12 @@ "doctrine/annotations": "^1.10.4", "doctrine/collections": "~1.0", "doctrine/data-fixtures": "^1.1", - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "doctrine/orm": "^2.6.3" }, "conflict": { + "doctrine/dbal": "<2.7", + "doctrine/orm": "<2.6.3", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", "symfony/dependency-injection": "<3.4", "symfony/form": "<4.4", diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json index d71f216..72bd68f 100644 --- a/src/Symfony/Component/Cache/composer.json +++ b/src/Symfony/Component/Cache/composer.json @@ -33,7 +33,7 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "predis/predis": "^1.1", "psr/simple-cache": "^1.0", "symfony/config": "^4.2|^5.0", @@ -43,7 +43,7 @@ "symfony/var-dumper": "^4.4|^5.0" }, "conflict": { - "doctrine/dbal": "<2.6", + "doctrine/dbal": "<2.7", "symfony/dependency-injection": "<3.4", "symfony/http-kernel": "<4.4|>=5.0", "symfony/var-dumper": "<4.4" |