From c88b01023a91e3d9d561250889a5a67b7b3e103d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 6 Jun 2019 22:09:26 +0200
Subject: [PATCH] static analysis fixes

---
 Controller/ApiController.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 53a3fc3..78f31f9 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -832,7 +832,7 @@ final class ApiController extends Controller
 
         $updateFilesJson = Rest::request($request)->getJsonData();
 
-        /** @var array<string, array<string, array>> */
+        /** @var array<string, array<string, mixed>> */
         $toUpdate = [];
 
         foreach ($updateFilesJson as $file) {
@@ -853,9 +853,9 @@ final class ApiController extends Controller
             $remoteVersion  = \substr($file[1], 0, -5);
 
             if (Version::compare($currentVersion, $remoteVersion) < 0) {
-                $toUpdate[$name][$remoteVersion] = $file;
+                $toUpdate[$name[0]][$remoteVersion] = $file;
 
-                \uksort($toUpdate[$name], [Version::class, 'compare']);
+                \uksort($toUpdate[$name[0]], [Version::class, 'compare']);
             }
         }
 
@@ -908,7 +908,12 @@ final class ApiController extends Controller
 
     private function runUpdate(string $updateFile) : void
     {
-        $package    = \json_decode(\file_get_contents($updateFile), true);
+        $updateContent = \file_get_contents($updateFile);
+        if ($updateContent === false) {
+            return;
+        }
+
+        $package    = \json_decode($updateContent, true);
         $updatePath = \dirname($updateFile);
         $subPath    = $package['type'] === 'Modules/' ? $package['name'] : '';