From f29262c4cdeb8931a4c17c02dbbdc4fb59c454c6 Mon Sep 17 00:00:00 2001 From: Yanick Witschi Date: Sat, 23 Nov 2019 11:43:34 +0100 Subject: [PATCH 1/3] Added Symfony 5 compat --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e747080..b562d32 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": "^7.1", "ext-json": "*", "imagine/imagine": "^0.7.1 || ^1.0", - "symfony/filesystem": "^2.8 || ^3.0 || ^4.0", + "symfony/filesystem": "^2.8 || ^3.0 || ^4.0 || ^5.0", "webmozart/path-util": "^2.0" }, "conflict": { @@ -25,7 +25,7 @@ "php-coveralls/php-coveralls": "^2.1", "phpstan/phpstan-phpunit": "^0.10", "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/console": "^4.3", + "symfony/console": "^4.3 || ^5.0", "symfony/phpunit-bridge": "^4.3.4" }, "suggest": { From b3134bbbd1964874bc6d5f2cb1210c812201cc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Auswo=CC=88ger?= Date: Mon, 25 Nov 2019 16:04:33 +0100 Subject: [PATCH 2/3] Symfony 5 compat --- .appveyor.yml | 1 - composer.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7cec2a8..b8ffa4a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,7 +18,6 @@ init: - SET COMPOSER_NO_INTERACTION=1 - SET PHP=0 - SET ANSICON=121x90 (121x90) - - SET SYMFONY_DEPRECATIONS_HELPER=weak_vendors install: - IF EXIST %PHPCI_CACHE% (SET PHP=1) diff --git a/composer.json b/composer.json index b562d32..6ca1c61 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "phpstan/phpstan-phpunit": "^0.10", "phpunit/phpunit": "^7.5 || ^8.0", "symfony/console": "^4.3 || ^5.0", - "symfony/phpunit-bridge": "^4.3.4" + "symfony/phpunit-bridge": "^4.3.4 || ^5.0" }, "suggest": { "ext-exif": "To support EXIF auto-rotation" From efa59410b99ffa23935bc5b3b859bd068c34c983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Auswo=CC=88ger?= Date: Mon, 25 Nov 2019 16:16:54 +0100 Subject: [PATCH 3/3] Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eeb246..f029996 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] + * Compatibility with Symfony 5. [#62] * Fix rounding errors of important part values. [#60] ## [1.0.0] (2019-08-08) @@ -120,6 +121,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm [0.2.0]: https://github.com/contao/image/compare/0.1.0...0.2.0 [0.1.0]: https://github.com/contao/image/commits/0.1.0 +[#62]: https://github.com/contao/image/issues/62 [#60]: https://github.com/contao/image/issues/60 [#57]: https://github.com/contao/image/issues/57 [#56]: https://github.com/contao/image/issues/56