Merge pull request #4144 from greg0ire/next_major

Next major

Admin/AbstractAdmin.php

@@ -3066,7 +3066,7 @@ EOT;
      }
 
     /**
-     * DEPRECATED: Use configureTabMenu instead.
+     * NEXT_MAJOR: remove this method.
      *
      * @param MenuItemInterface $menu
      * @param                   $action

Admin/Admin.php

@@ -18,6 +18,8 @@ namespace Sonata\AdminBundle\Admin;
 );
 
 /**
+ * NEXT_MAJOR: remove this class.
+ *
  * @deprecated since version 3.1, to be removed in 4.0. Use Sonata\AdminBundle\AbstractAdmin instead
  *
  * @author  Thomas Rabaix <thomas.rabaix@sonata-project.org>

Admin/AdminExtension.php

@@ -18,6 +18,8 @@ namespace Sonata\AdminBundle\Admin;
 );
 
 /**
+ * NEXT_MAJOR: remove this class.
+ *
  * @deprecated since version 3.1, to be removed in 4.0. Use Sonata\AdminBundle\AbstractAdminExtension instead
  *
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>

Admin/AdminExtensionInterface.php

@@ -56,6 +56,8 @@ interface AdminExtensionInterface
     /**
      * DEPRECATED: Use configureTabMenu instead.
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @param AdminInterface    $admin
      * @param MenuItemInterface $menu
      * @param string            $action

Admin/AdminHelper.php

@@ -79,6 +79,8 @@ class AdminHelper
     }
 
     /**
+     * NEXT_MAJOR: remove this method.
+     *
      * @deprecated
      *
      * @param string $code
@@ -219,6 +221,8 @@ class AdminHelper
     /**
      * Camelize a string.
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @static
      *
      * @param string $property

Admin/AdminInterface.php

@@ -735,6 +735,8 @@ interface AdminInterface
     public function hasSubject();
 
     /**
+     * NEXT_MAJOR: remove this method.
+     *
      * @param ErrorElement $errorElement
      * @param mixed        $object
      *
@@ -976,7 +978,7 @@ interface AdminInterface
     public function getTranslationLabel($label, $context = '', $type = '');
 
     /**
-     * DEPRECATED: Use buildTabMenu instead.
+     * NEXT_MAJOR: remove this method.
      *
      * @param string         $action
      * @param AdminInterface $childAdmin

Admin/BaseFieldDescription.php

@@ -417,6 +417,8 @@ abstract class BaseFieldDescription implements FieldDescriptionInterface
     /**
      * Camelize a string.
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @static
      *
      * @param string $property

Controller/CoreController.php

@@ -120,6 +120,8 @@ class CoreController extends Controller
      *
      * This method is compatible with both Symfony 2.3 and Symfony 3
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @deprecated Use the Request action argument. This method will be removed
      *             in SonataAdminBundle 4.0 and the action methods adjusted
      *

Export/Exporter.php

@@ -14,6 +14,8 @@ namespace Sonata\AdminBundle\Export;
 use Sonata\CoreBundle\Exporter\Exporter as BaseExporter;
 
 /**
+ * NEXT_MAJOR: remove this class.
+ *
  * @deprecated
  */
 class Exporter extends BaseExporter

Form/Type/Filter/ChoiceType.php

@@ -31,6 +31,8 @@ class ChoiceType extends AbstractType
     const TYPE_EQUAL = 3;
 
     /**
+     * NEXT_MAJOR: remove this property.
+     *
      * @deprecated since 3.5, to be removed with 4.0
      *
      * @var TranslatorInterface

Form/Type/Filter/DateRangeType.php

@@ -28,6 +28,8 @@ class DateRangeType extends AbstractType
     const TYPE_NOT_BETWEEN = 2;
 
     /**
+     * NEXT_MAJOR: remove this property.
+     *
      * @deprecated since 3.5, to be removed with 4.0
      *
      * @var TranslatorInterface

Form/Type/Filter/DateTimeRangeType.php

@@ -28,6 +28,8 @@ class DateTimeRangeType extends AbstractType
     const TYPE_NOT_BETWEEN = 2;
 
     /**
+     * NEXT_MAJOR: remove this property.
+     *
      * @deprecated since 3.5, to be removed with 4.0
      *
      * @var TranslatorInterface

Form/Type/Filter/DateTimeType.php

@@ -39,6 +39,8 @@ class DateTimeType extends AbstractType
     const TYPE_NOT_NULL = 7;
 
     /**
+     * NEXT_MAJOR: remove this property.
+     *
      * @deprecated since 3.5, to be removed with 4.0
      *
      * @var TranslatorInterface

Form/Type/Filter/DateType.php

@@ -39,6 +39,8 @@ class DateType extends AbstractType
     const TYPE_NOT_NULL = 7;
 
     /**
+     * NEXT_MAJOR: remove this property.
+     *
      * @deprecated since 3.5, to be removed with 4.0
      *
      * @var TranslatorInterface

Form/Type/Filter/NumberType.php

@@ -35,6 +35,8 @@ class NumberType extends AbstractType
     const TYPE_LESS_THAN = 5;
 
     /**
+     * NEXT_MAJOR: remove this property.
+     *
      * @deprecated since 3.5, to be removed with 4.0
      *
      * @var TranslatorInterface

Form/Type/ModelTypeList.php

@@ -23,6 +23,8 @@ namespace Sonata\AdminBundle\Form\Type;
  *   - a list modal to select the targeted entities
  *   - a clear selection link.
  *
+ * NEXT_MAJOR: remove this class.
+ *
  * @deprecated since version 3.5, to be removed in 4.0. Use ModelListType instead
  */
 class ModelTypeList extends ModelListType

Resources/public/Admin.js

@@ -140,6 +140,8 @@ var Admin = {
     },
 
     /**
+     * NEXT_MAJOR: remove this function.
+     *
      * @deprecated in version 3.0
      */
     add_pretty_errors: function() {

Tests/Util/AdminObjectAclDataTest.php

@@ -74,8 +74,6 @@ class AdminObjectAclDataTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @group legacy
-     *
-     * @deprecated
      */
     public function testSetForm()
     {
@@ -92,8 +90,6 @@ class AdminObjectAclDataTest extends \PHPUnit_Framework_TestCase
      * @depends testSetForm
      *
      * @group legacy
-     *
-     * @deprecated
      */
     public function testGetForm($adminObjectAclData)
     {

Util/AdminObjectAclData.php

@@ -168,6 +168,8 @@ class AdminObjectAclData
     /**
      * Sets form.
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @param Form $form
      *
      * @return AdminObjectAclData
@@ -188,6 +190,8 @@ class AdminObjectAclData
     /**
      * Gets form.
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @return Form
      *
      * @deprecated Deprecated since version 3.0. Use getAclUsersForm() instead

Util/AdminObjectAclManipulator.php

@@ -64,6 +64,8 @@ class AdminObjectAclManipulator
     /**
      * Gets the form.
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @param AdminObjectAclData $data
      *
      * @return Form
@@ -144,6 +146,8 @@ class AdminObjectAclManipulator
     /**
      * Updates ACl.
      *
+     * NEXT_MAJOR: remove this method.
+     *
      * @param AdminObjectAclData $data
      *
      * @deprecated Deprecated since version 3.0. Use updateAclUsers() instead