diff --git a/code/CMSProfileController.php b/code/CMSProfileController.php index eb34d8e5c..28e2664dd 100644 --- a/code/CMSProfileController.php +++ b/code/CMSProfileController.php @@ -21,7 +21,7 @@ class CMSProfileController extends LeftAndMain private static $required_permission_codes = 'CMS_ACCESS'; /** - * @deprecated 5.4.0 Will be renamed to model_class + * @deprecated 2.4.0 Will be renamed to model_class */ private static $tree_class = Member::class; diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 64e28364c..ace3d656a 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -22,6 +22,7 @@ use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Manifest\ModuleResourceLoader; use SilverStripe\Core\Manifest\VersionProvider; +use SilverStripe\Dev\Deprecation; use SilverStripe\Dev\TestOnly; use SilverStripe\Forms\DropdownField; use SilverStripe\Forms\FieldList; @@ -128,7 +129,7 @@ class LeftAndMain extends Controller implements PermissionProvider * * @config * @var string - * @deprecated 5.4.0 Will be renamed to model_class + * @deprecated 2.4.0 Will be renamed to model_class */ private static $tree_class = null; @@ -485,8 +486,12 @@ public function jsonError($errorCode, $errorMessage = null) throw new HTTPResponse_Exception($response); } + /** + * @deprecated 2.4.0 Will be replaced with SilverStripe\Admin\FormSchemaController::schema() + */ public function methodSchema(HTTPRequest $request): HTTPResponse { + Deprecation::noticeWithNoReplacment('2.4.0', 'Will be replaced with SilverStripe\Admin\FormSchemaController::schema()'); $method = $request->param('Method'); $formName = $request->param('FormName'); $itemID = $request->param('ItemID'); @@ -1564,9 +1569,11 @@ public function EmptyForm() * Handler for all global modals * * @return ModalController + * @deprecated 2.4.0 Will be removed without equivalent functionality to replace it */ public function Modals() { + Deprecation::noticeWithNoReplacment('2.4.0'); return ModalController::create($this, "Modals"); } diff --git a/code/ModalController.php b/code/ModalController.php index ac6ff3277..1ed88c5c3 100644 --- a/code/ModalController.php +++ b/code/ModalController.php @@ -6,6 +6,7 @@ use SilverStripe\Admin\Forms\EditorExternalLinkFormFactory; use SilverStripe\Control\Controller; use SilverStripe\Control\RequestHandler; +use SilverStripe\Dev\Deprecation; use SilverStripe\Forms\Form; /** @@ -30,6 +31,7 @@ public function Link($action = null) /** * @var Controller + * @deprecated 2.4.0 Will be removed without equivalent functionality to replace it */ protected $controller; @@ -53,9 +55,11 @@ public function getRequest() /** * @return Controller + * @deprecated 2.4.0 Will be removed without equivalent functionality to replace it */ public function getController() { + Deprecation::noticeWithNoReplacment('2.4.0'); return $this->controller; } @@ -63,9 +67,11 @@ public function getController() * Get urlsegment * * @return string + * @deprecated 2.4.0 Will be removed without equivalent functionality to replace it */ public function getName() { + Deprecation::noticeWithNoReplacment('2.4.0'); return $this->name; } diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index c17d42ac8..9ab04cc42 100755 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -59,7 +59,7 @@ class SecurityAdmin extends ModelAdmin implements PermissionProvider private static $menu_priority = 0; /** - * @deprecated 5.4.0 Will be renamed to model_class + * @deprecated 2.4.0 Will be renamed to model_class */ private static $tree_class = Group::class;