Skip to content

Commit

Permalink
API Use new names for renamed classes
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Sep 12, 2024
1 parent 120ad01 commit 87e7b81
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/ChangeSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\HasManyList;
use SilverStripe\ORM\UnexpectedDataException;
use SilverStripe\ORM\ValidationException;
use SilverStripe\Core\Validation\ValidationException;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
use SilverStripe\Security\Security;
Expand Down
4 changes: 2 additions & 2 deletions src/ChangeSetItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
use LogicException;
use SilverStripe\Assets\Thumbnail;
use SilverStripe\Control\Controller;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\CMSPreviewable;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\SS_List;
use SilverStripe\Model\List\SS_List;
use SilverStripe\ORM\UnexpectedDataException;
use SilverStripe\Security\Member;
use SilverStripe\Security\Permission;
Expand Down
8 changes: 4 additions & 4 deletions src/DataDifferencer.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
use SilverStripe\Core\Convert;
use SilverStripe\Dev\Deprecation;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\View\ArrayData;
use SilverStripe\Model\ArrayData;
use SilverStripe\View\Parsers\HtmlDiff;
use SilverStripe\View\ViewableData;
use SilverStripe\Model\ModelData;

/**
* Utility class to render views of the differences between two data objects (or two versions of the
Expand Down Expand Up @@ -45,7 +45,7 @@
* $diff->ignoreFields('AuthorID', 'Status');
* </code>
*/
class DataDifferencer extends ViewableData
class DataDifferencer extends ModelData
{
protected $fromRecord;
protected $toRecord;
Expand Down
8 changes: 4 additions & 4 deletions src/GridFieldArchiveAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
use SilverStripe\Forms\GridField\GridField_FormAction;
use SilverStripe\Forms\GridField\GridFieldDeleteAction;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ValidationException;
use SilverStripe\View\ViewableData;
use SilverStripe\Core\Validation\ValidationException;
use SilverStripe\Model\ModelData;

/**
* This class is a {@link GridField} component that replaces the delete action
Expand Down Expand Up @@ -191,12 +191,12 @@ public function handleAction(GridField $gridField, $actionName, $arguments, $dat
* Returns the GridField_FormAction if archive can be performed
*
* @param GridField $gridField
* @param ViewableData $record
* @param ModelData $record
* @return GridField_FormAction|null
*/
public function getArchiveAction($gridField, $record)
{
/** @var ViewableData|Versioned $record */
/** @var ModelData|Versioned $record */
if (!$record->has_extension(Versioned::class) || !$record->canDelete()) {
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions src/GridFieldRestoreAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
use SilverStripe\Forms\GridField\GridField_FormAction;
use SilverStripe\Forms\GridField\GridFieldFooter;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ValidationException;
use SilverStripe\ORM\ValidationResult;
use SilverStripe\Core\Validation\ValidationException;
use SilverStripe\Core\Validation\ValidationResult;
use SilverStripe\Versioned\RestoreAction;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/RecursivePublishable.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
use InvalidArgumentException;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Config\Config;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\Core\Extension;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\Queries\SQLUpdate;
use SilverStripe\ORM\SS_List;
use SilverStripe\Model\List\SS_List;

/**
* Provides owns / owned_by and recursive publishing API for all objects.
Expand Down
2 changes: 1 addition & 1 deletion src/RestoreAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace SilverStripe\Versioned;

use SilverStripe\ORM\Hierarchy\Hierarchy;
use SilverStripe\ORM\ValidationException;
use SilverStripe\Core\Validation\ValidationException;
use SilverStripe\Versioned\Versioned;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Versioned.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use SilverStripe\Core\Resettable;
use SilverStripe\Dev\Deprecation;
use SilverStripe\Forms\FieldList;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataQuery;
Expand Down
6 changes: 3 additions & 3 deletions src/VersionedGridFieldItemRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
use SilverStripe\Forms\LiteralField;
use SilverStripe\Forms\Tab;
use SilverStripe\Forms\TabSet;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\ValidationResult;
use SilverStripe\View\ArrayData;
use SilverStripe\Core\Validation\ValidationResult;
use SilverStripe\Model\ArrayData;
use SilverStripe\View\SSViewer;

/**
Expand Down
6 changes: 3 additions & 3 deletions src/Versioned_Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

use SilverStripe\Core\ClassInfo;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\SS_List;
use SilverStripe\Model\List\SS_List;
use SilverStripe\Security\Member;
use SilverStripe\View\ViewableData;
use SilverStripe\Model\ModelData;

/**
* Represents a single version of a record.
*
* @see Versioned
*/
class Versioned_Version extends ViewableData
class Versioned_Version extends ModelData
{
/**
* @var array
Expand Down
2 changes: 1 addition & 1 deletion tests/php/GridFieldRestoreActionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Forms\GridField\GridFieldConfig;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\ValidationException;
use SilverStripe\Core\Validation\ValidationException;
use SilverStripe\Security\Member;
use SilverStripe\Security\Security;
use SilverStripe\Security\SecurityToken;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/VersionedGridFieldItemRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Forms\GridField\GridFieldDetailForm;
use SilverStripe\Forms\LiteralField;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\DataObject;
use SilverStripe\Versioned\Tests\VersionedGridFieldItemRequestTest\UnversionedObject;
use SilverStripe\Versioned\Tests\VersionedGridFieldItemRequestTest\UnversionedOwner;
Expand Down
2 changes: 1 addition & 1 deletion tests/php/VersionedTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\Dev\TestSession;
use SilverStripe\ORM\ArrayList;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectSchema;
use SilverStripe\ORM\DB;
Expand Down

0 comments on commit 87e7b81

Please sign in to comment.