diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 636f460..8fa8e87 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -105,7 +105,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; } @@ -310,7 +310,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/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index 8d48da9..0d1b180 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'نشيط', ':bStatus2' => 'غير نشط', ':bStatus3' => 'في الأرشيف', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'لوحة القيادة', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index feb7db4..47578c3 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktivní', ':bStatus2' => 'Neaktivní', ':bStatus3' => 'Archivovaný', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Přístrojová deska', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index 1632bbe..7f259b6 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktiv', ':bStatus2' => 'Inaktiv.', ':bStatus3' => 'Arkiveret', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Dashboard.', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 1b34dc5..289ecc1 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktiv', ':bStatus2' => 'Inaktiv', ':bStatus3' => 'Archiviert', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Armaturenbrett', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index b527fcf..d7533fc 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Ενεργός', ':bStatus2' => 'Αδρανής', ':bStatus3' => 'Αρχειοθετημένα', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Ταμπλό', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index c41aac4..5f9f93c 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Activo', ':bStatus2' => 'Inactivo', ':bStatus3' => 'Archivado', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Tablero de mandos', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 16b7242..bac4736 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktiivinen', ':bStatus2' => 'Epäaktiivinen', ':bStatus3' => 'Arkistoitu', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Kojelauta', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index f435f19..46ba144 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'actif', ':bStatus2' => 'Inactif', ':bStatus3' => 'Archivé', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Tableau de bord', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index 85b76f1..2c614da 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktív', ':bStatus2' => 'Inaktív', ':bStatus3' => 'Archivált', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Irányítópult', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index efbfd6d..3b41f4f 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Attivo', ':bStatus2' => 'Non attivo', ':bStatus3' => 'Archiviato', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Pannello di controllo', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index a32e727..c81d0d6 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'アクティブ', ':bStatus2' => '非活性', ':bStatus3' => 'アーカイブ', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'ダッシュボード', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index c3a57d9..6758b4c 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => '활동적인', ':bStatus2' => '비활성으로', ':bStatus3' => '보관', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => '계기반', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index 674caed..309ec1e 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktiv', ':bStatus2' => 'Inaktiv', ':bStatus3' => 'Arkivert', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Dashboard.', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 7fa559c..31657ec 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktywny', ':bStatus2' => 'Nieaktywny', ':bStatus3' => 'Zarchiwizowany', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Panel', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index 1847a54..b763822 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Ativo', ':bStatus2' => 'Inativo', ':bStatus3' => 'Arquivado', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Painel', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index ce4a640..292cb4e 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Активный', ':bStatus2' => 'Неактивный', ':bStatus3' => 'В архиве', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Приборная доска', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index 55097fc..dc9c586 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktiva', ':bStatus2' => 'Inaktiv', ':bStatus3' => 'Arkiverad', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'instrumentbräda', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 935c85f..275e0ce 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'คล่องแคล่ว', ':bStatus2' => 'ไม่ใช้งาน', ':bStatus3' => 'ที่เก็บถาวร', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'แผงควบคุม', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 8ee4df5..a99e481 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Aktif', ':bStatus2' => 'Aktif olmayan', ':bStatus3' => 'Arşivlenmiş', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Gösterge Paneli', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 23ba54a..0f22430 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => 'Активний', ':bStatus2' => 'Неактивний', ':bStatus3' => 'Архівований', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => 'Панель приладів', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index 04a947e..dbcff33 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -16,14 +16,14 @@ return ['Kanban' => [ ':bStatus1' => '积极的', ':bStatus2' => '不活跃', ':bStatus3' => '存档', - 'Archive' => '#VALUE!', - 'Back' => '#VALUE!', + 'Archive' => '', + 'Back' => '', 'Dashboard' => '仪表板', - 'Date' => '#VALUE!', + 'Date' => '', 'Description' => '', 'Kanban' => '', 'Name' => '', - 'Status' => '#VALUE!', + 'Status' => '', 'Tags' => '', - 'Title' => '#VALUE!', + 'Title' => '', ]]; diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index de8332f..eca3ef7 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -105,8 +105,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiKanbanBoardCreate($request, $response); - self::assertEquals('Controller Test Board', $response->get('')['response']->name); - self::assertGreaterThan(0, $bId = $response->get('')['response']->id); + self::assertEquals('Controller Test Board', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $bId = $response->getDataArray('')['response']->id); // update $response = new HttpResponse(); @@ -117,7 +117,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('title', 'New Controller Test Board'); $this->module->apiKanbanBoardUpdate($request, $response); - self::assertEquals('New Controller Test Board', $response->get('')['response']->name); + self::assertEquals('New Controller Test Board', $response->getDataArray('')['response']->name); } /** @@ -135,8 +135,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiKanbanColumnCreate($request, $response); - self::assertEquals('Controller Test Column', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('Controller Test Column', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -172,8 +172,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiKanbanCardCreate($request, $response); - self::assertEquals('Controller Test Card', $response->get('')['response']->name); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('Controller Test Card', $response->getDataArray('')['response']->name); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -206,7 +206,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request->setData('media', \json_encode([1])); $this->module->apiKanbanCardCommentCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /**