瀏覽代碼

Prepare for 3.1.0

Sullivan SENECHAL 9 年之前
父節點
當前提交
53850de35e
共有 4 個文件被更改,包括 8 次插入3 次删除
  1. 2 2
      Admin/AdminExtension.php
  2. 2 0
      CHANGELOG.md
  3. 1 1
      Twig/Extension/SonataAdminExtension.php
  4. 3 0
      UPGRADE-3.x.md

+ 2 - 2
Admin/AdminExtension.php

@@ -12,13 +12,13 @@
 namespace Sonata\AdminBundle\Admin;
 namespace Sonata\AdminBundle\Admin;
 
 
 @trigger_error(
 @trigger_error(
-    'The '.__NAMESPACE__.'\AdminExtension class is deprecated since version 3.x and will be removed in 4.0.'
+    'The '.__NAMESPACE__.'\AdminExtension class is deprecated since version 3.1 and will be removed in 4.0.'
     .' Use '.__NAMESPACE__.'\AbstractAdminExtension instead.',
     .' Use '.__NAMESPACE__.'\AbstractAdminExtension instead.',
     E_USER_DEPRECATED
     E_USER_DEPRECATED
 );
 );
 
 
 /**
 /**
- * @deprecated since version 3.x, to be removed in 4.0. Use Sonata\AdminBundle\AbstractAdminExtension instead.
+ * @deprecated since version 3.1, to be removed in 4.0. Use Sonata\AdminBundle\AbstractAdminExtension instead.
  *
  *
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
  */
  */

+ 2 - 0
CHANGELOG.md

@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
 ## [3.x]
 ## [3.x]
+
+## [3.1.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.0.0...3.1.0) - 2016-05-17
 ### Added
 ### Added
 - Added AbstractAdmin, replacing Admin
 - Added AbstractAdmin, replacing Admin
 - Added `BaseMapper::keys` method
 - Added `BaseMapper::keys` method

+ 1 - 1
Twig/Extension/SonataAdminExtension.php

@@ -439,7 +439,7 @@ EOT;
         } catch (\Twig_Error_Loader $e) {
         } catch (\Twig_Error_Loader $e) {
             @trigger_error(
             @trigger_error(
                 'Relying on default template loading on field template loading exception '.
                 'Relying on default template loading on field template loading exception '.
-                'is deprecated since 3.x and will be removed in 4.0. '.
+                'is deprecated since 3.1 and will be removed in 4.0. '.
                 'A \Twig_Error_Loader exception will be thrown instead',
                 'A \Twig_Error_Loader exception will be thrown instead',
                 E_USER_DEPRECATED
                 E_USER_DEPRECATED
             );
             );

+ 3 - 0
UPGRADE-3.x.md

@@ -1,6 +1,9 @@
 UPGRADE 3.x
 UPGRADE 3.x
 ===========
 ===========
 
 
+UPGRADE FROM 3.0 to 3.1
+=======================
+
 ## Deprecated Admin class
 ## Deprecated Admin class
 
 
 The `Admin` class is deprecated. Use `AbstractAdmin` instead.
 The `Admin` class is deprecated. Use `AbstractAdmin` instead.