From 70f7f06f72ca7a9bb5fd2a62c6f302e6f4ffb59c Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 5 Apr 2022 20:04:47 +0200
Subject: [PATCH] static code analysis fixes

---
 Controller/ApiController.php | 14 +++++++-------
 Models/EditorDocMapper.php   |  2 +-
 composer.json                |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index b44f42c..dbde83d 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -234,8 +234,8 @@ final class ApiController extends Controller
         $doc = $this->createDocFromRequest($request);
         $this->createModel($request->header->account, $doc, EditorDocMapper::class, 'doc', $request->getOrigin());
 
-        if (!empty($request->getFiles() ?? [])
-        || !empty($request->getDataJson('media') ?? [])
+        if (!empty($request->getFiles())
+        || !empty($request->getDataJson('media'))
         ) {
             $this->createDocMedia($doc, $request);
         }
@@ -263,7 +263,7 @@ final class ApiController extends Controller
         $path    = $this->createEditorDir($doc);
         $account = AccountMapper::get()->where('id', $request->header->account)->execute();
 
-        if (!empty($uploadedFiles = $request->getFiles() ?? [])) {
+        if (!empty($uploadedFiles = $request->getFiles())) {
             $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
                 [],
                 [],
@@ -299,7 +299,7 @@ final class ApiController extends Controller
             }
         }
 
-        if (!empty($mediaFiles = $request->getDataJson('media') ?? [])) {
+        if (!empty($mediaFiles = $request->getDataJson('media'))) {
             $collection = null;
 
             foreach ($mediaFiles as $media) {
@@ -516,7 +516,7 @@ final class ApiController extends Controller
             return;
         }
 
-        $uploadedFiles = $request->getFiles() ?? [];
+        $uploadedFiles = $request->getFiles();
 
         if (empty($uploadedFiles)) {
             $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Editor', 'Invalid file', $uploadedFiles);
@@ -526,8 +526,8 @@ final class ApiController extends Controller
         }
 
         $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
-            $request->getDataList('names') ?? [],
-            $request->getDataList('filenames') ?? [],
+            $request->getDataList('names'),
+            $request->getDataList('filenames'),
             $uploadedFiles,
             $request->header->account,
             __DIR__ . '/../../../Modules/Media/Files/Modules/Editor/' . ($request->getData('doc') ?? '0'),
diff --git a/Models/EditorDocMapper.php b/Models/EditorDocMapper.php
index 11c7fc1..ea8e282 100755
--- a/Models/EditorDocMapper.php
+++ b/Models/EditorDocMapper.php
@@ -66,7 +66,7 @@ final class EditorDocMapper extends DataMapperFactory
     /**
      * Belongs to.
      *
-     * @var array<string, array{mapper:string, external:string}>
+     * @var array<string, array{mapper:string, external:string, by?:string, column?:string, conditional?:bool}>
      * @since 1.0.0
      */
     public const OWNS_ONE = [
diff --git a/composer.json b/composer.json
index b90cb5e..10044a1 100755
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "friendsofphp/php-cs-fixer": ">=3.2",
         "squizlabs/php_codesniffer": ">=3.6",
         "phpmd/phpmd": ">=2.9",
-        "phpstan/phpstan": ">=0.12.58",
+        "phpstan/phpstan": ">=1.5.4",
         "phan/phan": ">=3.2.6"
     },
     "minimum-stability": "dev",