From 5b8b59a1f86dbf7abe5f1b181e0e5b18cd97eb2b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 13 Mar 2020 23:30:58 +0100
Subject: [PATCH] make fixes for new datamapper

---
 Controller/BackendController.php | 6 ++----
 Models/AccountMapper.php         | 4 ++--
 Models/LocalizationMapper.php    | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 9b310cb..0827bd1 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,10 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Admin\Controller;
 
-use Modules\Admin\Models\Account;
 use Modules\Admin\Models\AccountMapper;
 use Modules\Admin\Models\AccountPermissionMapper;
-use Modules\Admin\Models\Group;
 use Modules\Admin\Models\GroupMapper;
 use Modules\Admin\Models\GroupPermissionMapper;
 use Modules\Admin\Models\NullAccountPermission;
@@ -138,7 +136,7 @@ final class BackendController extends Controller
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response));
-        $view->addData('account', AccountMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2));
+        $view->addData('account', AccountMapper::get((int) $request->getData('id'), RelationType::ALL, 2));
 
         $permissions = AccountPermissionMapper::getFor((int) $request->getData('id'), 'account');
 
@@ -213,7 +211,7 @@ final class BackendController extends Controller
         $view = new View($this->app->l11nManager, $request, $response);
         $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response));
-        $view->addData('group', GroupMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2));
+        $view->addData('group', GroupMapper::get((int) $request->getData('id'), RelationType::ALL, 2));
 
         $permissions = GroupPermissionMapper::getFor((int) $request->getData('id'), 'group');
 
diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index a6c9acc..59d9414 100644
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -115,7 +115,7 @@ final class AccountMapper extends DataMapperAbstract
     public static function getWithPermissions(int $id) : Account
     {
         $account          = self::get($id);
-        $groupPermissions = GroupPermissionMapper::getFor(\array_keys($account->getGroups()), 'group', RelationType::ALL, null, 2);
+        $groupPermissions = GroupPermissionMapper::getFor(\array_keys($account->getGroups()), 'group', RelationType::ALL, 2);
 
         if (\is_array($groupPermissions)) {
             foreach ($groupPermissions as $permission) {
@@ -125,7 +125,7 @@ final class AccountMapper extends DataMapperAbstract
             $account->addPermissions([$groupPermissions]);
         }
 
-        $accountPermissions = AccountPermissionMapper::getFor($id, 'account', RelationType::ALL, null, 2);
+        $accountPermissions = AccountPermissionMapper::getFor($id, 'account', RelationType::ALL, 2);
 
         if (\is_array($accountPermissions)) {
             foreach ($accountPermissions as $permission) {
diff --git a/Models/LocalizationMapper.php b/Models/LocalizationMapper.php
index b7ad963..f31a65a 100644
--- a/Models/LocalizationMapper.php
+++ b/Models/LocalizationMapper.php
@@ -15,12 +15,12 @@ declare(strict_types=1);
 namespace Modules\Admin\Models;
 
 use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\RelationType;
 use phpOMS\Localization\Defaults\CountryMapper;
 use phpOMS\Localization\Defaults\CurrencyMapper;
 use phpOMS\Localization\Defaults\LanguageMapper;
 use phpOMS\Localization\Localization;
-use phpOMS\DataStorage\Database\Query\Builder;
 
 /**
  * Localization mapper.
@@ -156,6 +156,6 @@ final class LocalizationMapper extends DataMapperAbstract
      */
     public static function get($primaryKey, int $relations = RelationType::ALL, int $depth = 1, string $ref = null, Builder $query = null)
     {
-        return parent::get($primaryKey, $relations, 1);
+        return parent::get($primaryKey, $relations, 2);
     }
 }