Merge d4488d726b822b2d0262177aba3aed7131095695 into 19767cf3b003227830ee8d4f4776fddc863ef20e

code/Control/UserDefinedFormAdmin.php

@@ -18,7 +18,7 @@ use SilverStripe\Forms\RequiredFields;
 use SilverStripe\Forms\Schema\FormSchema;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\TreeDropdownField;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Group;
 use SilverStripe\Security\InheritedPermissions;
 use SilverStripe\Security\Permission;

code/Control/UserDefinedFormController.php

@@ -16,10 +16,10 @@ use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Manifest\ModuleLoader;
 use SilverStripe\Forms\Form;
 use SilverStripe\i18n\i18n;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Security;
 use SilverStripe\UserForms\Extension\UserFormFileExtension;
 use SilverStripe\UserForms\Form\UserForm;
@@ -29,10 +29,10 @@ use SilverStripe\UserForms\Model\Submission\SubmittedForm;
 use SilverStripe\UserForms\Model\Submission\SubmittedFileField;
 use SilverStripe\UserForms\Model\UserDefinedForm;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\SSViewer;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 use Swift_RfcComplianceException;
 
 /**
@@ -578,7 +578,7 @@ JS
      * This action handles rendering the "finished" message, which is
      * customizable by editing the ReceivedFormSubmission template.
      *
-     * @return ViewableData
+     * @return ModelData
      */
     public function finished()
     {

code/Extension/UpgradePolymorphicExtension.php

@@ -7,7 +7,7 @@ use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\UserForms\Model\EditableFormField;
 use SilverStripe\UserForms\Model\Recipient\EmailRecipient;
 use SilverStripe\UserForms\Model\Submission\SubmittedForm;
@@ -15,7 +15,7 @@ use SilverStripe\UserForms\Model\UserDefinedForm;
 use SilverStripe\UserForms\UserForm;
 
 /**
- * This extension provides a hook that runs during a dev/build which will check for existing data in various
+ * This extension provides a hook that runs when building the db which will check for existing data in various
  * polymorphic relationship fields for userforms models, and ensure that the data is correct.
  *
  * Various `Parent` relationships in silverstripe/userforms for SilverStripe 3 were mapped directly to UserDefinedForm
@@ -83,9 +83,9 @@ class UpgradePolymorphicExtension extends Extension
                         $entry->write();
                         $updated++;
                     } catch (ValidationException $ex) {
-                        // no-op, allow the rest of dev/build to continue. There may be an error indicating that the
+                        // no-op, allow the rest of the db build to continue. There may be an error indicating that the
                         // object's class doesn't exist, which can be fixed by {@link DatabaseAdmin::doBuild} and this
-                        // logic will work the next time dev/build is run.
+                        // logic will work the next time the db is built.
                     }
                 }
             }

code/Form/UserForm.php

@@ -98,7 +98,7 @@ class UserForm extends Form
     /**
      * Return the fieldlist, filtered to only contain steps
      *
-     * @return \SilverStripe\ORM\ArrayList
+     * @return \SilverStripe\Model\List\ArrayList
      */
     public function getSteps()
     {

code/Form/UserFormsGridFieldFilterHeader.php

@@ -12,10 +12,10 @@ use SilverStripe\Forms\GridField\GridField_FormAction;
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
 use SilverStripe\Forms\GridField\GridFieldFilterHeader;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBDate;
-use SilverStripe\ORM\SS_List;
+use SilverStripe\Model\List\SS_List;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 
 /**
  * Extension to the build in SilverStripe {@link GridField} to allow for

code/Form/UserFormsRequiredFields.php

@@ -7,7 +7,7 @@ use SilverStripe\Dev\Debug;
 use SilverStripe\Forms\FileField;
 use SilverStripe\Forms\FormField;
 use SilverStripe\Forms\RequiredFields;
-use SilverStripe\ORM\ArrayLib;
+use SilverStripe\Core\ArrayLib;
 use SilverStripe\UserForms\Model\EditableFormField;
 
 /**

code/Model/EditableFormField.php

@@ -27,7 +27,7 @@ use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\UserForms\Extension\UserFormFieldEditorExtension;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd;

code/Model/EditableFormField/EditableFileField.php

@@ -13,7 +13,7 @@ use SilverStripe\Forms\FileField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\NumericField;
 use SilverStripe\Forms\TreeDropdownField;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\InheritedPermissions;
 use SilverStripe\UserForms\Control\UserDefinedFormAdmin;

code/Model/EditableFormField/EditableMultipleOptionField.php

@@ -12,8 +12,8 @@ use SilverStripe\Forms\GridField\GridFieldToolbarHeader;
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\ORM\Map;
+use SilverStripe\Model\List\Map;
-use SilverStripe\ORM\SS_List;
+use SilverStripe\Model\List\SS_List;
 use SilverStripe\UserForms\Model\EditableFormField;
 use Symbiote\GridFieldExtensions\GridFieldAddNewInlineButton;
 use Symbiote\GridFieldExtensions\GridFieldEditableColumns;

code/Model/EditableFormField/EditableTextField.php

@@ -10,7 +10,7 @@ use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\NumericField;
 use SilverStripe\Forms\TextareaField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\UserForms\Model\EditableFormField;
 
 /**

code/Model/Recipient/EmailRecipient.php

@@ -29,13 +29,13 @@ use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\TextareaField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Member;
 use SilverStripe\UserForms\Model\EditableFormField;
 use SilverStripe\UserForms\Model\EditableFormField\EditableEmailField;

code/Model/Recipient/UserFormRecipientItemRequest.php

@@ -4,11 +4,11 @@ namespace SilverStripe\UserForms\Model\Recipient;
 
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading;
 use SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\SSViewer;
 

code/Task/UserFormsColumnCleanTask.php

@@ -2,10 +2,13 @@
 
 namespace SilverStripe\UserForms\Task;
 
-use SilverStripe\Dev\MigrationTask;
+use SilverStripe\Dev\BuildTask;
+use SilverStripe\PolyExecution\PolyOutput;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\UserForms\Model\EditableFormField;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
 
 /**
  * UserForms Column Clean Task
@@ -15,11 +18,13 @@ use SilverStripe\UserForms\Model\EditableFormField;
  * @package userforms
  */
 
-class UserFormsColumnCleanTask extends MigrationTask
+class UserFormsColumnCleanTask extends BuildTask
 {
-    protected $title = 'UserForms EditableFormField Column Clean task';
+    protected static string $commandName = 'userforms-column-clean';
 
-    protected $description = 'Removes unused columns from EditableFormField for MySQL databases;';
+    protected string $title = 'UserForms EditableFormField Column Clean task';
+
+    protected static string $description = 'Removes unused columns from EditableFormField for MySQL databases;';
 
     protected $tables = [EditableFormField::class];
 
@@ -28,7 +33,7 @@ class UserFormsColumnCleanTask extends MigrationTask
     /**
      * Publish the existing forms.
      */
-    public function run($request)
+    protected function execute(InputInterface $input, PolyOutput $output): int
     {
         $schema = DataObject::getSchema();
 
@@ -40,28 +45,29 @@ class UserFormsColumnCleanTask extends MigrationTask
             $query = "SHOW TABLES LIKE 'Backup_$db'";
             $tableExists = DB::query($query)->value();
             if ($tableExists != null) {
-                echo "Tasks run already on $db exiting";
+                $output->writeln("Tasks run already on $db exiting");
-                return;
+                return Command::SUCCESS;
             }
             $backedUp = 0;
             foreach ($liveColumns as $index => $column) {
                 if ($backedUp == 0) {
-                    echo "Backing up $db <br />";
+                    $output->writeln("Backing up $db <br />");
-                    echo "Creating Backup_$db <br />";
+                    $output->writeln("Creating Backup_$db <br />");
                     // backup table
                     $query = "CREATE TABLE Backup_$db LIKE $db";
                     DB::query($query);
-                    echo "Populating Backup_$db <br />";
+                    $output->writeln("Populating Backup_$db <br />");
                     $query = "INSERT Backup_$db SELECT * FROM $db";
                     DB::query($query);
                     $backedUp = 1;
                 }
                 if (!isset($columns[$column]) && !in_array($column, $this->keepColumns ?? [])) {
-                    echo "Dropping $column from $db <br />";
+                    $output->writeln("Dropping $column from $db <br />");
                     $query = "ALTER TABLE $db DROP COLUMN $column";
                     DB::query($query);
                 }
             }
         }
+        return Command::SUCCESS;
     }
 }

code/UserForm.php

@@ -23,7 +23,7 @@ use SilverStripe\Forms\HTMLEditor\HTMLEditorField;
 use SilverStripe\Forms\LabelField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DB;
 use SilverStripe\UserForms\Extension\UserFormFieldEditorExtension;
 use SilverStripe\UserForms\Extension\UserFormValidator;
@@ -65,7 +65,7 @@ trait UserForm
     private static $email_template_directory = 'silverstripe/userforms:templates/email/';
 
     /**
-     * Should this module automatically upgrade on dev/build?
+     * Should this module automatically upgrade on db build?
      *
      * @config
      * @var bool

docs/en/01_installation.md

@@ -12,7 +12,7 @@ composer require silverstripe/userforms
 
 ## Configuration
 
-After installation, make sure you rebuild your database through `dev/build`.
+After installation, make sure you rebuild your database through `sake db:build --flush`.
 
 You should see a new page type in the CMS called "User Defined Form". This has a new "Form" tab which has your form builder.
 

docs/en/03_troubleshooting.md

@@ -6,11 +6,6 @@ title: Troubleshooting
 
 Check the below if you have any issues during installation or use
 
-## Installation issues
-
-After installation make sure you have done a `dev/build` you may also need to flush the admin view by appending
-`?flush=1` to the URL, e.g. `https://example.com/admin?flush=1`
-
 ## Checkbox or radio group custom messages not showing
 
 If your project has a custom template for `UserFormsCheckboxSetField.ss` or `UserFormsOptionSetField.ss`, then you will need to ensure they include `$Top.getValidationAttributesHTML().RAW`. See
@@ -28,7 +23,7 @@ Currently it only supports MySQL and when it is run it queries the EditableFormF
 it then grabs the columns for the live database. It will create a backup of the table and then remove any columns that
 are surplus.
 
-To run the task, log in as an administrator and go to `https://example.com/dev/tasks/UserFormsColumnCleanTask` in your browser, or run `sake dev/tasks/UserFormsColumnCleanTask` from the command line.
+To run the task, log in as an administrator and go to `https://example.com/dev/tasks/userforms-column-clean` in your browser, or run `sake tasks:userforms-column-clean` from the command line.
 
 ## My CSV export times out or runs out of memory
 

tests/php/Control/UserDefinedFormAdminTest.php

@@ -28,7 +28,7 @@ use SilverStripe\UserForms\Model\EditableFormField\EditableTextField;
 use SilverStripe\UserForms\Model\Recipient\EmailRecipient;
 use SilverStripe\UserForms\Model\Submission\SubmittedFormField;
 use SilverStripe\UserForms\Model\UserDefinedForm;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\SSViewer;
 
 /**

tests/php/Control/UserDefinedFormControllerTest.php

@@ -27,7 +27,7 @@ use SilverStripe\UserForms\Model\Submission\SubmittedFormField;
 use SilverStripe\UserForms\Model\UserDefinedForm;
 use SilverStripe\UserForms\Tests\Control\fixtures\SizeStringTestableController;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\SSViewer;
 use function filesize;
 use PHPUnit\Framework\Attributes\DataProvider;

tests/php/Model/EditableFormField/EditableFileFieldTest.php

@@ -4,7 +4,7 @@ namespace SilverStripe\UserForms\Tests\Model\EditableFormField;
 
 use SilverStripe\Assets\Folder;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFileField;
 
 /**

tests/php/Model/Recipient/EmailRecipientTest.php

@@ -31,7 +31,7 @@ class EmailRecipientTest extends SapphireTest
 
     public function testEmptyRecipientFailsValidation()
     {
-        $this->expectException(\SilverStripe\ORM\ValidationException::class);
+        $this->expectException(\SilverStripe\Core\Validation\ValidationException::class);
         $this->expectExceptionMessage('"Send email to" address or field is required');
         $recipient = new EmailRecipient();
         $recipient->EmailFrom = 'test@example.com';