Skip to content

Commit

Permalink
API Remove DataObjectInterface
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Feb 12, 2025
1 parent ca07337 commit 50fc4f7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 15 deletions.
3 changes: 1 addition & 2 deletions src/GridFieldAddNewInlineButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use SilverStripe\Forms\GridField\GridField_SaveHandler;
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\ManyManyThroughList;
Expand Down Expand Up @@ -171,7 +170,7 @@ private function getRowTemplate(GridField $grid, GridFieldEditableColumns $edita
return $columns->renderWith('Symbiote\\GridFieldExtensions\\GridFieldAddNewInlineRow');
}

public function handleSave(GridField $grid, DataObjectInterface $record)
public function handleSave(GridField $grid, DataObject $record)
{
$list = $grid->getList();
$value = $grid->Value();
Expand Down
13 changes: 4 additions & 9 deletions src/GridFieldEditableColumns.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\ManyManyThroughList;

Expand Down Expand Up @@ -115,7 +114,7 @@ public function getHTMLFragments($grid)
$grid->addExtraClass('ss-gridfield-editable');
}

public function handleSave(GridField $grid, DataObjectInterface $record)
public function handleSave(GridField $grid, DataObject $record)
{
/** @var DataList $list */
$list = $grid->getList();
Expand Down Expand Up @@ -212,12 +211,10 @@ public function getURLHandlers($grid)
/**
* Gets the field list for a record.
*
* @param GridField $grid
* @param DataObjectInterface $record
* @return FieldList
* @throws Exception
*/
public function getFields(GridField $grid, DataObjectInterface $record)
public function getFields(GridField $grid, DataObject $record)
{
$cols = $this->getDisplayFields($grid);
$fields = FieldList::create();
Expand Down Expand Up @@ -302,11 +299,9 @@ public function getFields(GridField $grid, DataObjectInterface $record)
/**
* Gets the form instance for a record.
*
* @param GridField $grid
* @param DataObjectInterface $record
* @return Form
*/
public function getForm(GridField $grid, DataObjectInterface $record)
public function getForm(GridField $grid, DataObject $record)
{
$fields = $this->getFields($grid, $record);

Expand All @@ -322,7 +317,7 @@ public function getForm(GridField $grid, DataObjectInterface $record)
return $form;
}

protected function getFieldName($name, GridField $grid, DataObjectInterface $record)
protected function getFieldName($name, GridField $grid, DataObject $record)
{
return sprintf(
'%s[%s][%s][%s]',
Expand Down
3 changes: 1 addition & 2 deletions src/GridFieldNestedForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use SilverStripe\Forms\GridField\GridFieldStateAware;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\Hierarchy\Hierarchy;
use SilverStripe\Model\List\SS_List;
use SilverStripe\Versioned\Versioned;
Expand Down Expand Up @@ -444,7 +443,7 @@ public function ToggleLink($action = null): string
return $manager->addStateToURL($this->gridField, $link);
}

public function handleSave(GridField $gridField, DataObjectInterface $record)
public function handleSave(GridField $gridField, DataObject $record)
{
$postKey = GridFieldNestedForm::POST_KEY;
$value = $gridField->Value();
Expand Down
3 changes: 1 addition & 2 deletions src/GridFieldOrderableRows.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
use SilverStripe\Model\List\ArrayList;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\DataObjectSchema;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\FieldType\DBDatetime;
Expand Down Expand Up @@ -572,7 +571,7 @@ public function handleMoveToPage(GridField $grid, $request)
* Handle saving when 'immediateUpdate' is disabled, otherwise this isn't
* necessary for the default sort mode.
*/
public function handleSave(GridField $grid, DataObjectInterface $record)
public function handleSave(GridField $grid, DataObject $record)
{
if (!$this->immediateUpdate) {
$value = $grid->Value();
Expand Down

0 comments on commit 50fc4f7

Please sign in to comment.