Merge branch '7.0' into 7

code/Model/UserDefinedForm.php

@@ -18,7 +18,6 @@ class UserDefinedForm extends Page
 
     /**
      * @var string
-     * @deprecated 6.4.0 Will be renamed to cms_icon_class
      */
     private static $cms_icon_class = 'font-icon-p-list';
 

code/UserForm.php

@@ -33,7 +33,6 @@
 use SilverStripe\UserForms\Model\EditableFormField;
 use SilverStripe\View\Requirements;
 use SilverStripe\Core\Config\Configurable;
-use SilverStripe\Dev\Deprecation;
 
 /**
  * Defines the user defined functionality to be applied to any {@link DataObject}
@@ -169,12 +168,6 @@ trait UserForm
 
     private static $non_live_permissions = ['SITETREE_VIEW_ALL'];
 
-    /**
-     * Unused property
-     * @deprecated 5.3.0 Will be removed without equivalent functionality to replace it
-     */
-    protected $fieldsFromTo = [];
-
     /**
     * @var array
     */
@@ -269,13 +262,13 @@ public function getSubmissionsGridField()
 
         $config = GridFieldConfig::create();
         $config->addComponent(new GridFieldToolbarHeader());
-        $config->addComponent($sort = new GridFieldSortableHeader());
+        $config->addComponent(new GridFieldSortableHeader());
         $config->addComponent($filter = new UserFormsGridFieldFilterHeader());
         $config->addComponent(new GridFieldDataColumns());
         $config->addComponent(new GridFieldEditButton());
         $config->addComponent(new GridFieldDeleteAction());
         $config->addComponent(new GridFieldPageCount('toolbar-header-right'));
-        $config->addComponent($pagination = new GridFieldPaginator(25));
+        $config->addComponent(new GridFieldPaginator(25));
         $config->addComponent(new GridFieldDetailForm(null, true, false));
         $config->addComponent(new GridFieldButtonRow('after'));
         $config->addComponent($export = new GridFieldExportButton('buttons-after-left'));
@@ -297,12 +290,6 @@ public function getSubmissionsGridField()
             $config->addComponent(new BulkManager);
         }
 
-        Deprecation::withSuppressedNotice(function () use ($sort, $filter, $pagination) {
-            $sort->setThrowExceptionOnBadDataType(false);
-            $filter->setThrowExceptionOnBadDataType(false);
-            $pagination->setThrowExceptionOnBadDataType(false);
-        });
-
         // attach every column to the print view form
         $columns['Created'] = 'Created';
         $columns['SubmittedBy.Email'] = 'Submitter';