From 977661781686a5054cb01b6bbc298f2ab9f6ab15 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 21 Oct 2020 22:50:20 +0200 Subject: [PATCH] correct datamapper self/external usage (invert) --- Models/AccountMapper.php | 6 +++--- Models/AddressMapper.php | 2 +- Models/GroupMapper.php | 4 ++-- Models/LocalizationMapper.php | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index c9f0c5a..4f39f02 100755 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -61,7 +61,7 @@ final class AccountMapper extends DataMapperAbstract protected static array $ownsOne = [ 'localization' => [ 'mapper' => LocalizationMapper::class, - 'self' => 'account_localization', + 'external' => 'account_localization', ], ]; @@ -75,8 +75,8 @@ final class AccountMapper extends DataMapperAbstract 'groups' => [ 'mapper' => GroupMapper::class, 'table' => 'account_group', - 'external' => 'account_group_account', - 'self' => 'account_group_group', + 'external' => 'account_group_group', + 'self' => 'account_group_account', ], ]; diff --git a/Models/AddressMapper.php b/Models/AddressMapper.php index c1ac184..4df6cc4 100755 --- a/Models/AddressMapper.php +++ b/Models/AddressMapper.php @@ -54,7 +54,7 @@ final class AddressMapper extends DataMapperAbstract protected static array $ownsOne = [ 'country' => [ 'mapper' => CountryMapper::class, - 'self' => 'address_country', + 'external' => 'address_country', 'by' => 'code2', 'column' => 'code2', 'conditional' => true, diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php index 00e6fd2..e41e64c 100755 --- a/Models/GroupMapper.php +++ b/Models/GroupMapper.php @@ -84,8 +84,8 @@ final class GroupMapper extends DataMapperAbstract 'accounts' => [ 'mapper' => AccountMapper::class, 'table' => 'account_group', - 'external' => 'account_group_group', - 'self' => 'account_group_account', + 'external' => 'account_group_account', + 'self' => 'account_group_group', ], ]; diff --git a/Models/LocalizationMapper.php b/Models/LocalizationMapper.php index f53119a..952b68a 100755 --- a/Models/LocalizationMapper.php +++ b/Models/LocalizationMapper.php @@ -100,21 +100,21 @@ final class LocalizationMapper extends DataMapperAbstract protected static array $ownsOne = [ 'country' => [ 'mapper' => CountryMapper::class, - 'self' => 'l11n_country', + 'external' => 'l11n_country', 'by' => 'code2', 'column' => 'code2', 'conditional' => true, ], 'lang' => [ 'mapper' => LanguageMapper::class, - 'self' => 'l11n_language', + 'external' => 'l11n_language', 'by' => 'code2', 'column' => 'code2', 'conditional' => true, ], 'currency' => [ 'mapper' => CurrencyMapper::class, - 'self' => 'l11n_currency', + 'external' => 'l11n_currency', 'by' => 'code', 'column' => 'code', 'conditional' => true,