API Use new names for renamed classes

silverstripe · Sep 18, 2024 · fe78bb6 · fe78bb6
1 parent 9e49bb5
commit fe78bb6
Show file tree

Hide file tree

Showing 50 changed files with 72 additions and 72 deletions.
diff --git a/docs/en/05_plugins/03_writing_a_complex_plugin.md b/docs/en/05_plugins/03_writing_a_complex_plugin.md
@@ -57,7 +57,7 @@ class GeocodableModelPlugin implements ModelTypePlugin
         );
 
         // only apply the plugin to geocodable DataObjects
-        if (!ViewableData::has_extension($class, GeocodableExtension::class)) {
+        if (!ModelData::has_extension($class, GeocodableExtension::class)) {
             return;
         }
 
@@ -100,7 +100,7 @@ class GeocodableQueryPlugin implements ModelQueryPlugin
     {
         $class = $query->getModel()->getSourceClass();
         // Only apply to geocodable objects
-        if (!ViewableData::has_extension($class, GeocodableExtension::class)) {
+        if (!ModelData::has_extension($class, GeocodableExtension::class)) {
             return;
         }
 
@@ -216,7 +216,7 @@ class GeocodableQueryPlugin implements ModelQueryPlugin, SchemaUpdater
     {
         $class = $query->getModel()->getSourceClass();
         // Only apply to geocodable objects
-        if (!ViewableData::has_extension($class, GeocodableExtension::class)) {
+        if (!ModelData::has_extension($class, GeocodableExtension::class)) {
             return;
         }
 

diff --git a/src/Auth/AuthenticatorInterface.php b/src/Auth/AuthenticatorInterface.php
@@ -3,7 +3,7 @@
 namespace SilverStripe\GraphQL\Auth;
 
 use SilverStripe\Control\HTTPRequest;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Member;
 
 /**

diff --git a/src/Auth/BasicAuthAuthenticator.php b/src/Auth/BasicAuthAuthenticator.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse_Exception;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\BasicAuth;
 use SilverStripe\Security\Member;
 

diff --git a/src/Auth/Handler.php b/src/Auth/Handler.php
@@ -6,7 +6,7 @@
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Member;
 
 /**

diff --git a/src/Modules/AssetAdmin/FileFilter.php b/src/Modules/AssetAdmin/FileFilter.php
@@ -8,8 +8,8 @@
 use SilverStripe\Assets\Folder;
 use SilverStripe\Control\HTTPResponse_Exception;
 use SilverStripe\Forms\DateField;
-use SilverStripe\ORM\ArrayList;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\ArrayList;
+use SilverStripe\Model\List\Filterable;
 
 class FileFilter
 {

diff --git a/src/Modules/AssetAdmin/Resolvers/AssetAdminResolver.php b/src/Modules/AssetAdmin/Resolvers/AssetAdminResolver.php
@@ -13,7 +13,7 @@
 use SilverStripe\GraphQL\QueryHandler\UserContextProvider;
 use SilverStripe\GraphQL\Schema\DataObject\FieldAccessor;
 use SilverStripe\ORM\DataList;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 use SilverStripe\Versioned\Versioned;
 use InvalidArgumentException;
 

diff --git a/src/Modules/AssetAdmin/Resolvers/FolderTypeResolver.php b/src/Modules/AssetAdmin/Resolvers/FolderTypeResolver.php
@@ -13,7 +13,7 @@
 use SilverStripe\GraphQL\Schema\Schema;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DB;
-use SilverStripe\ORM\Sortable;
+use SilverStripe\Model\List\Sortable;
 use SilverStripe\Versioned\Versioned;
 use InvalidArgumentException;
 use Exception;

diff --git a/src/Modules/AssetAdmin/Schema/Builder.php b/src/Modules/AssetAdmin/Schema/Builder.php
@@ -7,7 +7,7 @@
 use SilverStripe\GraphQL\Schema\Interfaces\SchemaUpdater;
 use SilverStripe\GraphQL\Schema\Schema;
 use SilverStripe\GraphQL\Schema\Type\Enum;
-use SilverStripe\ORM\ArrayLib;
+use SilverStripe\Core\ArrayLib;
 
 if (!interface_exists(SchemaUpdater::class)) {
     return;

diff --git a/src/Modules/CMS/LinkablePlugin.php b/src/Modules/CMS/LinkablePlugin.php
@@ -11,7 +11,7 @@
 use SilverStripe\GraphQL\Schema\Field\ModelQuery;
 use SilverStripe\GraphQL\Schema\Interfaces\ModelQueryPlugin;
 use SilverStripe\GraphQL\Schema\Schema;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataList;
 
 if (!interface_exists(ModelQueryPlugin::class)) {

diff --git a/src/Modules/Versioned/Operations/AbstractPublishOperationCreator.php b/src/Modules/Versioned/Operations/AbstractPublishOperationCreator.php
@@ -18,11 +18,11 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
 use SilverStripe\ORM\DB;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Member;
 use SilverStripe\GraphQL\Modules\Versioned\Resolvers\VersionedResolver;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
 // GraphQL dependency is optional in versioned,
 // and the following implementation relies on existence of this class (in GraphQL v4)
@@ -53,7 +53,7 @@ public function createOperation(
         string $typeName,
         array $config = []
     ): ?ModelOperation {
-        if (!ViewableData::has_extension($model->getSourceClass(), Versioned::class)) {
+        if (!ModelData::has_extension($model->getSourceClass(), Versioned::class)) {
             return null;
         }
 

diff --git a/src/Modules/Versioned/Operations/CopyToStageCreator.php b/src/Modules/Versioned/Operations/CopyToStageCreator.php
@@ -12,7 +12,7 @@
 use SilverStripe\GraphQL\Schema\Interfaces\SchemaModelInterface;
 use SilverStripe\GraphQL\Modules\Versioned\Resolvers\VersionedResolver;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
 // GraphQL dependency is optional in versioned,
 // and the following implementation relies on existence of this class (in GraphQL v4)
@@ -49,7 +49,7 @@ public function createOperation(
         string $typeName,
         array $config = []
     ): ?ModelOperation {
-        if (!ViewableData::has_extension($model->getSourceClass(), Versioned::class)) {
+        if (!ModelData::has_extension($model->getSourceClass(), Versioned::class)) {
             return null;
         }
 

diff --git a/src/Modules/Versioned/Operations/RollbackCreator.php b/src/Modules/Versioned/Operations/RollbackCreator.php
@@ -11,7 +11,7 @@
 use SilverStripe\GraphQL\Schema\Interfaces\SchemaModelInterface;
 use SilverStripe\GraphQL\Modules\Versioned\Resolvers\VersionedResolver;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
 // GraphQL dependency is optional in versioned,
 // and the following implementation relies on existence of this class (in GraphQL v4)
@@ -47,7 +47,7 @@ public function createOperation(
         string $typeName,
         array $config = []
     ): ?ModelOperation {
-        if (!ViewableData::has_extension($model->getSourceClass(), Versioned::class)) {
+        if (!ModelData::has_extension($model->getSourceClass(), Versioned::class)) {
             return null;
         }
 

diff --git a/src/Modules/Versioned/Plugins/UnpublishOnDelete.php b/src/Modules/Versioned/Plugins/UnpublishOnDelete.php
@@ -14,7 +14,7 @@
 use SilverStripe\Versioned\Versioned;
 use Exception;
 use Closure;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
 // GraphQL dependency is optional in versioned,
 // and the following implementation relies on existence of this class (in GraphQL v4)
@@ -53,7 +53,7 @@ public static function unpublishOnDelete(array $context)
             if (!$dataClass) {
                 return;
             }
-            if (!ViewableData::has_extension($dataClass, Versioned::class)) {
+            if (!ModelData::has_extension($dataClass, Versioned::class)) {
                 return;
             }
             DB::get_conn()->withTransaction(function () use ($args, $context, $dataClass) {

diff --git a/src/Modules/Versioned/Plugins/VersionedDataObject.php b/src/Modules/Versioned/Plugins/VersionedDataObject.php
@@ -17,12 +17,12 @@
 use SilverStripe\GraphQL\Schema\Type\ModelType;
 use SilverStripe\GraphQL\Schema\Type\Type;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\Sortable;
+use SilverStripe\Model\List\Sortable;
 use SilverStripe\Security\Member;
 use SilverStripe\GraphQL\Modules\Versioned\Resolvers\VersionedResolver;
 use SilverStripe\Versioned\Versioned;
 use Closure;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
 // GraphQL dependency is optional in versioned,
 // and the following implementation relies on existence of this class (in GraphQL v4)
@@ -75,7 +75,7 @@ public function apply(ModelType $type, Schema $schema, array $config = []): void
             __CLASS__,
             DataObject::class
         );
-        if (!ViewableData::has_extension($class, Versioned::class)) {
+        if (!ModelData::has_extension($class, Versioned::class)) {
             return;
         }
 

diff --git a/src/Modules/Versioned/Plugins/VersionedRead.php b/src/Modules/Versioned/Plugins/VersionedRead.php
@@ -8,7 +8,7 @@
 use SilverStripe\GraphQL\Schema\Schema;
 use SilverStripe\GraphQL\Modules\Versioned\Resolvers\VersionedResolver;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
 // GraphQL dependency is optional in versioned,
 // and the following implementation relies on existence of this class (in GraphQL v4)
@@ -36,7 +36,7 @@ public function getIdentifier(): string
     public function apply(ModelQuery $query, Schema $schema, array $config = []): void
     {
         $class = $query->getModel()->getSourceClass();
-        if (!ViewableData::has_extension($class, Versioned::class)) {
+        if (!ModelData::has_extension($class, Versioned::class)) {
             return;
         }
 

diff --git a/src/Modules/Versioned/Resolvers/VersionedResolver.php b/src/Modules/Versioned/Resolvers/VersionedResolver.php
@@ -11,7 +11,7 @@
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\GraphQL\Modules\Versioned\Operations\AbstractPublishOperationCreator;
 use SilverStripe\GraphQL\Modules\Versioned\Operations\CopyToStageCreator;
 use SilverStripe\GraphQL\Modules\Versioned\Operations\RollbackCreator;

diff --git a/src/QueryHandler/QueryHandler.php b/src/QueryHandler/QueryHandler.php
@@ -31,7 +31,7 @@
 use SilverStripe\GraphQL\Schema\Interfaces\ContextProvider;
 use SilverStripe\GraphQL\Schema\Schema;
 use SilverStripe\GraphQL\Schema\SchemaConfig;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 
 /**
  * This class is responsible for taking query information from a controller,

diff --git a/src/Schema/BulkLoader/ExtensionLoader.php b/src/Schema/BulkLoader/ExtensionLoader.php
@@ -4,7 +4,7 @@
 
 use InvalidArgumentException;
 use SilverStripe\Core\Extension;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
 /**
  * Loads classes that have a given extension assigned to them.
@@ -25,13 +25,13 @@ public function collect(Collection $collection): Collection
         foreach ($collection->getClasses() as $class) {
             $isIncluded = false;
             foreach ($this->includeList as $pattern) {
-                if (ViewableData::has_extension($class, $pattern)) {
+                if (ModelData::has_extension($class, $pattern)) {
                     $isIncluded = true;
                     break;
                 }
             }
             foreach ($this->excludeList as $pattern) {
-                if (ViewableData::has_extension($class, $pattern)) {
+                if (ModelData::has_extension($class, $pattern)) {
                     $isIncluded = false;
                     break;
                 }

diff --git a/src/Schema/DataObject/DataObjectModel.php b/src/Schema/DataObject/DataObjectModel.php
@@ -23,7 +23,7 @@
 use SilverStripe\GraphQL\Schema\Interfaces\SchemaModelInterface;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\ORM\SS_List;
+use SilverStripe\Model\List\SS_List;
 use SilverStripe\ORM\UnsavedRelationList;
 
 /**

diff --git a/src/Schema/DataObject/FieldAccessor.php b/src/Schema/DataObject/FieldAccessor.php
@@ -13,7 +13,7 @@
 use SilverStripe\ORM\DataObjectSchema;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\RelationList;
-use SilverStripe\ORM\SS_List;
+use SilverStripe\Model\List\SS_List;
 use LogicException;
 use SilverStripe\ORM\UnsavedRelationList;
 

diff --git a/src/Schema/DataObject/Plugin/CanViewPermission.php b/src/Schema/DataObject/Plugin/CanViewPermission.php
@@ -7,12 +7,12 @@
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\GraphQL\QueryHandler\QueryHandler;
 use SilverStripe\GraphQL\QueryHandler\UserContextProvider;
-use SilverStripe\ORM\ArrayLib;
-use SilverStripe\ORM\ArrayList;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Core\ArrayLib;
+use SilverStripe\Model\List\ArrayList;
+use SilverStripe\Model\List\Filterable;
 use InvalidArgumentException;
-use SilverStripe\ORM\SS_List;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\List\SS_List;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\ORM\DataList;
 
 /**

diff --git a/src/Schema/DataObject/Plugin/FirstResult.php b/src/Schema/DataObject/Plugin/FirstResult.php
@@ -9,8 +9,8 @@
 use SilverStripe\GraphQL\Schema\Schema;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\SS_List;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\List\SS_List;
+use SilverStripe\Model\ModelData;
 
 class FirstResult implements ModelQueryPlugin
 {
@@ -38,7 +38,7 @@ public function apply(ModelQuery $query, Schema $schema, array $config = []): vo
         $query->addResolverAfterware([static::class, 'firstResult']);
     }
 
-    public static function firstResult(SS_List $obj): ?ViewableData
+    public static function firstResult(SS_List $obj): ?ModelData
     {
         return $obj->first();
     }

diff --git a/src/Schema/DataObject/Plugin/Paginator.php b/src/Schema/DataObject/Plugin/Paginator.php
@@ -4,7 +4,7 @@
 
 use GraphQL\Type\Definition\ResolveInfo;
 use SilverStripe\GraphQL\Schema\Schema;
-use SilverStripe\ORM\Limitable;
+use SilverStripe\Model\List\Limitable;
 use SilverStripe\GraphQL\Schema\Plugin\PaginationPlugin;
 use Closure;
 

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/FieldFilterInterface.php b/src/Schema/DataObject/Plugin/QueryFilter/FieldFilterInterface.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter;
 
 use SilverStripe\ORM\DataList;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * Defines the interface used by all read filters for operations

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/Filters/ContainsFilter.php b/src/Schema/DataObject/Plugin/QueryFilter/Filters/ContainsFilter.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\Filters;
 
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\FieldFilterInterface;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * A filter that selects records that partially match a keyword

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/Filters/EndsWithFilter.php b/src/Schema/DataObject/Plugin/QueryFilter/Filters/EndsWithFilter.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\Filters;
 
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\FieldFilterInterface;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * A query filter that filters records by the end of a field's contents

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/Filters/EqualToFilter.php b/src/Schema/DataObject/Plugin/QueryFilter/Filters/EqualToFilter.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\Filters;
 
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\FieldFilterInterface;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * A query filter that filters records by exact match of a keyword

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/Filters/GreaterThanFilter.php b/src/Schema/DataObject/Plugin/QueryFilter/Filters/GreaterThanFilter.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\Filters;
 
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\FieldFilterInterface;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * A query filter that filters records by greater than comparison

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/Filters/GreaterThanOrEqualFilter.php b/src/Schema/DataObject/Plugin/QueryFilter/Filters/GreaterThanOrEqualFilter.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\Filters;
 
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\FieldFilterInterface;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * A query filter that filters records by greater than or equal comparison

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/Filters/InFilter.php b/src/Schema/DataObject/Plugin/QueryFilter/Filters/InFilter.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\Filters;
 
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\ListFieldFilterInterface;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * A query filter that filters records by the presence of a value in an array

diff --git a/src/Schema/DataObject/Plugin/QueryFilter/Filters/LessThanFilter.php b/src/Schema/DataObject/Plugin/QueryFilter/Filters/LessThanFilter.php
@@ -4,7 +4,7 @@
 namespace SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\Filters;
 
 use SilverStripe\GraphQL\Schema\DataObject\Plugin\QueryFilter\FieldFilterInterface;
-use SilverStripe\ORM\Filterable;
+use SilverStripe\Model\List\Filterable;
 
 /**
  * A query filter that filters records by a less than comparison