From 6160a0303130c0b898c19d443d7eb4fbc271b81f Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 17 Sep 2024 13:44:11 +1200 Subject: [PATCH] API Use new names for renamed classes --- src/Controllers/QueuedJobsAdmin.php | 2 +- src/Controllers/QueuedTaskRunner.php | 8 ++++---- src/Services/QueuedJobService.php | 2 +- tests/QueuedJobsTest.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Controllers/QueuedJobsAdmin.php b/src/Controllers/QueuedJobsAdmin.php index e960719c..7be88974 100644 --- a/src/Controllers/QueuedJobsAdmin.php +++ b/src/Controllers/QueuedJobsAdmin.php @@ -18,7 +18,7 @@ use SilverStripe\Forms\GridField\GridFieldPageCount; use SilverStripe\Forms\GridField\GridFieldToolbarHeader; use SilverStripe\Forms\TextareaField; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Security; use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor; use Symbiote\QueuedJobs\Forms\GridFieldQueuedJobExecute; diff --git a/src/Controllers/QueuedTaskRunner.php b/src/Controllers/QueuedTaskRunner.php index 57996535..901409c2 100644 --- a/src/Controllers/QueuedTaskRunner.php +++ b/src/Controllers/QueuedTaskRunner.php @@ -11,9 +11,9 @@ use SilverStripe\Dev\BuildTask; use SilverStripe\Dev\DebugView; use SilverStripe\Dev\TaskRunner; -use SilverStripe\ORM\ArrayList; -use SilverStripe\View\ArrayData; -use SilverStripe\View\ViewableData; +use SilverStripe\Model\List\ArrayList; +use SilverStripe\Model\ArrayData; +use SilverStripe\Model\ModelData; use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor; use Symbiote\QueuedJobs\Jobs\RunBuildTaskJob; use Symbiote\QueuedJobs\Services\QueuedJobService; @@ -144,7 +144,7 @@ public function index() 'Info' => $renderer->renderInfo('SilverStripe Development Tools: Tasks (QueuedJobs version)', $baseUrl), ]; - return ViewableData::create()->renderWith(static::class, $data); + return ModelData::create()->renderWith(static::class, $data); } diff --git a/src/Services/QueuedJobService.php b/src/Services/QueuedJobService.php index 43aadafc..17dc3acb 100644 --- a/src/Services/QueuedJobService.php +++ b/src/Services/QueuedJobService.php @@ -22,7 +22,7 @@ use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBField; use SilverStripe\ORM\Queries\SQLUpdate; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use SilverStripe\Security\Member; use SilverStripe\Security\Security; use SilverStripe\Subsites\Model\Subsite; diff --git a/tests/QueuedJobsTest.php b/tests/QueuedJobsTest.php index dbe2f6b1..a7aca7b6 100644 --- a/tests/QueuedJobsTest.php +++ b/tests/QueuedJobsTest.php @@ -10,7 +10,7 @@ use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor; use Symbiote\QueuedJobs\Jobs\RunBuildTaskJob; use Symbiote\QueuedJobs\Services\AbstractQueuedJob;