Merge branch '6.1' into 6

code/Form/UserForm.php

@@ -135,8 +135,6 @@ class UserForm extends Form
      * can manipulate these by using {@link updateFormActions()} on
      * a decorator.
      *
-     * @todo Make form actions editable via their own field editor.
-     *
      * @return FieldList
      */
     public function getFormActions()

code/Model/EditableFormField/EditableCheckboxGroupField.php

@@ -61,7 +61,6 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField
     public function getSelectorField(EditableCustomRule $rule, $forOnLoad = false)
     {
         // watch out for checkboxs as the inputs don't have values but are 'checked
-        // @todo - Test this
         if ($rule->FieldValue) {
             return "$(\"input[name='{$this->Name}[]'][value='{$rule->FieldValue}']\")";
         } else {

code/Model/EditableFormField/EditableLiteralField.php

@@ -149,7 +149,6 @@ class EditableLiteralField extends EditableFormField
 
         $field = CompositeField::create($content)
             ->setName($this->Name)
-            // ->setID($this->Name) // @todo: https://github.com/silverstripe/silverstripe-framework/issues/7264
             ->setFieldHolderTemplate(__CLASS__ . '_holder');
 
         $this->doUpdateFormField($field);

code/Model/Recipient/EmailRecipient.php

@@ -177,7 +177,7 @@ class EmailRecipient extends DataObject
         }
 
         // Revert to checking for a form from the session
-        // LeftAndMain::sessionNamespace is protected. @todo replace this with a non-deprecated equivalent.
+        // LeftAndMain::sessionNamespace is protected.
         $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class;
 
         $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentPage');

code/Task/RecoverUploadLocationsHelper.php

@@ -447,8 +447,6 @@ class RecoverUploadLocationsHelper
                     '"SubmittedFileFieldTable"."UploadedFileID" > ?' => $greaterThanID
                 ])->execute();
 
-            // TODO: Versioned::prepopulate_versionnumber_cache
-
             foreach ($chunk as $item) {
                 yield $item;
                 $greaterThanID = $item['UploadedFileID'];

tests/php/Model/UserDefinedFormTest.php

@@ -49,7 +49,6 @@ class UserDefinedFormTest extends FunctionalTest
             'UserDefinedForm::rollback() has not been implemented completely'
         );
 
-        // @todo
         $this->logInWithPermission('ADMIN');
         /** @var UserDefinedForm|Versioned $form  */
         $form = $this->objFromFixture(UserDefinedForm::class, 'basic-form-page');