3.17.0

sonata-project · Aug 16, 2019 · 38619fa · 38619fa
1 parent d088a3d
commit 38619fa
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.17.0](https://github.com/sonata-project/SonataBlockBundle/compare/3.16.1...3.17.0) - 2019-08-16
+### Deprecated
+- "sonata.templating", "sonata.templating.locator" and "sonata.templating.name_parser" services;
+- `Sonata\BlockBundle\Templating\TwigEngine` and `Sonata\BlockBundle\Test\FakeTemplating` classes.
+
+### Fixed
+- Fixed validation of `EditableBlock`
+
 ## [3.16.1](https://github.com/sonata-project/SonataBlockBundle/compare/3.16.0...3.16.1) - 2019-08-05
 ### Added
 - Added support for PHPUnit 8 for provided `BlockServiceTestCase`

diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
@@ -1,18 +1,18 @@
 UPGRADE 3.x
 ===========
 
-UPGRADE FROM 3.12 to 3.x
-=======================
+UPGRADE FROM 3.12 to 3.17
+=========================
 
 ## Autoregister blocks
 
 All blocks tagged with `sonata.block` will now be autoregistered into the `sonata.block.loader.service`.
 
 You can still override the block configuration with `sonata_block.blocks`, e.g. to change the contexts.
 
-## Deprecate block assets 
+## Deprecate block assets
 
-Deprecated `BlockServiceInterface::getJavascripts` and `BlockServiceInterface::getStylesheets`. 
+Deprecated `BlockServiceInterface::getJavascripts` and `BlockServiceInterface::getStylesheets`.
 Move your block assets to the template.
 
 
@@ -39,7 +39,7 @@ UPGRADE FROM 3.2 to 3.3
 
 ## Menu blocks
 
-Menus for the `MenuBlockService` can now be defined by a `<tag name="sonata.block.menu"/>` tag. 
+Menus for the `MenuBlockService` can now be defined by a `<tag name="sonata.block.menu"/>` tag.
 Defining the blocks via `sonata_block.menus` is deprecated.
 
 ## Inject blocks

diff --git a/src/Block/Service/AbstractBlockService.php b/src/Block/Service/AbstractBlockService.php
@@ -182,15 +182,15 @@ public function getName()
     /**
      * NEXT_MAJOR: Remove this method.
      *
-     * @deprecated since sonata-project/block-bundle 3.x
+     * @deprecated since sonata-project/block-bundle 3.17
      */
     public function getTemplating()
     {
         $class = 'c' === static::class[0] && 0 === strpos(static::class, "class@anonymous\0") ? get_parent_class(static::class).'@anonymous' : static::class;
 
         @trigger_error(
             sprintf(
-                'Method %s::%s() is deprecated since sonata-project/block-bundle 3.x and will be removed as of version 4.0.',
+                'Method %s::%s() is deprecated since sonata-project/block-bundle 3.17 and will be removed as of version 4.0.',
                 $class,
                 __FUNCTION__
             ),

diff --git a/src/Resources/config/core.xml b/src/Resources/config/core.xml
@@ -4,17 +4,17 @@
         <service id="sonata.templating.locator" class="Sonata\BlockBundle\Templating\TemplateLocator">
             <argument type="service" id="file_locator"/>
             <argument>%kernel.cache_dir%</argument>
-            <deprecated>The "%service_id%" service is deprecated since sonata-project/block-bundle 3.x and will be removed in version 4.0.</deprecated>
+            <deprecated>The "%service_id%" service is deprecated since sonata-project/block-bundle 3.17 and will be removed in version 4.0.</deprecated>
         </service>
         <service id="sonata.templating.name_parser" class="Sonata\BlockBundle\Templating\TemplateNameParser">
             <argument type="service" id="kernel"/>
-            <deprecated>The "%service_id%" service is deprecated since sonata-project/block-bundle 3.x and will be removed in version 4.0.</deprecated>
+            <deprecated>The "%service_id%" service is deprecated since sonata-project/block-bundle 3.17 and will be removed in version 4.0.</deprecated>
         </service>
         <service id="sonata.templating" class="Sonata\BlockBundle\Templating\TwigEngine">
             <argument type="service" id="twig"/>
             <argument type="service" id="sonata.templating.name_parser"/>
             <argument type="service" id="sonata.templating.locator"/>
-            <deprecated>The "%service_id%" service is deprecated since sonata-project/block-bundle 3.x and will be removed in version 4.0.</deprecated>
+            <deprecated>The "%service_id%" service is deprecated since sonata-project/block-bundle 3.17 and will be removed in version 4.0.</deprecated>
         </service>
         <service id="sonata.block.manager" class="Sonata\BlockBundle\Block\BlockServiceManager" public="true">
             <argument type="service" id="service_container"/>

diff --git a/src/Test/FakeTemplating.php b/src/Test/FakeTemplating.php
@@ -17,7 +17,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 @trigger_error(
-    'The '.__NAMESPACE__.'\FakeTemplating class is deprecated since 3.x '.
+    'The '.__NAMESPACE__.'\FakeTemplating class is deprecated since 3.17 '.
     'and will be removed in version 4.0.',
     E_USER_DEPRECATED
 );
@@ -27,7 +27,7 @@
  *
  * NEXT_MAJOR: Remove this class.
  *
- * @deprecated since sonata-project/block-bundle 3.x, will be removed in version 4.0.
+ * @deprecated since sonata-project/block-bundle 3.17, will be removed in version 4.0.
  *
  * @author Thomas Rabaix <[email protected]>
  */

diff --git a/tests/Test/FakeTemplatingTest.php b/tests/Test/FakeTemplatingTest.php
@@ -19,7 +19,7 @@
 /**
  * NEXT_MAJOR: Remove this class.
  *
- * @deprecated since sonata-project/block-bundle 3.x, will be removed in version 4.0.
+ * @deprecated since sonata-project/block-bundle 3.17, will be removed in version 4.0.
  */
 final class FakeTemplatingTest extends TestCase
 {