From d5e3e2019f332b94a443d9db7269059dc5e58332 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 17 Sep 2024 13:44:03 +1200 Subject: [PATCH] API Use new names for renamed classes --- src/Actions/AssignUsersToWorkflowAction.php | 2 +- src/Actions/NotifyUsersWorkflowAction.php | 2 +- src/Admin/AdvancedWorkflowAdmin.php | 2 +- src/Admin/WorkflowDefinitionExporter.php | 2 +- src/Admin/WorkflowDefinitionImporter.php | 2 +- src/DataObjects/WorkflowActionInstance.php | 2 +- src/DataObjects/WorkflowInstance.php | 2 +- src/DataObjects/WorkflowTransition.php | 2 +- src/Dev/WorkflowBulkLoader.php | 2 +- src/Extensions/WorkflowEmbargoExpiryExtension.php | 2 +- src/FormFields/WorkflowField.php | 4 ++-- src/Forms/gridfield/GridFieldExportAction.php | 2 +- src/Forms/gridfield/GridFieldWorkflowRestrictedEditButton.php | 2 +- src/Services/WorkflowService.php | 2 +- tests/php/WorkflowImportExportTest.php | 4 ++-- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Actions/AssignUsersToWorkflowAction.php b/src/Actions/AssignUsersToWorkflowAction.php index 0d6379ed..478e055b 100644 --- a/src/Actions/AssignUsersToWorkflowAction.php +++ b/src/Actions/AssignUsersToWorkflowAction.php @@ -6,7 +6,7 @@ use SilverStripe\Forms\CheckboxSetField; use SilverStripe\Forms\HeaderField; use SilverStripe\Forms\TreeMultiselectField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DB; use SilverStripe\ORM\ManyManyList; use SilverStripe\Security\Group; diff --git a/src/Actions/NotifyUsersWorkflowAction.php b/src/Actions/NotifyUsersWorkflowAction.php index cdbc7a89..e9eaeaf7 100644 --- a/src/Actions/NotifyUsersWorkflowAction.php +++ b/src/Actions/NotifyUsersWorkflowAction.php @@ -13,7 +13,7 @@ use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\Security\Member; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\SSViewer; use Swift_RfcComplianceException; use Symbiote\AdvancedWorkflow\DataObjects\WorkflowAction; diff --git a/src/Admin/AdvancedWorkflowAdmin.php b/src/Admin/AdvancedWorkflowAdmin.php index 9f027b61..a172cd1f 100644 --- a/src/Admin/AdvancedWorkflowAdmin.php +++ b/src/Admin/AdvancedWorkflowAdmin.php @@ -16,7 +16,7 @@ use SilverStripe\Forms\GridField\GridFieldExportButton; use SilverStripe\Forms\GridField\GridFieldImportButton; use SilverStripe\Forms\GridField\GridFieldPaginator; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataObject; use SilverStripe\Security\Member; diff --git a/src/Admin/WorkflowDefinitionExporter.php b/src/Admin/WorkflowDefinitionExporter.php index 87a1dbdc..d3ce0805 100644 --- a/src/Admin/WorkflowDefinitionExporter.php +++ b/src/Admin/WorkflowDefinitionExporter.php @@ -11,7 +11,7 @@ use SilverStripe\Security\Member; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\SSViewer; use Symbiote\AdvancedWorkflow\DataObjects\WorkflowDefinition; diff --git a/src/Admin/WorkflowDefinitionImporter.php b/src/Admin/WorkflowDefinitionImporter.php index 92af37fd..309a5db6 100644 --- a/src/Admin/WorkflowDefinitionImporter.php +++ b/src/Admin/WorkflowDefinitionImporter.php @@ -5,7 +5,7 @@ use Exception; use SilverStripe\Core\Injector\Injector; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use Symbiote\AdvancedWorkflow\DataObjects\ImportedWorkflowTemplate; use Symbiote\AdvancedWorkflow\Templates\WorkflowTemplate; use Symfony\Component\Yaml\Yaml; diff --git a/src/DataObjects/WorkflowActionInstance.php b/src/DataObjects/WorkflowActionInstance.php index 133ca3c9..5035648a 100644 --- a/src/DataObjects/WorkflowActionInstance.php +++ b/src/DataObjects/WorkflowActionInstance.php @@ -6,7 +6,7 @@ use SilverStripe\Forms\Form; use SilverStripe\Forms\ReadonlyField; use SilverStripe\Forms\TextareaField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\FieldType\DBField; use SilverStripe\Security\Member; diff --git a/src/DataObjects/WorkflowInstance.php b/src/DataObjects/WorkflowInstance.php index a35d40e8..7f300862 100644 --- a/src/DataObjects/WorkflowInstance.php +++ b/src/DataObjects/WorkflowInstance.php @@ -17,7 +17,7 @@ use SilverStripe\Forms\Tab; use SilverStripe\Forms\TabSet; use SilverStripe\Forms\TreeMultiselectField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\HasManyList; use SilverStripe\ORM\ManyManyList; diff --git a/src/DataObjects/WorkflowTransition.php b/src/DataObjects/WorkflowTransition.php index 90ca782d..a0aa6db1 100644 --- a/src/DataObjects/WorkflowTransition.php +++ b/src/DataObjects/WorkflowTransition.php @@ -8,7 +8,7 @@ use SilverStripe\Forms\TabSet; use SilverStripe\Forms\TextField; use SilverStripe\Forms\TreeMultiselectField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DB; use SilverStripe\ORM\ManyManyList; diff --git a/src/Dev/WorkflowBulkLoader.php b/src/Dev/WorkflowBulkLoader.php index f728fa4c..2b2e7d27 100644 --- a/src/Dev/WorkflowBulkLoader.php +++ b/src/Dev/WorkflowBulkLoader.php @@ -6,7 +6,7 @@ use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\BulkLoader; use SilverStripe\Dev\BulkLoader_Result; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use Symbiote\AdvancedWorkflow\Admin\WorkflowDefinitionExporter; use Symbiote\AdvancedWorkflow\Admin\WorkflowDefinitionImporter; use Symbiote\AdvancedWorkflow\DataObjects\ImportedWorkflowTemplate; diff --git a/src/Extensions/WorkflowEmbargoExpiryExtension.php b/src/Extensions/WorkflowEmbargoExpiryExtension.php index cf760f56..d64d10e8 100644 --- a/src/Extensions/WorkflowEmbargoExpiryExtension.php +++ b/src/Extensions/WorkflowEmbargoExpiryExtension.php @@ -9,7 +9,7 @@ use SilverStripe\Forms\DatetimeField; use SilverStripe\Forms\HeaderField; use SilverStripe\Forms\LiteralField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Core\Extension; use SilverStripe\ORM\DataQuery; use SilverStripe\ORM\FieldType\DBDatetime; diff --git a/src/FormFields/WorkflowField.php b/src/FormFields/WorkflowField.php index 2e5d1e30..46b82230 100644 --- a/src/FormFields/WorkflowField.php +++ b/src/FormFields/WorkflowField.php @@ -7,9 +7,9 @@ use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Forms\FormField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Security\SecurityToken; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\Requirements; use Symbiote\AdvancedWorkflow\DataObjects\WorkflowDefinition; use Symbiote\AdvancedWorkflow\DataObjects\WorkflowAction; diff --git a/src/Forms/gridfield/GridFieldExportAction.php b/src/Forms/gridfield/GridFieldExportAction.php index bb7a4d07..64748188 100644 --- a/src/Forms/gridfield/GridFieldExportAction.php +++ b/src/Forms/gridfield/GridFieldExportAction.php @@ -12,7 +12,7 @@ use SilverStripe\Forms\GridField\GridField_FormAction; use SilverStripe\ORM\DataObject; use SilverStripe\Security\Permission; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\SSViewer; use Symbiote\AdvancedWorkflow\Admin\AdvancedWorkflowAdmin; diff --git a/src/Forms/gridfield/GridFieldWorkflowRestrictedEditButton.php b/src/Forms/gridfield/GridFieldWorkflowRestrictedEditButton.php index 1bf499f9..6828768e 100644 --- a/src/Forms/gridfield/GridFieldWorkflowRestrictedEditButton.php +++ b/src/Forms/gridfield/GridFieldWorkflowRestrictedEditButton.php @@ -8,7 +8,7 @@ use SilverStripe\Forms\GridField\GridFieldEditButton; use SilverStripe\Security\Permission; use SilverStripe\Security\Security; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use Symbiote\AdvancedWorkflow\DataObjects\WorkflowInstance; /** diff --git a/src/Services/WorkflowService.php b/src/Services/WorkflowService.php index 918a6b88..c77217ca 100644 --- a/src/Services/WorkflowService.php +++ b/src/Services/WorkflowService.php @@ -5,7 +5,7 @@ use Exception; use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Convert; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataObject; use SilverStripe\Security\Member; diff --git a/tests/php/WorkflowImportExportTest.php b/tests/php/WorkflowImportExportTest.php index e2ce9969..b67fdae5 100644 --- a/tests/php/WorkflowImportExportTest.php +++ b/tests/php/WorkflowImportExportTest.php @@ -5,7 +5,7 @@ use SilverStripe\Core\Injector\Injector; use SilverStripe\Dev\SapphireTest; use SilverStripe\Security\Member; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use Symbiote\AdvancedWorkflow\Admin\WorkflowDefinitionExporter; use Symbiote\AdvancedWorkflow\Admin\WorkflowDefinitionImporter; use Symbiote\AdvancedWorkflow\DataObjects\ImportedWorkflowTemplate; @@ -13,7 +13,7 @@ use Symbiote\AdvancedWorkflow\DataObjects\WorkflowDefinition; use Symbiote\AdvancedWorkflow\DataObjects\WorkflowTransition; use Symbiote\AdvancedWorkflow\Templates\WorkflowTemplate; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; /** * Tests for workflow import/export logic.