From bb9bf5a8badd54b0225c119ea29bea85635d2cf5 Mon Sep 17 00:00:00 2001 From: Sonata CI Date: Tue, 12 Nov 2019 03:15:06 +0100 Subject: [PATCH 1/3] DevKit updates (#651) --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 053728b1..b1d61ea6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,21 +39,21 @@ env: matrix: fast_finish: true include: - - php: '7.4snapshot' + - php: '7.3' env: TARGET=docs - - php: '7.4snapshot' + - php: '7.3' env: TARGET=lint - php: '7.1' env: COMPOSER_FLAGS="--prefer-lowest" - - php: '7.4snapshot' + - php: '7.3' env: SYMFONY=3.4.* - - php: '7.4snapshot' + - php: '7.3' env: SYMFONY='dev-master as 3.4.x-dev' - - php: '7.4snapshot' + - php: '7.3' env: SONATA_CORE=3.* - - php: '7.4snapshot' + - php: '7.3' env: SONATA_CORE='dev-master as 3.x-dev' - - php: '7.4snapshot' + - php: '7.3' env: SYMFONY_DEPRECATIONS_HELPER=0 allow_failures: - php: 7.4snapshot From cfe4b06031691789eecc7d1564cc80cbf56cff8e Mon Sep 17 00:00:00 2001 From: Sonata CI Date: Tue, 19 Nov 2019 02:25:06 +0100 Subject: [PATCH 2/3] DevKit updates (#656) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b9ef4f8..f47a8cbe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -683,7 +683,7 @@ Before releasing anything, it is best to reduce the gap between branches: Before abandoning it, the legacy branch MUST receive a last patch version. Likewise, the stable branch MUST receive a last version if that version is minor, -it SHOULD receive one is that version is a patch version. +it SHOULD receive one if that version is a patch version. #### Creating the new stable branch and files From e169c14fff15da42b595d4eb0de078dc33072983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 24 Nov 2019 14:05:23 +0100 Subject: [PATCH 3/3] 3.18.2 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b128aa45..00d6207e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.18.2](https://github.com/sonata-project/SonataBlockBundle/compare/3.18.1...3.18.2) - 2019-11-24 +### Fixed +- Make cache optional again + ## [3.18.1](https://github.com/sonata-project/SonataBlockBundle/compare/3.18.0...3.18.1) - 2019-09-19 ### Changed - Replaced deprecated EngineInterface