tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX Allow subclasses of ManyMany lists in EagerLoadedList (#10905)

Browse Source
This commit is contained in:
Guy Sartorelli 2023-08-08 14:43:08 +12:00 committed by GitHub
parent c9f48089c9
commit f345646481
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ORM/EagerLoadedList.php
View File

@ -889,7 +889,7 @@ class EagerLoadedList extends ViewableData implements Relation, SS_List, Filtera
*/ */
public function getExtraData($componentName, int|string $itemID): array public function getExtraData($componentName, int|string $itemID): array
{ {
if (!in_array(get_class($this->dataList), [ManyManyList::class, ManyManyThroughList::class])) { if (!($this->dataList instanceof ManyManyList) && !($this->dataList instanceof ManyManyThroughList)) {
throw new BadMethodCallException('Cannot have extra fields on this list type'); throw new BadMethodCallException('Cannot have extra fields on this list type');
} }
@ -926,7 +926,7 @@ class EagerLoadedList extends ViewableData implements Relation, SS_List, Filtera
*/ */
public function getExtraFields(): array public function getExtraFields(): array
{ {
if (!in_array(get_class($this->dataList), [ManyManyList::class, ManyManyThroughList::class])) { if (!($this->dataList instanceof ManyManyList) && !($this->dataList instanceof ManyManyThroughList)) {
throw new BadMethodCallException('Cannot have extra fields on this list type'); throw new BadMethodCallException('Cannot have extra fields on this list type');
} }
return $this->extraFields; return $this->extraFields;