Skip to content

Commit

Permalink
[BUGFIX] Fix type of MM_oppositeUsage
Browse files Browse the repository at this point in the history
  • Loading branch information
nhovratov committed Dec 9, 2024
1 parent c597601 commit fd7b6ff
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Classes/FieldType/RelationFieldType.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ final class RelationFieldType extends AbstractFieldType
private string $MM = '';
private string $MM_opposite_field = '';
private array $MM_match_fields = [];
private string $MM_oppositeUsage = '';
private array $MM_oppositeUsage = [];
private string $MM_table_where = '';
private string $dontRemapTablesOnCopy = '';
private bool $localizeReferencesAtParentLocalization = false;
Expand Down Expand Up @@ -70,7 +70,7 @@ public function createFromArray(array $settings): RelationFieldType
$self->MM = (string)($settings['MM'] ?? $self->MM);
$self->MM_opposite_field = (string)($settings['MM_opposite_field'] ?? $self->MM_opposite_field);
$self->MM_match_fields = (array)($settings['MM_match_fields'] ?? $self->MM_match_fields);
$self->MM_oppositeUsage = (string)($settings['MM_oppositeUsage'] ?? $self->MM_oppositeUsage);
$self->MM_oppositeUsage = (array)($settings['MM_oppositeUsage'] ?? $self->MM_oppositeUsage);
$self->MM_table_where = (string)($settings['MM_table_where'] ?? $self->MM_table_where);
$self->dontRemapTablesOnCopy = (string)($settings['dontRemapTablesOnCopy'] ?? $self->dontRemapTablesOnCopy);
$self->localizeReferencesAtParentLocalization = (bool)($settings['localizeReferencesAtParentLocalization'] ?? $self->localizeReferencesAtParentLocalization);
Expand Down Expand Up @@ -127,7 +127,7 @@ public function getTca(): array
if ($this->MM_match_fields !== []) {
$config['MM_match_fields'] = $this->MM_match_fields;
}
if ($this->MM_oppositeUsage !== '') {
if ($this->MM_oppositeUsage !== []) {
$config['MM_oppositeUsage'] = $this->MM_oppositeUsage;
}
if ($this->MM_table_where !== '') {
Expand Down
6 changes: 3 additions & 3 deletions Classes/FieldType/SelectFieldType.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ final class SelectFieldType extends AbstractFieldType
private string $MM = '';
private string $MM_opposite_field = '';
private array $MM_match_fields = [];
private string $MM_oppositeUsage = '';
private array $MM_oppositeUsage = [];
private string $MM_table_where = '';
private string $dontRemapTablesOnCopy = '';
private bool $localizeReferencesAtParentLocalization = false;
Expand Down Expand Up @@ -72,7 +72,7 @@ public function createFromArray(array $settings): SelectFieldType
$self->MM = (string)($settings['MM'] ?? $self->MM);
$self->MM_opposite_field = (string)($settings['MM_opposite_field'] ?? $self->MM_opposite_field);
$self->MM_match_fields = (array)($settings['MM_match_fields'] ?? $self->MM_match_fields);
$self->MM_oppositeUsage = (string)($settings['MM_oppositeUsage'] ?? $self->MM_oppositeUsage);
$self->MM_oppositeUsage = (array)($settings['MM_oppositeUsage'] ?? $self->MM_oppositeUsage);
$self->MM_table_where = (string)($settings['MM_table_where'] ?? $self->MM_table_where);
$self->dontRemapTablesOnCopy = (string)($settings['dontRemapTablesOnCopy'] ?? $self->dontRemapTablesOnCopy);
$self->localizeReferencesAtParentLocalization = (bool)($settings['localizeReferencesAtParentLocalization'] ?? $self->localizeReferencesAtParentLocalization);
Expand Down Expand Up @@ -128,7 +128,7 @@ public function getTca(): array
if ($this->MM_match_fields !== []) {
$config['MM_match_fields'] = $this->MM_match_fields;
}
if ($this->MM_oppositeUsage !== '') {
if ($this->MM_oppositeUsage !== []) {
$config['MM_oppositeUsage'] = $this->MM_oppositeUsage;
}
if ($this->MM_table_where !== '') {
Expand Down
6 changes: 3 additions & 3 deletions Tests/Unit/FieldTypes/RelationFieldTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static function getTcaReturnsExpectedTcaDataProvider(): iterable
'MM_match_fields' => [
'foo' => 'bar',
],
'MM_oppositeUsage' => 'foo',
'MM_oppositeUsage' => ['foo'],
'MM_table_where' => 'foo',
'dontRemapTablesOnCopy' => 'foo',
'localizeReferencesAtParentLocalization' => 1,
Expand Down Expand Up @@ -117,7 +117,7 @@ public static function getTcaReturnsExpectedTcaDataProvider(): iterable
'MM_match_fields' => [
'foo' => 'bar',
],
'MM_oppositeUsage' => 'foo',
'MM_oppositeUsage' => ['foo'],
'MM_table_where' => 'foo',
'dontRemapTablesOnCopy' => 'foo',
'localizeReferencesAtParentLocalization' => true,
Expand Down Expand Up @@ -163,7 +163,7 @@ public static function getTcaReturnsExpectedTcaDataProvider(): iterable
'MM' => '',
'MM_opposite_field' => '',
'MM_match_fields' => [],
'MM_oppositeUsage' => '',
'MM_oppositeUsage' => [],
'MM_table_where' => '',
'dontRemapTablesOnCopy' => '',
'localizeReferencesAtParentLocalization' => 0,
Expand Down
6 changes: 3 additions & 3 deletions Tests/Unit/FieldTypes/SelectFieldTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static function getTcaReturnsExpectedTcaDataProvider(): iterable
'MM_match_fields' => [
'foo' => 'bar',
],
'MM_oppositeUsage' => 'foo',
'MM_oppositeUsage' => ['foo'],
'MM_table_where' => 'foo',
'dontRemapTablesOnCopy' => 'foo',
'localizeReferencesAtParentLocalization' => 1,
Expand Down Expand Up @@ -105,7 +105,7 @@ public static function getTcaReturnsExpectedTcaDataProvider(): iterable
'MM_match_fields' => [
'foo' => 'bar',
],
'MM_oppositeUsage' => 'foo',
'MM_oppositeUsage' => ['foo'],
'MM_table_where' => 'foo',
'dontRemapTablesOnCopy' => 'foo',
'localizeReferencesAtParentLocalization' => true,
Expand Down Expand Up @@ -162,7 +162,7 @@ public static function getTcaReturnsExpectedTcaDataProvider(): iterable
'MM' => '',
'MM_opposite_field' => '',
'MM_match_fields' => [],
'MM_oppositeUsage' => '',
'MM_oppositeUsage' => [],
'MM_table_where' => '',
'dontRemapTablesOnCopy' => '',
'localizeReferencesAtParentLocalization' => 0,
Expand Down

0 comments on commit fd7b6ff

Please sign in to comment.