From 424a7dca3ce661bdbc3d185049abea598ac49ae6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 14 Nov 2019 17:44:46 +0100 Subject: [PATCH] fixes for tests --- Admin/Installer.php | 4 ++-- Controller/ApiController.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index f2673c8..3db06a8 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -79,7 +79,7 @@ class Installer extends InstallerAbstract ); } - $con->execute($query->toSql()); + $query->execute(); } /** @@ -112,6 +112,6 @@ class Installer extends InstallerAbstract ); } - $con->execute($query->toSql()); + $query->execute(); } } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index c4e6566..7164047 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -377,8 +377,7 @@ final class ApiController extends Controller private function validateAccountCreate(RequestAbstract $request) : array { $val = []; - if (($val['login'] = empty($request->getData('login'))) - || ($val['name1'] = empty($request->getData('name1'))) + if (($val['name1'] = empty($request->getData('name1'))) || ($val['type'] = !AccountType::isValidValue((int) $request->getData('type'))) || ($val['status'] = !AccountStatus::isValidValue((int) $request->getData('status'))) || ($val['email'] = !empty($request->getData('email')) && !Email::isValid((string) $request->getData('email')))