From 4b8f7586d24eae909430baba8e24c0c7b0e9b09d Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:40:25 +1200 Subject: [PATCH] API Use new names for renamed classes (#258) --- src/Extensions/ContentReviewCMSExtension.php | 2 +- src/Extensions/SiteTreeContentReview.php | 4 ++-- src/Forms/ReviewContentHandler.php | 2 +- src/Reports/PagesDueForReviewReport.php | 2 +- src/Reports/PagesWithoutReviewScheduleReport.php | 4 ++-- src/Tasks/ContentReviewEmails.php | 6 +++--- tests/php/Forms/ReviewContentHandlerTest.php | 2 +- tests/php/SiteTreeContentReviewTest.php | 2 +- tests/php/SiteTreeContentReviewTestPage.php | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Extensions/ContentReviewCMSExtension.php b/src/Extensions/ContentReviewCMSExtension.php index f288118..8d263fe 100644 --- a/src/Extensions/ContentReviewCMSExtension.php +++ b/src/Extensions/ContentReviewCMSExtension.php @@ -11,7 +11,7 @@ use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Forms\Form; -use SilverStripe\ORM\ValidationResult; +use SilverStripe\Core\Validation\ValidationResult; use SilverStripe\Security\Security; use SilverStripe\Core\Extension; diff --git a/src/Extensions/SiteTreeContentReview.php b/src/Extensions/SiteTreeContentReview.php index 3613c42..81cb82f 100644 --- a/src/Extensions/SiteTreeContentReview.php +++ b/src/Extensions/SiteTreeContentReview.php @@ -23,14 +23,14 @@ use SilverStripe\Forms\ListboxField; use SilverStripe\Forms\LiteralField; use SilverStripe\Forms\OptionsetField; use SilverStripe\Forms\ReadonlyField; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DB; use SilverStripe\ORM\HasManyList; use SilverStripe\ORM\ManyManyList; use SilverStripe\ORM\FieldType\DBDate; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Security\Group; use SilverStripe\Security\Member; use SilverStripe\Security\Permission; diff --git a/src/Forms/ReviewContentHandler.php b/src/Forms/ReviewContentHandler.php index 408cdcf..a1cda26 100644 --- a/src/Forms/ReviewContentHandler.php +++ b/src/Forms/ReviewContentHandler.php @@ -14,7 +14,7 @@ use SilverStripe\Forms\FormAction; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\TextareaField; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; use SilverStripe\Security\Security; class ReviewContentHandler diff --git a/src/Reports/PagesDueForReviewReport.php b/src/Reports/PagesDueForReviewReport.php index 8b8c31d..9399075 100644 --- a/src/Reports/PagesDueForReviewReport.php +++ b/src/Reports/PagesDueForReviewReport.php @@ -13,7 +13,7 @@ use SilverStripe\Forms\CheckboxField; use SilverStripe\Forms\DateField; use SilverStripe\Forms\FieldList; use SilverStripe\ORM\FieldType\DBDatetime; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Reports\Report; use SilverStripe\Security\Security; use SilverStripe\SiteConfig\SiteConfig; diff --git a/src/Reports/PagesWithoutReviewScheduleReport.php b/src/Reports/PagesWithoutReviewScheduleReport.php index e54d0aa..e979c8a 100644 --- a/src/Reports/PagesWithoutReviewScheduleReport.php +++ b/src/Reports/PagesWithoutReviewScheduleReport.php @@ -9,9 +9,9 @@ use SilverStripe\ContentReview\Compatibility\ContentReviewCompatability; use SilverStripe\Core\ClassInfo; use SilverStripe\Forms\CheckboxField; use SilverStripe\Forms\FieldList; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\DataObject; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Reports\Report; use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\Versioned\Versioned; diff --git a/src/Tasks/ContentReviewEmails.php b/src/Tasks/ContentReviewEmails.php index 2131796..f84846c 100644 --- a/src/Tasks/ContentReviewEmails.php +++ b/src/Tasks/ContentReviewEmails.php @@ -8,13 +8,13 @@ use SilverStripe\ContentReview\Compatibility\ContentReviewCompatability; use SilverStripe\Control\Email\Email; use SilverStripe\Control\HTTPRequest; use SilverStripe\Dev\BuildTask; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\ORM\FieldType\DBDatetime; use SilverStripe\ORM\FieldType\DBField; -use SilverStripe\ORM\SS_List; +use SilverStripe\Model\List\SS_List; use SilverStripe\Security\Member; use SilverStripe\SiteConfig\SiteConfig; -use SilverStripe\View\ArrayData; +use SilverStripe\Model\ArrayData; use SilverStripe\View\SSViewer; /** diff --git a/tests/php/Forms/ReviewContentHandlerTest.php b/tests/php/Forms/ReviewContentHandlerTest.php index 76e4904..a61bbe7 100644 --- a/tests/php/Forms/ReviewContentHandlerTest.php +++ b/tests/php/Forms/ReviewContentHandlerTest.php @@ -14,7 +14,7 @@ use SilverStripe\Forms\Form; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\TextareaField; use SilverStripe\Security\Member; -use SilverStripe\ORM\ValidationException; +use SilverStripe\Core\Validation\ValidationException; class ReviewContentHandlerTest extends SapphireTest { diff --git a/tests/php/SiteTreeContentReviewTest.php b/tests/php/SiteTreeContentReviewTest.php index 51935ba..84b53e6 100644 --- a/tests/php/SiteTreeContentReviewTest.php +++ b/tests/php/SiteTreeContentReviewTest.php @@ -17,7 +17,7 @@ use SilverStripe\Security\Group; use SilverStripe\Security\Member; use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\Versioned\Versioned; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; use SilverStripe\Dev\FunctionalTest; use SilverStripe\ContentReview\Tests\SiteTreeContentReviewTestPage; diff --git a/tests/php/SiteTreeContentReviewTestPage.php b/tests/php/SiteTreeContentReviewTestPage.php index 5412fad..a3972f2 100644 --- a/tests/php/SiteTreeContentReviewTestPage.php +++ b/tests/php/SiteTreeContentReviewTestPage.php @@ -4,7 +4,7 @@ namespace SilverStripe\ContentReview\Tests; use Page; use SilverStripe\Dev\TestOnly; -use SilverStripe\ORM\ArrayList; +use SilverStripe\Model\List\ArrayList; /** * Mock Page class with canReviewContent method to return false on first call