3.5.0

sonata-project · Oct 25, 2017 · e9722f2 · e9722f2
1 parent 978f0cf
commit e9722f2
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 7 deletions.
diff --git a/Block/Service/MenuBlockService.php b/Block/Service/MenuBlockService.php
@@ -38,7 +38,7 @@ class MenuBlockService extends AbstractAdminBlockService
      *
      * @var array
      *
-     * @deprecated since 3.x, to be removed in 4.0
+     * @deprecated since 3.3, to be removed in 4.0
      */
     protected $menus;
 
@@ -64,7 +64,7 @@ public function __construct($name, EngineInterface $templating, MenuProviderInte
             $this->menuRegistry = $menuRegistry;
         } else {
             @trigger_error(
-                'Initializing '.__CLASS__.' with an array parameter is deprecated since 3.x and will be removed in 4.0.',
+                'Initializing '.__CLASS__.' with an array parameter is deprecated since 3.3 and will be removed in 4.0.',
                 E_USER_DEPRECATED
             );
             $this->menus = $menuRegistry;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.5.0](https://github.com/sonata-project/SonataBlockBundle/compare/3.4.0...3.5.0) - 2017-10-25
+### Added
+- support for sonata/cache 2
+
+### Deprecated
+- Option resolver BC trick.
+
+### Fixed
+- OutOfBoundsException while replacing block service default name argument
+
+### Removed
+- Support for old versions of PHP and Symfony.
+
 ## [3.4.0](https://github.com/sonata-project/SonataBlockBundle/compare/3.3.2...3.4.0) - 2017-09-19
 ### Added
 - added block annotation

diff --git a/DependencyInjection/Compiler/TweakCompilerPass.php b/DependencyInjection/Compiler/TweakCompilerPass.php
@@ -46,7 +46,7 @@ public function process(ContainerBuilder $container)
             )) {
                 // NEXT_MAJOR: Remove deprecation notice
                 @trigger_error(
-                    sprintf('Using service id %s different from block id %s is deprecated since 3.x and will be removed in 4.0.', $id, $arguments[0]),
+                    sprintf('Using service id %s different from block id %s is deprecated since 3.3 and will be removed in 4.0.', $id, $arguments[0]),
                     E_USER_DEPRECATED
                 );
             }

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -168,7 +168,7 @@ public function getConfigTreeBuilder()
                         ->always(function ($value) {
                             if (count($value) > 0) {
                                 @trigger_error(
-                                    'The menus configuration key is deprecated since 3.x and will be removed in 4.0.',
+                                    'The menus configuration key is deprecated since 3.3 and will be removed in 4.0.',
                                     E_USER_DEPRECATED
                                 );
                             }

diff --git a/Menu/MenuRegistry.php b/Menu/MenuRegistry.php
@@ -39,7 +39,7 @@ public function __construct($menus = null)
             $this->names = $menus;
 
             @trigger_error(
-                'The menus parameter in '.__CLASS__.' is deprecated since 3.x and will be removed in 4.0.',
+                'The menus parameter in '.__CLASS__.' is deprecated since 3.3 and will be removed in 4.0.',
                 E_USER_DEPRECATED
             );
         }

diff --git a/Resources/stubs/symfony2.php b/Resources/stubs/symfony2.php
@@ -13,7 +13,7 @@
 
 if (!interface_exists('Symfony\Component\OptionsResolver\OptionsResolverInterface')) {
     /**
-     * @deprecated since 3.x, to be removed in 4.0. Use \Symfony\Component\OptionsResolver\OptionsResolver instead.
+     * @deprecated since 3.5, to be removed in 4.0. Use \Symfony\Component\OptionsResolver\OptionsResolver instead.
      */
     interface OptionsResolverInterface
     {

diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
@@ -1,6 +1,9 @@
 UPGRADE 3.x
 ===========
 
+UPGRADE FROM 3.4 to 3.5
+=======================
+
 ## Deprecated options resolver BC tricks.
 
 Since we require at least Symfony 2.8, this BC trick is not needed anymore.

diff --git a/Util/OptionsResolver.php b/Util/OptionsResolver.php
@@ -14,7 +14,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
- * @deprecated since version 3.x, to be removed in 4.0. Use \Symfony\Component\OptionsResolver\OptionsResolver instead.
+ * @deprecated since version 3.5, to be removed in 4.0. Use \Symfony\Component\OptionsResolver\OptionsResolver instead.
  */
 class OptionsResolver extends \Symfony\Component\OptionsResolver\OptionsResolver implements OptionsResolverInterface
 {