Skip to content

Commit

Permalink
Prepare for 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
soullivaneuh committed May 16, 2016
1 parent 125d24a commit 53850de
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Admin/AdminExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
namespace Sonata\AdminBundle\Admin;

@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.',
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 <[email protected]>
*/
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

## [3.x]

## [3.1.0](https://github.com/sonata-project/SonataAdminBundle/compare/3.0.0...3.1.0) - 2016-05-17
### Added
- Added AbstractAdmin, replacing Admin
- Added `BaseMapper::keys` method
Expand Down
2 changes: 1 addition & 1 deletion Twig/Extension/SonataAdminExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ protected function getTemplate(
} catch (\Twig_Error_Loader $e) {
@trigger_error(
'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',
E_USER_DEPRECATED
);
Expand Down
3 changes: 3 additions & 0 deletions UPGRADE-3.x.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
UPGRADE 3.x
===========

UPGRADE FROM 3.0 to 3.1
=======================

## Deprecated Admin class

The `Admin` class is deprecated. Use `AbstractAdmin` instead.
Expand Down

0 comments on commit 53850de

Please sign in to comment.