From 857e9aea6ee69fc4ef1c4fb7a9e6ee5eaaf51b1f Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 11 Mar 2021 21:23:41 +0100
Subject: [PATCH] draft ::with() function for models

---
 Controller/BackendController.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 5445de3..7dedbb4 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -174,11 +174,11 @@ final class BackendController extends Controller
 
         // audit log
         if ($request->getData('ptype') === 'p') {
-            $view->setData('auditlogs', AuditMapper::withConditional('createdBy', (int) $request->getData('id'), [Audit::class])::getBeforePivot((int) $request->getData('audit'), null, 25));
+            $view->setData('auditlogs', AuditMapper::with('createdBy', (int) $request->getData('id'), [Audit::class])::getBeforePivot((int) $request->getData('audit'), null, 25));
         } elseif ($request->getData('ptype') === 'n') {
-            $view->setData('auditlogs', AuditMapper::withConditional('createdBy', (int) $request->getData('id'), [Audit::class])::getAfterPivot((int) $request->getData('audit'), null, 25));
+            $view->setData('auditlogs', AuditMapper::with('createdBy', (int) $request->getData('id'), [Audit::class])::getAfterPivot((int) $request->getData('audit'), null, 25));
         } else {
-            $view->setData('auditlogs', AuditMapper::withConditional('createdBy', (int) $request->getData('id'), [Audit::class])::getAfterPivot(0, null, 25));
+            $view->setData('auditlogs', AuditMapper::with('createdBy', (int) $request->getData('id'), [Audit::class])::getAfterPivot(0, null, 25));
         }
 
         return $view;
@@ -272,21 +272,21 @@ final class BackendController extends Controller
         // audit log
         if ($request->getData('ptype') === 'p') {
             $view->setData('auditlogs',
-                AuditMapper::withConditional('module', self::MODULE_NAME, [Audit::class])
-                    ::withConditional('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
-                    ::withConditional('ref', (string) $request->getData('id') ?? '0', [Audit::class])
+                AuditMapper::with('module', self::MODULE_NAME, [Audit::class])
+                    ::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
+                    ::with('ref', (string) $request->getData('id') ?? '0', [Audit::class])
                     ::getBeforePivot((int) $request->getData('audit'), null, 25));
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('auditlogs',
-                AuditMapper::withConditional('module', self::MODULE_NAME, [Audit::class])
-                    ::withConditional('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
-                    ::withConditional('ref', (string) $request->getData('id') ?? '0', [Audit::class])
+                AuditMapper::with('module', self::MODULE_NAME, [Audit::class])
+                    ::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
+                    ::with('ref', (string) $request->getData('id') ?? '0', [Audit::class])
                     ::getAfterPivot((int) $request->getData('audit'), null, 25));
         } else {
             $view->setData('auditlogs',
-                AuditMapper::withConditional('module', self::MODULE_NAME, [Audit::class])
-                    ::withConditional('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
-                    ::withConditional('ref', (string) $request->getData('id') ?? '0', [Audit::class])
+                AuditMapper::with('module', self::MODULE_NAME, [Audit::class])
+                    ::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
+                    ::with('ref', (string) $request->getData('id') ?? '0', [Audit::class])
                     ::getAfterPivot(0, null, 25));
         }
 
@@ -378,11 +378,11 @@ final class BackendController extends Controller
 
         // audit log
         if ($request->getData('ptype') === 'p') {
-            $view->setData('auditlogs', AuditMapper::withConditional('module', (string) $request->getData('id'), [Audit::class])::getBeforePivot((int) $request->getData('audit'), null, 25));
+            $view->setData('auditlogs', AuditMapper::with('module', (string) $request->getData('id'), [Audit::class])::getBeforePivot((int) $request->getData('audit'), null, 25));
         } elseif ($request->getData('ptype') === 'n') {
-            $view->setData('auditlogs', AuditMapper::withConditional('module', (string) $request->getData('id'), [Audit::class])::getAfterPivot((int) $request->getData('audit'), null, 25));
+            $view->setData('auditlogs', AuditMapper::with('module', (string) $request->getData('id'), [Audit::class])::getAfterPivot((int) $request->getData('audit'), null, 25));
         } else {
-            $view->setData('auditlogs', AuditMapper::withConditional('module', (string) $request->getData('id'), [Audit::class])::getAfterPivot(0, null, 25));
+            $view->setData('auditlogs', AuditMapper::with('module', (string) $request->getData('id'), [Audit::class])::getAfterPivot(0, null, 25));
         }
 
         return $view;