diff options
| author | Remi Collet <remi@remirepo.net> | 2020-01-03 10:22:59 +0100 | 
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-01-03 10:22:59 +0100 | 
| commit | 353dd726419caa2df7095e69e49f7f36f12cd0b5 (patch) | |
| tree | 11bbea74498097e71786bf655bc41d38d5c18255 | |
| parent | 146b72dfd5a6ef639fc68c14ac0532f29ead64d4 (diff) | |
update to 4.4.2
raise dependency on doctrine/persistence 1.3
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-symfony4.spec | 14 | ||||
| -rw-r--r-- | src/Symfony/Bridge/Doctrine/composer.json | 6 | ||||
| -rw-r--r-- | src/Symfony/Bundle/FrameworkBundle/composer.json | 1 | ||||
| -rw-r--r-- | src/Symfony/Component/Messenger/composer.json | 3 | 
5 files changed, 16 insertions, 10 deletions
diff --git a/composer.json b/composer.json index a8d1e6b..2b089d9 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@          "php": "^7.1.3",          "ext-xml": "*",          "doctrine/event-manager": "~1.0", -        "doctrine/persistence": "~1.0", +        "doctrine/persistence": "^1.3",          "twig/twig": "^1.41|^2.10|^3.0",          "psr/cache": "~1.0",          "psr/container": "^1.0", diff --git a/php-symfony4.spec b/php-symfony4.spec index e841c66..366f5d3 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.1 -%global github_commit    04863e4457b0a9b2a34b34fe53e7fd4f1203e1c0 +%global github_version   4.4.2 +%global github_commit    5973dacbd9587d9bf1234dfcb546c3cbdfbc4c9e  %global composer_vendor  symfony  %global composer_project symfony @@ -37,8 +37,8 @@  # "doctrine/event-manager": "~1.0"  %global doctrine_event_manager_min_ver 1.0  %global doctrine_event_manager_max_ver 2 -# "doctrine/persistence": "~1.0" -%global doctrine_persistence_min_ver 1.0 +# "doctrine/persistence": "^1.3" +%global doctrine_persistence_min_ver 1.3  %global doctrine_persistence_max_ver 2  # "doctrine/reflection": "~1.0"  %global doctrine_reflection_min_ver 1.0 @@ -141,7 +141,7 @@  Name:          php-%{composer_project}4  Version:       %{github_version} -Release:       2%{?github_prerelease:.%{github_prerelease}}%{?dist} +Release:       1%{?github_prerelease:.%{github_prerelease}}%{?dist}  Summary:       Symfony PHP framework (version 4)  # MIT and CC-BY-SA: @@ -3293,6 +3293,10 @@ exit $RET  # ##############################################################################  %changelog +* Fri Jan  3 2020 Remi Collet <remi@remirepo.net> - 4.4.2-1 +- update to 4.4.2 +- raise dependency on doctrine/persistence 1.3 +  * Mon Dec  2 2019 Remi Collet <remi@remirepo.net> - 4.4.1-2  - allow symfony/security-acl v3 diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 8c2d65c..64b21b4 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -18,7 +18,7 @@      "require": {          "php": "^7.1.3",          "doctrine/event-manager": "~1.0", -        "doctrine/persistence": "~1.0", +        "doctrine/persistence": "^1.3",          "symfony/polyfill-ctype": "~1.8",          "symfony/polyfill-mbstring": "~1.0",          "symfony/service-contracts": "^1.1|^2" @@ -35,7 +35,7 @@          "symfony/proxy-manager-bridge": "^3.4|^4.0|^5.0",          "symfony/security-core": "^4.4|^5.0",          "symfony/expression-language": "^3.4|^4.0|^5.0", -        "symfony/validator": "^4.4|^5.0", +        "symfony/validator": "^4.4.2|^5.0.2",          "symfony/var-dumper": "^3.4|^4.0|^5.0",          "symfony/translation": "^3.4|^4.0|^5.0",          "doctrine/annotations": "~1.7", @@ -53,7 +53,7 @@          "symfony/http-kernel": "<4.3.7",          "symfony/messenger": "<4.3",          "symfony/security-core": "<4.4", -        "symfony/validator": "<4.4" +        "symfony/validator": "<4.4.2|<5.0.2,>=5.0"      },      "suggest": {          "symfony/form": "", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 369789b..0e994e6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -64,6 +64,7 @@          "twig/twig": "^1.41|^2.10|^3.0"      },      "conflict": { +        "doctrine/persistence": "<1.3",          "phpdocumentor/reflection-docblock": "<3.0",          "phpdocumentor/type-resolver": "<0.2.1",          "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index c12ace1..1d247f4 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -22,7 +22,7 @@      "require-dev": {          "doctrine/dbal": "^2.6",          "psr/cache": "~1.0", -        "doctrine/persistence": "~1.0", +        "doctrine/persistence": "^1.3",          "symfony/console": "^3.4|^4.0|^5.0",          "symfony/dependency-injection": "^3.4.19|^4.1.8|^5.0",          "symfony/event-dispatcher": "^4.3|^5.0", @@ -35,6 +35,7 @@          "symfony/validator": "^3.4|^4.0|^5.0"      },      "conflict": { +        "doctrine/persistence": "<1.3",          "symfony/event-dispatcher": "<4.3",          "symfony/framework-bundle": "<4.4",          "symfony/http-kernel": "<4.4"  | 
