Skip to content

Commit 53850de

Browse files
committed
Prepare for 3.1.0
1 parent 125d24a commit 53850de

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

Admin/AdminExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
namespace Sonata\AdminBundle\Admin;
1313

1414
@trigger_error(
15-
'The '.__NAMESPACE__.'\AdminExtension class is deprecated since version 3.x and will be removed in 4.0.'
15+
'The '.__NAMESPACE__.'\AdminExtension class is deprecated since version 3.1 and will be removed in 4.0.'
1616
.' Use '.__NAMESPACE__.'\AbstractAdminExtension instead.',
1717
E_USER_DEPRECATED
1818
);
1919

2020
/**
21-
* @deprecated since version 3.x, to be removed in 4.0. Use Sonata\AdminBundle\AbstractAdminExtension instead.
21+
* @deprecated since version 3.1, to be removed in 4.0. Use Sonata\AdminBundle\AbstractAdminExtension instead.
2222
*
2323
* @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
2424
*/

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [3.x]
6+
7+
## [3.1.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.0.0...3.1.0) - 2016-05-17
68
### Added
79
- Added AbstractAdmin, replacing Admin
810
- Added `BaseMapper::keys` method

Twig/Extension/SonataAdminExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ protected function getTemplate(
439439
} catch (\Twig_Error_Loader $e) {
440440
@trigger_error(
441441
'Relying on default template loading on field template loading exception '.
442-
'is deprecated since 3.x and will be removed in 4.0. '.
442+
'is deprecated since 3.1 and will be removed in 4.0. '.
443443
'A \Twig_Error_Loader exception will be thrown instead',
444444
E_USER_DEPRECATED
445445
);

UPGRADE-3.x.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
UPGRADE 3.x
22
===========
33

4+
UPGRADE FROM 3.0 to 3.1
5+
=======================
6+
47
## Deprecated Admin class
58

69
The `Admin` class is deprecated. Use `AbstractAdmin` instead.

0 commit comments

Comments
 (0)