diff --git a/Admin/AdminInterface.php b/Admin/AdminInterface.php index 448c960c83..dfbfca3762 100644 --- a/Admin/AdminInterface.php +++ b/Admin/AdminInterface.php @@ -655,7 +655,7 @@ public function create($object); */ public function delete($object); -//TODO: uncomment this method for 3.0 +//TODO: uncomment this method for 4.0 // /** // * @param mixed $object // */ diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php index ce8814c4c7..005d5504fc 100644 --- a/Controller/CRUDController.php +++ b/Controller/CRUDController.php @@ -385,7 +385,7 @@ public function editAction($id = null) $form->handleRequest($request); if ($form->isSubmitted()) { - //TODO: remove this check for 3.0 + //TODO: remove this check for 4.0 if (method_exists($this->admin, 'preValidate')) { $this->admin->preValidate($object); } @@ -670,7 +670,7 @@ public function createAction() $form->handleRequest($request); if ($form->isSubmitted()) { - //TODO: remove this check for 3.0 + //TODO: remove this check for 4.0 if (method_exists($this->admin, 'preValidate')) { $this->admin->preValidate($object); } diff --git a/Controller/CoreController.php b/Controller/CoreController.php index 3978397aca..4a0b3892b3 100644 --- a/Controller/CoreController.php +++ b/Controller/CoreController.php @@ -144,7 +144,7 @@ public function searchAction(Request $request) * This method is compatible with both Symfony 2.3 and Symfony 3 * * @deprecated Use the Request action argument. This method will be removed - * in SonataAdminBundle 3.0 and the action methods adjusted. + * in SonataAdminBundle 4.0 and the action methods adjusted. * * @return Request */ diff --git a/Datagrid/ListMapper.php b/Datagrid/ListMapper.php index 494b0243af..fea767dc22 100644 --- a/Datagrid/ListMapper.php +++ b/Datagrid/ListMapper.php @@ -78,7 +78,7 @@ public function add($name, $type = null, array $fieldDescriptionOptions = array( // Change deprecated inline action "view" to "show" if ($name == '_action' && $type == 'actions') { if (isset($fieldDescriptionOptions['actions']['view'])) { - @trigger_error('Inline action "view" is deprecated since version 2.2.4 and will be removed in 3.0. Use inline action "show" instead.', E_USER_DEPRECATED); + @trigger_error('Inline action "view" is deprecated since version 2.2.4 and will be removed in 4.0. Use inline action "show" instead.', E_USER_DEPRECATED); $fieldDescriptionOptions['actions']['show'] = $fieldDescriptionOptions['actions']['view']; diff --git a/Resources/doc/cookbook/recipe_bootlint.rst b/Resources/doc/cookbook/recipe_bootlint.rst index 7bacbf00e1..0e598996b0 100644 --- a/Resources/doc/cookbook/recipe_bootlint.rst +++ b/Resources/doc/cookbook/recipe_bootlint.rst @@ -2,7 +2,7 @@ Bootlint ======== The admin comes with `Bootlint`_ integration -since version 2.4.0. Bootlint is an HTML linter for Bootstrap projects. +since version 3.0. Bootlint is an HTML linter for Bootstrap projects. You should use it when you want add some contributions on Sonata UI to check the eventual Twitter Bootstrap conventions' mistakes. diff --git a/Resources/doc/cookbook/recipe_customizing_a_mosaic_list.rst b/Resources/doc/cookbook/recipe_customizing_a_mosaic_list.rst index c2989a627d..4305020bd6 100644 --- a/Resources/doc/cookbook/recipe_customizing_a_mosaic_list.rst +++ b/Resources/doc/cookbook/recipe_customizing_a_mosaic_list.rst @@ -1,7 +1,7 @@ Customizing a mosaic list ========================= -Since version 2.4, the AdminBundle now include a mosaic list mode in order to have a more visual representation. +Since version 3.0, the AdminBundle now include a mosaic list mode in order to have a more visual representation. .. figure:: ../images/list_mosaic_default.png :align: center diff --git a/Resources/public/Admin.js b/Resources/public/Admin.js index c84e9a4e67..4e411b5058 100644 --- a/Resources/public/Admin.js +++ b/Resources/public/Admin.js @@ -138,10 +138,10 @@ var Admin = { }, /** - * @deprecated in version 2.4 + * @deprecated in version 3.0 */ add_pretty_errors: function() { - console.warn('Admin.add_pretty_errors() was deprecated in version 2.4'); + console.warn('Admin.add_pretty_errors() was deprecated in version 3.0'); }, stopEvent: function(event) { diff --git a/Util/AdminObjectAclData.php b/Util/AdminObjectAclData.php index c859fbf0b7..160ed80690 100644 --- a/Util/AdminObjectAclData.php +++ b/Util/AdminObjectAclData.php @@ -186,11 +186,11 @@ public function getMasks() * * @return AdminObjectAclData * - * @deprecated Deprecated since version 2.4. Use setAclUsersForm() instead. + * @deprecated Deprecated since version 3.0. Use setAclUsersForm() instead. */ public function setForm(Form $form) { - trigger_error('setForm() is deprecated since version 2.4. Use setAclUsersForm() instead.', E_USER_DEPRECATED); + trigger_error('setForm() is deprecated since version 3.0. Use setAclUsersForm() instead.', E_USER_DEPRECATED); return $this->setAclUsersForm($form); } @@ -200,11 +200,11 @@ public function setForm(Form $form) * * @return Form * - * @deprecated Deprecated since version 2.4. Use getAclUsersForm() instead. + * @deprecated Deprecated since version 3.0. Use getAclUsersForm() instead. */ public function getForm() { - trigger_error('getForm() is deprecated since version 2.4. Use getAclUsersForm() instead.', E_USER_DEPRECATED); + trigger_error('getForm() is deprecated since version 3.0. Use getAclUsersForm() instead.', E_USER_DEPRECATED); return $this->getAclUsersForm(); } diff --git a/Util/AdminObjectAclManipulator.php b/Util/AdminObjectAclManipulator.php index 330bf6d1ad..45bb03d208 100644 --- a/Util/AdminObjectAclManipulator.php +++ b/Util/AdminObjectAclManipulator.php @@ -68,11 +68,11 @@ public function getMaskBuilderClass() * * @return Form * - * @deprecated Deprecated since version 2.4. Use createAclUsersForm() instead. + * @deprecated Deprecated since version 3.0. Use createAclUsersForm() instead. */ public function createForm(AdminObjectAclData $data) { - trigger_error('createForm() is deprecated since version 2.4. Use createAclUsersForm() instead.', E_USER_DEPRECATED); + trigger_error('createForm() is deprecated since version 3.0. Use createAclUsersForm() instead.', E_USER_DEPRECATED); return $this->createAclUsersForm($data); } @@ -142,11 +142,11 @@ public function updateAclRoles(AdminObjectAclData $data) * * @param AdminObjectAclData $data * - * @deprecated Deprecated since version 2.4. Use updateAclUsers() instead. + * @deprecated Deprecated since version 3.0. Use updateAclUsers() instead. */ public function updateAcl(AdminObjectAclData $data) { - trigger_error('updateAcl() is deprecated since version 2.4. Use updateAclUsers() instead.', E_USER_DEPRECATED); + trigger_error('updateAcl() is deprecated since version 3.0. Use updateAclUsers() instead.', E_USER_DEPRECATED); $this->updateAclUsers($data); }