From 54aa5729abdc3e19ddf2f47b63286a95dca2dea9 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Mon, 9 Oct 2023 22:06:38 +0000
Subject: [PATCH] update

---
 Admin/Hooks/Cli.php                           | 19 ++++++
 Admin/Installer.php                           |  8 +--
 Controller.js                                 |  5 +-
 Controller/ApiController.php                  |  4 +-
 Controller/CliController.php                  | 61 +++++++++++++++++++
 .../Backend/Components/Media/pdf_raw.tpl.php  |  2 +-
 Theme/Backend/Lang/ar.lang.php                |  4 +-
 Theme/Backend/Lang/cs.lang.php                |  4 +-
 Theme/Backend/Lang/da.lang.php                |  4 +-
 Theme/Backend/Lang/de.lang.php                |  4 +-
 Theme/Backend/Lang/el.lang.php                |  4 +-
 Theme/Backend/Lang/es.lang.php                |  4 +-
 Theme/Backend/Lang/fi.lang.php                |  4 +-
 Theme/Backend/Lang/fr.lang.php                |  4 +-
 Theme/Backend/Lang/hu.lang.php                |  4 +-
 Theme/Backend/Lang/it.lang.php                |  4 +-
 Theme/Backend/Lang/ja.lang.php                |  4 +-
 Theme/Backend/Lang/ko.lang.php                |  4 +-
 Theme/Backend/Lang/no.lang.php                |  4 +-
 Theme/Backend/Lang/pl.lang.php                |  4 +-
 Theme/Backend/Lang/pt.lang.php                |  4 +-
 Theme/Backend/Lang/ru.lang.php                |  4 +-
 Theme/Backend/Lang/sv.lang.php                |  4 +-
 Theme/Backend/Lang/th.lang.php                |  4 +-
 Theme/Backend/Lang/tr.lang.php                |  4 +-
 Theme/Backend/Lang/uk.lang.php                |  4 +-
 Theme/Backend/Lang/zh.lang.php                |  4 +-
 .../Api/ApiControllerCollectionTrait.php      |  6 +-
 .../Api/ApiControllerMediaTrait.php           |  8 +--
 29 files changed, 139 insertions(+), 58 deletions(-)
 create mode 100644 Admin/Hooks/Cli.php
 create mode 100644 Controller/CliController.php

diff --git a/Admin/Hooks/Cli.php b/Admin/Hooks/Cli.php
new file mode 100644
index 0000000..5541d87
--- /dev/null
+++ b/Admin/Hooks/Cli.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\Media
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+return [
+    'Module:Admin-encryption-change' => [
+        'callback' => ['\Modules\Media\Controller\CliController:runEncryptionChangeFromHook'],
+    ],
+];
diff --git a/Admin/Installer.php b/Admin/Installer.php
index f0f5269..6c8ae70 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -183,7 +183,7 @@ final class Installer extends InstallerAbstract
 
         $module->apiReferenceCreate($request, $response);
 
-        $responseData = $response->get('');
+        $responseData = $response->getData('');
         if (!\is_array($responseData)) {
             return [];
         }
@@ -221,7 +221,7 @@ final class Installer extends InstallerAbstract
 
         $module->apiCollectionCreate($request, $response);
 
-        $responseData = $response->get('');
+        $responseData = $response->getData('');
         if (!\is_array($responseData)) {
             return [];
         }
@@ -259,7 +259,7 @@ final class Installer extends InstallerAbstract
 
         $module->apiMediaTypeCreate($request, $response);
 
-        $responseData = $response->get('');
+        $responseData = $response->getData('');
         if (!\is_array($responseData)) {
             return [];
         }
@@ -375,7 +375,7 @@ final class Installer extends InstallerAbstract
             $module->apiCollectionCreate($request, $response);
         }
 
-        $responseData = $response->get('');
+        $responseData = $response->getData('');
         if (!\is_array($responseData)) {
             return [];
         }
diff --git a/Controller.js b/Controller.js
index 4e0311e..c180579 100755
--- a/Controller.js
+++ b/Controller.js
@@ -1,11 +1,12 @@
+import { jsOMS }      from '../../jsOMS/Utils/oLib.js';
 import { Autoloader } from '../../jsOMS/Autoloader.js';
 import { NotificationMessage } from '../../jsOMS/Message/Notification/NotificationMessage.js';
 import { NotificationType } from '../../jsOMS/Message/Notification/NotificationType.js';
 import { Upload } from './Models/Upload.js';
 
-Autoloader.defineNamespace('jsOMS.Modules');
+Autoloader.defineNamespace('omsApp.Modules');
 
-jsOMS.Modules.Media = class {
+omsApp.Modules.Media = class {
     /**
      * @constructor
      *
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index c69c745..d955dd8 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -111,7 +111,7 @@ final class ApiController extends Controller
                         $internalResponse = new HttpResponse();
                         $this->apiMediaTypeCreate($request, $internalResponse);
 
-                        if (!\is_array($data = $internalResponse->get($request->uri->__toString()))) {
+                        if (!\is_array($data = $internalResponse->getDataArray($request->uri->__toString()))) {
                             continue;
                         }
 
@@ -144,7 +144,7 @@ final class ApiController extends Controller
                         $internalResponse = new HttpResponse();
                         $this->app->moduleManager->get('Tag')->apiTagCreate($request, $internalResponse);
 
-                        if (!\is_array($data = $internalResponse->get($request->uri->__toString()))) {
+                        if (!\is_array($data = $internalResponse->getDataArray($request->uri->__toString()))) {
                             continue;
                         }
 
diff --git a/Controller/CliController.php b/Controller/CliController.php
new file mode 100644
index 0000000..97bb0b8
--- /dev/null
+++ b/Controller/CliController.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\Media
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+namespace Modules\Media\Controller;
+
+use Model\SettingMapper;
+use Modules\Media\Models\MediaMapper;
+use phpOMS\Contract\RenderableInterface;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\Security\EncryptionHelper;
+use phpOMS\Views\View;
+
+/**
+ * Media controller class.
+ *
+ * @package Modules\Media
+ * @license OMS License 2.0
+ * @link    https://jingga.app
+ * @since   1.0.0
+ */
+final class CliController extends Controller
+{
+    /**
+     * Api method to make a call to the cli app
+     *
+     * @param mixed ...$data Generic data
+     *
+     * @return void
+     *
+     * @api
+     *
+     * @since 1.0.0
+     */
+    public function runEncryptionChangeFromHook(mixed ...$data) : void
+    {
+        $mapper = MediaMapper::yield()
+            ->where('isEncrypted', true);
+
+        foreach ($mapper->execute() as $media) {
+            if (!empty($data['old'])) {
+                $media->decrypt($data['old']);
+            }
+
+            if (!empty($data['new'])) {
+                $media->encrypt($data['new']);
+            }
+        }
+    }
+}
diff --git a/Theme/Backend/Components/Media/pdf_raw.tpl.php b/Theme/Backend/Components/Media/pdf_raw.tpl.php
index 011496e..866bd9c 100755
--- a/Theme/Backend/Components/Media/pdf_raw.tpl.php
+++ b/Theme/Backend/Components/Media/pdf_raw.tpl.php
@@ -16,7 +16,7 @@ use \phpOMS\Uri\UriFactory;
 
 ?>
 <!DOCTYPE html>
-<style>html, body, iframe { margin: 0; padding: 0; border: 0; }</style>
+<style>html, body, iframe { margin: 0; padding: 0; border: 0; width: 100%; height: 100%; overflow: hidden; }</style>
 <iframe
     class="col-simple"
     id="iMediaFrame"
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index 57e7047..803c923 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'يختار',
     'Settings'         => 'إعدادات',
     'Size'             => 'بحجم',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'نوع',
     'Upload'           => 'تحميل',
     'VirtualPath'      => 'المسار الافتراضي',
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index 518e2f3..7b748f8 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Vybrat',
     'Settings'         => 'Nastavení',
     'Size'             => 'Velikost',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Typ',
     'Upload'           => 'nahrát',
     'VirtualPath'      => 'Virtuální cesta',
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index 5dbe2a0..21db728 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Vælg',
     'Settings'         => 'Indstillinger.',
     'Size'             => 'Størrelse',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Type',
     'Upload'           => 'Upload',
     'VirtualPath'      => 'Virtual Path.',
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 43a5849..8bfe1af 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Wählen',
     'Settings'         => 'Einstellungen',
     'Size'             => 'Größe',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Typ',
     'Upload'           => 'Hochladen',
     'VirtualPath'      => 'Virtueller Pfad',
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index a61a6bd..fd706e5 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Επιλέγω',
     'Settings'         => 'Ρυθμίσεις',
     'Size'             => 'Μέγεθος',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Τύπος',
     'Upload'           => 'Μεταφόρτω',
     'VirtualPath'      => 'Εικονική διαδρομή',
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index a17b3c3..c1d4946 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Seleccione',
     'Settings'         => 'Ajustes',
     'Size'             => 'Tamaño',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Escribe',
     'Upload'           => 'Subir',
     'VirtualPath'      => 'Camino virtual',
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index e23f744..ac0e1bf 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Valitse',
     'Settings'         => 'asetukset',
     'Size'             => 'Koko',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Tyyppi',
     'Upload'           => 'Ladata',
     'VirtualPath'      => 'Virtuaalinen polku',
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 25bd709..a5b9e66 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Sélectionner',
     'Settings'         => 'Réglages',
     'Size'             => 'Taille',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Taper',
     'Upload'           => 'Télécharger',
     'VirtualPath'      => 'Voie virtuelle',
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index 8e2b0d5..df71703 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Kiválaszt',
     'Settings'         => 'Beállítások',
     'Size'             => 'Méret',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'típus',
     'Upload'           => 'Feltöltés',
     'VirtualPath'      => 'Virtuális út',
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index 2e9225a..e402e9e 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Selezionare',
     'Settings'         => 'Impostazioni',
     'Size'             => 'Misurare',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Tipo',
     'Upload'           => 'Caricamento',
     'VirtualPath'      => 'Percorso virtuale',
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index a045e5e..09f0475 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => '選択する',
     'Settings'         => '設定',
     'Size'             => 'サイズ',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'タイプ',
     'Upload'           => 'アップロード',
     'VirtualPath'      => '仮想パス',
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index c0c87a1..ac77934 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => '선택하다',
     'Settings'         => '설정',
     'Size'             => '크기',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => '유형',
     'Upload'           => '업로드',
     'VirtualPath'      => '가상 경로',
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index 304edbf..095878e 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Plukke ut',
     'Settings'         => 'Innstillinger',
     'Size'             => 'Størrelse',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Type',
     'Upload'           => 'Laste opp',
     'VirtualPath'      => 'Virtual Path.',
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index c3874a6..08cfbe1 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Wybierać',
     'Settings'         => 'Ustawienia',
     'Size'             => 'Rozmiar',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Rodzaj',
     'Upload'           => 'Wgrywać',
     'VirtualPath'      => 'Wirtualna ścieżka',
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 5973465..ea4337d 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Selecione.',
     'Settings'         => 'Configurações',
     'Size'             => 'Tamanho',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Modelo',
     'Upload'           => 'Envio',
     'VirtualPath'      => 'Caminho virtual',
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index 6886bc0..97c84f4 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Выбирать',
     'Settings'         => 'Настройки',
     'Size'             => 'Размер',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Тип',
     'Upload'           => 'Загрузить',
     'VirtualPath'      => 'Виртуальный путь',
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index 00ec08c..abcfeeb 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Välj',
     'Settings'         => 'inställningar',
     'Size'             => 'Storlek',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Typ',
     'Upload'           => 'Ladda upp',
     'VirtualPath'      => 'Virtuell väg',
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index d92d319..f6a5ac8 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'เลือก',
     'Settings'         => 'การตั้งค่า',
     'Size'             => 'ขนาด',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'พิมพ์',
     'Upload'           => 'ที่อัพโหลด',
     'VirtualPath'      => 'เส้นทางเสมือน',
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index e459b94..8f22be6 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Seçme',
     'Settings'         => 'Ayarlar',
     'Size'             => 'Boyut',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Tip',
     'Upload'           => 'Yüklemek',
     'VirtualPath'      => 'Sanal yol',
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index f4a849c..877c75d 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => 'Вибирати',
     'Settings'         => 'Налаштування',
     'Size'             => 'Розмір',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => 'Тип',
     'Upload'           => 'Завантажувати',
     'VirtualPath'      => 'Віртуальний шлях',
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index 4a97107..9e2b78d 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -44,8 +44,8 @@ return ['Media' => [
     'Select'           => '选择',
     'Settings'         => '设置',
     'Size'             => '尺寸',
-    'Tag'              => '#VALUE!',
-    'Tags'             => '#VALUE!',
+    'Tag'              => '',
+    'Tags'             => '',
     'Type'             => '类型',
     'Upload'           => '上传',
     'VirtualPath'      => '虚拟路径',
diff --git a/tests/Controller/Api/ApiControllerCollectionTrait.php b/tests/Controller/Api/ApiControllerCollectionTrait.php
index f044e63..cf57707 100755
--- a/tests/Controller/Api/ApiControllerCollectionTrait.php
+++ b/tests/Controller/Api/ApiControllerCollectionTrait.php
@@ -72,7 +72,7 @@ trait ApiControllerCollectionTrait
         }
 
         $media        = [];
-        $createdMedia = $response->get('')['response'];
+        $createdMedia = $response->getDataArray('')['response'];
         foreach ($createdMedia as $file) {
             $media[] = $file;
         }
@@ -87,7 +87,7 @@ trait ApiControllerCollectionTrait
 
         $this->module->apiCollectionCreate($request, $response);
 
-        $collection = $response->get('')['response'];
+        $collection = $response->getDataArray('')['response'];
         self::assertEquals('Test Collection', $collection->name);
         self::assertCount(2, $collection->getSources());
     }
@@ -123,7 +123,7 @@ trait ApiControllerCollectionTrait
 
         $this->module->apiCollectionCreate($request, $response);
 
-        $collection = $response->get('')['response'];
+        $collection = $response->getDataArray('')['response'];
         self::assertTrue(\is_dir(__DIR__ . '/../../../Files/test/path'));
 
         Directory::delete(__DIR__ . '/../../../Files/test/path');
diff --git a/tests/Controller/Api/ApiControllerMediaTrait.php b/tests/Controller/Api/ApiControllerMediaTrait.php
index b276019..117ca29 100755
--- a/tests/Controller/Api/ApiControllerMediaTrait.php
+++ b/tests/Controller/Api/ApiControllerMediaTrait.php
@@ -120,7 +120,7 @@ trait ApiControllerMediaTrait
             Directory::delete(__DIR__ . '/temp');
         }
 
-        $media = $response->get('')['response'];
+        $media = $response->getDataArray('')['response'];
         self::assertCount(2, $media);
     }
 
@@ -171,7 +171,7 @@ trait ApiControllerMediaTrait
             Directory::delete(__DIR__ . '/temp');
         }
 
-        $media = $response->get('')['response'];
+        $media = $response->getDataArray('')['response'];
         self::assertTrue(\is_file(__DIR__ . '/../test/path/testFile1.txt'));
         self::assertTrue(\is_file(__DIR__ . '/../test/path/testFile2.txt'));
 
@@ -238,7 +238,7 @@ trait ApiControllerMediaTrait
         TestUtils::setMember($request, 'files', $files);
         $this->module->apiMediaUpload($request, $response);
 
-        $id       = \reset($response->get('')['response']);
+        $id       = \reset($response->getDataArray('')['response']);
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
@@ -278,7 +278,7 @@ trait ApiControllerMediaTrait
 
         $this->module->apiMediaCreate($request, $response);
 
-        self::assertCount(1, $response->get('')['response']);
+        self::assertCount(1, $response->getDataArray('')['response']);
         self::assertTrue(\is_file(__DIR__ . '/../test/path/created.md'));
 
         Directory::delete(__DIR__ . '/../test');