Merge branch 'pu/ps/tbJson' into '2021.11'

fix(Tinebase/Json): fix method phpdoc and failure handling See merge request tine20/tine20!2258
tine20 · May 11, 2022 · b29a044 · b29a044
2 parents 8a86765 + 8be358b
commit b29a044
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tine20/Tinebase/Frontend/Json.php b/tine20/Tinebase/Frontend/Json.php
@@ -1547,8 +1547,8 @@ public function autoComplete($appName, $modelName, $property, $startswith)
     }
 
     /**
-     * @param string|null $accountLoginName
-     * @param string|null $mfaId
+     * @param ?string $accountLoginName
+     * @param ?string $mfaId
      * @return array
      * @throws Tinebase_Exception_Backend
      * @throws Tinebase_Exception_NotFound

diff --git a/tine20/Tinebase/Server/Json.php b/tine20/Tinebase/Server/Json.php
@@ -458,7 +458,7 @@ protected function _handleException($request, $exception)
         if (method_exists($request, 'getId') && null !== ($id = $request->getId())) {
             $response->setId($id);
         }
-        if (null !== ($version = $request->getVersion())) {
+        if ($request && null !== ($version = $request->getVersion())) {
             $response->setVersion($version);
         }