From fa7b7431688acdc5445f0d4391ac8f1fba0f7a66 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Mar 2021 09:56:02 +0100 Subject: update to 4.4.20 --- composer.json | 30 +++++++++++++++++----- php-symfony4.spec | 11 +++++--- src/Symfony/Bridge/PhpUnit/composer.json | 2 +- src/Symfony/Bridge/Twig/composer.json | 1 + src/Symfony/Bundle/FrameworkBundle/composer.json | 1 + src/Symfony/Component/Cache/composer.json | 6 ++--- .../Component/DependencyInjection/composer.json | 2 +- src/Symfony/Component/HttpClient/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- src/Symfony/Component/Messenger/composer.json | 2 +- src/Symfony/Component/Translation/composer.json | 2 +- 11 files changed, 43 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index c228650..63108b1 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,22 @@ "homepage": "https://symfony.com/contributors" } ], + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/cache-implementation": "1.0|2.0", + "psr/container-implementation": "1.0", + "psr/event-dispatcher-implementation": "1.0", + "psr/http-client-implementation": "1.0", + "psr/link-implementation": "1.0", + "psr/log-implementation": "1.0", + "psr/simple-cache-implementation": "1.0", + "symfony/cache-implementation": "1.0|2.0", + "symfony/event-dispatcher-implementation": "1.1", + "symfony/http-client-implementation": "1.1|2.0", + "symfony/service-implementation": "1.0|2.0", + "symfony/translation-implementation": "1.0|2.0" + }, "require": { "php": ">=7.1.3", "ext-xml": "*", @@ -22,7 +38,7 @@ "doctrine/event-manager": "~1.0", "doctrine/persistence": "^1.3|^2", "twig/twig": "^1.43|^2.13|^3.0.4", - "psr/cache": "~1.0", + "psr/cache": "^1.0|^2.0", "psr/container": "^1.0", "psr/link": "^1.0", "psr/log": "~1.0", @@ -156,11 +172,13 @@ "repositories": [ { "type": "path", - "url": "src/Symfony/Contracts" + "url": "src/Symfony/Contracts", + "options": { + "versions": { + "symfony/contracts": "1.1.x-dev" + } + } } ], - "minimum-stability": "dev", - "extra": { - "branch-version": "4.4" - } + "minimum-stability": "dev" } diff --git a/php-symfony4.spec b/php-symfony4.spec index a51e2ed..f5a5102 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.19 -%global github_commit c2c71dee2c322a4079120d819a5b3b60a96e4b6f +%global github_version 4.4.20 +%global github_commit fb90227d34531b06c01f1450c0c490fbf3fd7a8e %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor symfony @@ -70,7 +70,9 @@ # conflicts: "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2" %global phpdocumentor_reflection_docblock_min_ver 3.2.2 %global phpdocumentor_reflection_docblock_max_ver 6 -# "psr/cache": "~1.0" +# symfony/cache: "psr/cache": "^1.0|^2.0" +# symfony/http-kernel: "psr/cache": "^1.0|^2.0|^3.0" +# Only v1 is packaged %global psr_cache_min_ver 1.0 %global psr_cache_max_ver 2.0 # "psr/container": "^1.0" @@ -3301,6 +3303,9 @@ exit $RET # ############################################################################## %changelog +* Mon Mar 8 2021 Remi Collet - 4.4.20-1 +- update to 4.4.20 + * Thu Jan 28 2021 Remi Collet - 4.4.19-1 - update to 4.4.19 - drop dependency on ocramius/proxy-manager diff --git a/src/Symfony/Bridge/PhpUnit/composer.json b/src/Symfony/Bridge/PhpUnit/composer.json index 24ec521..54cb26c 100644 --- a/src/Symfony/Bridge/PhpUnit/composer.json +++ b/src/Symfony/Bridge/PhpUnit/composer.json @@ -1,7 +1,7 @@ { "name": "symfony/phpunit-bridge", "type": "symfony-bridge", - "description": "Symfony PHPUnit Bridge", + "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "keywords": [], "homepage": "https://symfony.com", "license": "MIT", diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 72ebca5..6878052 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -29,6 +29,7 @@ "symfony/form": "^4.4.17", "symfony/http-foundation": "^4.3|^5.0", "symfony/http-kernel": "^4.4", + "symfony/intl": "^4.4|^5.0", "symfony/mime": "^4.3|^5.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "^3.4|^4.0|^5.0", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 72baafd..f592065 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -49,6 +49,7 @@ "symfony/messenger": "^4.4|^5.0", "symfony/mime": "^4.4|^5.0", "symfony/process": "^3.4|^4.0|^5.0", + "symfony/security-core": "^3.4|^4.4|^5.2", "symfony/security-csrf": "^3.4|^4.0|^5.0", "symfony/security-http": "^3.4|^4.0|^5.0", "symfony/serializer": "^4.4|^5.0", diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json index b812a8e..87a2607 100644 --- a/src/Symfony/Component/Cache/composer.json +++ b/src/Symfony/Component/Cache/composer.json @@ -16,13 +16,13 @@ } ], "provide": { - "psr/cache-implementation": "1.0", + "psr/cache-implementation": "1.0|2.0", "psr/simple-cache-implementation": "1.0", - "symfony/cache-implementation": "1.0" + "symfony/cache-implementation": "1.0|2.0" }, "require": { "php": ">=7.1.3", - "psr/cache": "~1.0", + "psr/cache": "^1.0|^2.0", "psr/log": "~1.0", "symfony/cache-contracts": "^1.1.7|^2", "symfony/service-contracts": "^1.1|^2", diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 4000cb4..deb1b27 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -40,7 +40,7 @@ }, "provide": { "psr/container-implementation": "1.0", - "symfony/service-implementation": "1.0" + "symfony/service-implementation": "1.0|2.0" }, "autoload": { "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" }, diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json index b66b184..a620906 100644 --- a/src/Symfony/Component/HttpClient/composer.json +++ b/src/Symfony/Component/HttpClient/composer.json @@ -18,7 +18,7 @@ "php-http/async-client-implementation": "*", "php-http/client-implementation": "*", "psr/http-client-implementation": "1.0", - "symfony/http-client-implementation": "1.1" + "symfony/http-client-implementation": "1.1|2.0" }, "require": { "php": ">=7.1.3", diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 0094dc5..a2fa2a0 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -41,7 +41,7 @@ "symfony/templating": "^3.4|^4.0|^5.0", "symfony/translation": "^4.2|^5.0", "symfony/translation-contracts": "^1.1|^2", - "psr/cache": "~1.0", + "psr/cache": "^1.0|^2.0|^3.0", "twig/twig": "^1.43|^2.13|^3.0.4" }, "provide": { diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index ce11172..df2876b 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -23,7 +23,7 @@ "require-dev": { "doctrine/dbal": "^2.6|^3.0", "doctrine/persistence": "^1.3|^2", - "psr/cache": "~1.0", + "psr/cache": "^1.0|^2.0|^3.0", "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", diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index e58a7be..fbc0846 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -38,7 +38,7 @@ "symfony/yaml": "<3.4" }, "provide": { - "symfony/translation-implementation": "1.0" + "symfony/translation-implementation": "1.0|2.0" }, "suggest": { "symfony/config": "", -- cgit