From 1edffabd5de560c4ccbd1c3e0f02f0a6c80fb0c2 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 11 Dec 2021 11:54:17 +0100
Subject: [PATCH] new datamapper mostly implemented

---
 Admin/Install/Application/Shop/Application.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Admin/Install/Application/Shop/Application.php b/Admin/Install/Application/Shop/Application.php
index bfaf5a1..5e24ace 100755
--- a/Admin/Install/Application/Shop/Application.php
+++ b/Admin/Install/Application/Shop/Application.php
@@ -27,7 +27,7 @@ use phpOMS\DataStorage\Cookie\CookieJar;
 use phpOMS\DataStorage\Database\Connection\ConnectionAbstract;
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\DatabaseStatus;
-use phpOMS\DataStorage\Database\DataMapperAbstract;
+use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 use phpOMS\DataStorage\Session\HttpSession;
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Event\EventManager;
@@ -136,13 +136,13 @@ final class Application
 
         /** @var ConnectionAbstract $con */
         $con = $this->app->dbPool->get();
-        DataMapperAbstract::setConnection($con);
+        DataMapperFactory::db($con);
 
         $this->app->cachePool      = new CachePool();
         $this->app->appSettings    = new CoreSettings();
         $this->app->eventManager   = new EventManager($this->app->dispatcher);
         $this->app->accountManager = new AccountManager($this->app->sessionManager);
-        $this->app->l11nServer     = LocalizationMapper::get(1);
+        $this->app->l11nServer     = LocalizationMapper::get()->where('id', 1)->execute();
         $this->app->orgId          = $this->getApplicationOrganization($request, $this->config['app']);
 
         $aid                       = Auth::authenticate($this->app->sessionManager);