From ed9128b556bebf9c80eadd1e57a755b76b3cd899 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Thu, 12 Sep 2024 13:12:03 +1200 Subject: [PATCH] API Use new names for renamed classes --- code/BatchAction/DeleteAssets.php | 2 +- code/Controller/AssetAdmin.php | 4 ++-- code/Controller/AssetAdminFile.php | 4 ++-- code/Controller/AssetAdminOpen.php | 2 +- code/Extensions/RemoteFileModalExtension.php | 2 +- code/Forms/UploadField.php | 2 +- code/Helper/ImageThumbnailHelper.php | 2 +- .../php/Controller/AssetAdminTest/FilesInUseFileExtension.php | 2 +- tests/php/Forms/ImageFormFactoryTest.php | 2 +- tests/php/Forms/UploadFieldTest.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/BatchAction/DeleteAssets.php b/code/BatchAction/DeleteAssets.php index 7857d8a2e..b08c02ff8 100644 --- a/code/BatchAction/DeleteAssets.php +++ b/code/BatchAction/DeleteAssets.php @@ -5,7 +5,7 @@ use SilverStripe\Admin\CMSBatchAction; use SilverStripe\Control\HTTPResponse; use SilverStripe\Core\Convert; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; /** * Delete multiple {@link Folder} records (and the associated filesystem nodes). diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php index 824389ca1..5361ebe5a 100644 --- a/code/Controller/AssetAdmin.php +++ b/code/Controller/AssetAdmin.php @@ -30,9 +30,9 @@ use SilverStripe\Core\Injector\Injector; use SilverStripe\Forms\Form; use SilverStripe\Forms\FormFactory; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; use SilverStripe\Security\PermissionProvider; diff --git a/code/Controller/AssetAdminFile.php b/code/Controller/AssetAdminFile.php index b85294612..1c944e5f7 100644 --- a/code/Controller/AssetAdminFile.php +++ b/code/Controller/AssetAdminFile.php @@ -6,8 +6,8 @@ use SilverStripe\Assets\Folder; use SilverStripe\Assets\Shortcodes\FileLink; use SilverStripe\Control\Director; -use SilverStripe\ORM\ArrayList; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\ArrayList; +use SilverStripe\Model\List\SS_List; use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\DataDifferencer; use SilverStripe\Core\Extension; diff --git a/code/Controller/AssetAdminOpen.php b/code/Controller/AssetAdminOpen.php index 3640ec3a7..fa6ccbfa1 100644 --- a/code/Controller/AssetAdminOpen.php +++ b/code/Controller/AssetAdminOpen.php @@ -10,7 +10,7 @@ use SilverStripe\Control\Controller; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Versioned\Versioned; use SilverStripe\AssetAdmin\Controller\AssetAdminFile; use stdClass; diff --git a/code/Extensions/RemoteFileModalExtension.php b/code/Extensions/RemoteFileModalExtension.php index a6d6deced..b1633a832 100644 --- a/code/Extensions/RemoteFileModalExtension.php +++ b/code/Extensions/RemoteFileModalExtension.php @@ -16,7 +16,7 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; use SilverStripe\Forms\Schema\FormSchema; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; /** * Decorates ModalController with an insert-oembed modal diff --git a/code/Forms/UploadField.php b/code/Forms/UploadField.php index 040e94107..3417880ee 100644 --- a/code/Forms/UploadField.php +++ b/code/Forms/UploadField.php @@ -12,7 +12,7 @@ use SilverStripe\Forms\FormField; use SilverStripe\Forms\Validator; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; /** * Represents a file upload field with ReactJS based frontend. diff --git a/code/Helper/ImageThumbnailHelper.php b/code/Helper/ImageThumbnailHelper.php index 6ec9f3377..cae09a740 100644 --- a/code/Helper/ImageThumbnailHelper.php +++ b/code/Helper/ImageThumbnailHelper.php @@ -10,7 +10,7 @@ use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\Injector\Injector; use SilverStripe\ORM\DB; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; class ImageThumbnailHelper { diff --git a/tests/php/Controller/AssetAdminTest/FilesInUseFileExtension.php b/tests/php/Controller/AssetAdminTest/FilesInUseFileExtension.php index 71458721a..777cb5b07 100644 --- a/tests/php/Controller/AssetAdminTest/FilesInUseFileExtension.php +++ b/tests/php/Controller/AssetAdminTest/FilesInUseFileExtension.php @@ -3,7 +3,7 @@ namespace SilverStripe\AssetAdmin\Tests\Controller\AssetAdminTest; use SilverStripe\Core\Extension; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Dev\TestOnly; class FilesInUseFileExtension extends Extension implements TestOnly diff --git a/tests/php/Forms/ImageFormFactoryTest.php b/tests/php/Forms/ImageFormFactoryTest.php index b3cfca220..b8c9bb6b3 100644 --- a/tests/php/Forms/ImageFormFactoryTest.php +++ b/tests/php/Forms/ImageFormFactoryTest.php @@ -15,7 +15,7 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; use SilverStripe\Forms\FormFactory; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; class ImageFormFactoryTest extends SapphireTest { diff --git a/tests/php/Forms/UploadFieldTest.php b/tests/php/Forms/UploadFieldTest.php index 7ba65c160..a943c832f 100644 --- a/tests/php/Forms/UploadFieldTest.php +++ b/tests/php/Forms/UploadFieldTest.php @@ -14,7 +14,7 @@ use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; class UploadFieldTest extends SapphireTest {