Merge branch 'wip_react_sockt_test' into develop

2019-03-01 14:22:25 +01:00
parent 3223843ef6 a154fe80e8
commit 20a9d7811c
22 changed files with 481 additions and 404 deletions
--- a/app/main/controller/api/user.php
+++ b/app/main/controller/api/user.php
@@ -199,7 +199,6 @@ class User extends Controller\Controller{
    /**
     * log the current user out + clear character system log data
     * @param \Base $f3
-     * @throws \ZMQSocketException
     */
    public function logout(\Base $f3){
        $this->logoutCharacter($f3, false, true, true, true);
@@ -354,7 +353,6 @@ class User extends Controller\Controller{
     * delete current user account from DB
     * @param \Base $f3
     * @throws Exception
-     * @throws \ZMQSocketException
     */
    public function deleteAccount(\Base $f3){
        $data = $f3->get('POST.formData');