Merge 33fe859 into cd23a18

sonata-project · Jan 27, 2020 · 9ab199d · 9ab199d
2 parents cd23a18 + 33fe859
commit 9ab199d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [3.14.0](https://github.com/sonata-project/SonataPageBundle/compare/3.13.0...3.14.0) - 2020-01-12
-Changelog
+## [3.15.0](https://github.com/sonata-project/SonataPageBundle/compare/3.14.0...3.15.0) - 2020-01-27
+### Changed
+- Re-allow SF DI>4.4.0
+- Upgrade matthiasnoback/symfony-dependency-injection-test to ^4.0
 
+## [3.14.0](https://github.com/sonata-project/SonataPageBundle/compare/3.13.0...3.14.0) - 2020-01-12
 ### Changed
 - `BlockInteractor` constructor's argument $registry is now an instance of
   `Doctrine\Persistence\ManagerRegistry`

diff --git a/src/Form/Type/PageTypeChoiceType.php b/src/Form/Type/PageTypeChoiceType.php
@@ -49,7 +49,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * NEXT_MAJOR: remove this method.
      *
-     * @deprecated since sonata-project/page-bundle 3.x, to be removed in version 4.0.
+     * @deprecated since sonata-project/page-bundle 3.14, to be removed in version 4.0.
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -85,7 +85,7 @@ public function getBlockPrefix()
     /**
      * NEXT_MAJOR: remove this method.
      *
-     * @deprecated since sonata-project/page-bundle 3.x, to be removed in version 4.0.
+     * @deprecated since sonata-project/page-bundle 3.14, to be removed in version 4.0.
      */
     public function getName()
     {

diff --git a/src/Form/Type/TemplateChoiceType.php b/src/Form/Type/TemplateChoiceType.php
@@ -49,7 +49,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * NEXT_MAJOR: remove this method.
      *
-     * @deprecated since sonata-project/page-bundle 3.x, to be removed in version 4.0.
+     * @deprecated since sonata-project/page-bundle 3.14, to be removed in version 4.0.
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -82,7 +82,7 @@ public function getBlockPrefix()
     /**
      * NEXT_MAJOR: remove this method.
      *
-     * @deprecated since sonata-project/page-bundle 3.x, to be removed in version 4.0.
+     * @deprecated since sonata-project/page-bundle 3.14, to be removed in version 4.0.
      */
     public function getName()
     {

diff --git a/src/Twig/Extension/PageExtension.php b/src/Twig/Extension/PageExtension.php
@@ -113,7 +113,7 @@ public function initRuntime(Environment $environment)
     /**
      * NEXT_MAJOR: remove this method.
      *
-     * @deprecated since sonata-project/page-bundle 3.x, to be removed in version 4.0.
+     * @deprecated since sonata-project/page-bundle 3.14, to be removed in version 4.0.
      */
     public function getName()
     {