From 9b66c2ebc8f5a3ff0a70fb6d8c9d550cf2515f41 Mon Sep 17 00:00:00 2001
From: Jordi Sala Morales <jordism91@gmail.com>
Date: Sat, 16 Oct 2021 08:46:18 +0200
Subject: [PATCH] Prepare release

---
 CHANGELOG.md                                       | 14 ++++++++++++++
 src/Command/MigrateToJsonTypeCommand.php           |  4 ++--
 .../ServiceProviderDataTransformer.php             |  4 ++--
 src/Twig/MediaRuntime.php                          |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e764ff65..af9bf4065 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.35.0](https://github.com/sonata-project/SonataMediaBundle/compare/3.34.2...3.35.0) - 2021-10-18
+### Deprecated
+- [[#2158](https://github.com/sonata-project/SonataMediaBundle/pull/2158)] Deprecated passing null value for the media parameter to twig functions ([@jordisala1991](https://github.com/jordisala1991))
+- [[#2159](https://github.com/sonata-project/SonataMediaBundle/pull/2159)] Deprecated `MigrateToJsonTypeCommand` ([@jordisala1991](https://github.com/jordisala1991))
+- [[#2159](https://github.com/sonata-project/SonataMediaBundle/pull/2159)] Deprecated `ServiceProviderDataTransformer` ([@jordisala1991](https://github.com/jordisala1991))
+
+### Fixed
+- [[#2171](https://github.com/sonata-project/SonataMediaBundle/pull/2171)] Docblock for `CategoryManagerInterface::getRootCategory()` to tell it can return `null` ([@phansys](https://github.com/phansys))
+- [[#2169](https://github.com/sonata-project/SonataMediaBundle/pull/2169)] Call to an undefined method `Connection::fetchAll()` when using `doctrine/dbal:3.x` ([@phansys](https://github.com/phansys))
+- [[#2166](https://github.com/sonata-project/SonataMediaBundle/pull/2166)] Fixed usage of deprecated custom twig tags ([@jordisala1991](https://github.com/jordisala1991))
+
+### Removed
+- [[#2169](https://github.com/sonata-project/SonataMediaBundle/pull/2169)] Support for `doctrine/dbal` < 2.11 ([@phansys](https://github.com/phansys))
+
 ## [3.34.2](https://github.com/sonata-project/SonataMediaBundle/compare/3.34.1...3.34.2) - 2021-10-08
 ### Fixed
 - [[#2152](https://github.com/sonata-project/SonataMediaBundle/pull/2152)] Fixed safe output of `sonata_media` and `sonata_thumbnail` functions ([@jordisala1991](https://github.com/jordisala1991))
diff --git a/src/Command/MigrateToJsonTypeCommand.php b/src/Command/MigrateToJsonTypeCommand.php
index af5e3aaef..cb549fb3e 100644
--- a/src/Command/MigrateToJsonTypeCommand.php
+++ b/src/Command/MigrateToJsonTypeCommand.php
@@ -23,7 +23,7 @@
 /**
  * NEXT_MAJOR: remove this file.
  *
- * @deprecated since sonata-project/media-bundle 3.x, to be removed in 4.0.
+ * @deprecated since sonata-project/media-bundle 3.35, to be removed in 4.0.
  */
 class MigrateToJsonTypeCommand extends BaseCommand
 {
@@ -51,7 +51,7 @@ public function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         @trigger_error(sprintf(
-            '%s is deprecated since sonata-project/media-bundle 3.x and will be removed'
+            '%s is deprecated since sonata-project/media-bundle 3.35 and will be removed'
             .' in version 4.0. Make sure you execute it to migrate to json type before upgrading to 4.0.',
             __CLASS__
         ), \E_USER_DEPRECATED);
diff --git a/src/Form/DataTransformer/ServiceProviderDataTransformer.php b/src/Form/DataTransformer/ServiceProviderDataTransformer.php
index 77d789ad0..ce9debfdd 100644
--- a/src/Form/DataTransformer/ServiceProviderDataTransformer.php
+++ b/src/Form/DataTransformer/ServiceProviderDataTransformer.php
@@ -23,7 +23,7 @@
 /**
  * NEXT_MAJOR: remove this file.
  *
- * @deprecated since sonata-project/media-bundle 3.x, to be removed in 4.0.
+ * @deprecated since sonata-project/media-bundle 3.35, to be removed in 4.0.
  */
 class ServiceProviderDataTransformer implements DataTransformerInterface, LoggerAwareInterface
 {
@@ -49,7 +49,7 @@ public function transform($value)
     public function reverseTransform($value)
     {
         @trigger_error(sprintf(
-            '%s is deprecated since sonata-project/media-bundle 3.x and will be removed'
+            '%s is deprecated since sonata-project/media-bundle 3.35 and will be removed'
             .' in version 4.0. Use %s instead.',
             __CLASS__,
             ProviderDataTransformer::class
diff --git a/src/Twig/MediaRuntime.php b/src/Twig/MediaRuntime.php
index 377b92a80..b7471a7de 100644
--- a/src/Twig/MediaRuntime.php
+++ b/src/Twig/MediaRuntime.php
@@ -149,7 +149,7 @@ private function getMedia($media): ?MediaInterface
             @trigger_error(
                 'Using SonataMediaBundle custom Twig functions with a media that is not'
                 .' the identifier of the media or the media itself is deprecated since'
-                .' sonata-project/media-bundle 3.x and will be removed in version 4.0.',
+                .' sonata-project/media-bundle 3.35 and will be removed in version 4.0.',
                 \E_USER_DEPRECATED
             );
             // throw new \TypeError(sprintf(