From e7ce2b903a75da27d5fc794db5d9fd83618ae934 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 16 May 2024 02:14:55 +0000 Subject: [PATCH] Test fixes --- Controller/ApiController.php | 28 ++++++++++++++++++++++++++++ Controller/CliController.php | 2 +- Docs/Dev/en/structure.md | 9 --------- Docs/Help/en/introduction.md | 2 +- info.json | 2 +- 5 files changed, 31 insertions(+), 12 deletions(-) delete mode 100755 Docs/Dev/en/structure.md diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 92ad865..dfc9d73 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -169,6 +169,10 @@ final class ApiController extends Controller switch ($request->getData('type')) { case 'pdf': + if (!isset($tcoll['pdf'])) { + break; + } + $response->header->set( 'Content-disposition', 'attachment; filename="' . $name . '.' @@ -179,6 +183,10 @@ final class ApiController extends Controller $view->setTemplate('/' . \substr($tcoll['pdf']->getPath(), 0, -8), 'pdf.php'); break; case 'csv': + if (!isset($tcoll['csv'])) { + break; + } + $response->header->set( 'Content-disposition', 'attachment; filename="' . $name . '.' @@ -190,6 +198,10 @@ final class ApiController extends Controller break; case 'xls': case 'xlsx': + if (!isset($tcoll['excel'])) { + break; + } + $response->header->set( 'Content-disposition', 'attachment; filename="' . $name . '.' @@ -201,6 +213,10 @@ final class ApiController extends Controller break; case 'doc': case 'docx': + if (!isset($tcoll['word'])) { + break; + } + $response->header->set( 'Content-disposition', 'attachment; filename="' . $name . '.' @@ -212,6 +228,10 @@ final class ApiController extends Controller break; case 'ppt': case 'pptx': + if (!isset($tcoll['powerpoint'])) { + break; + } + $response->header->set( 'Content-disposition', 'attachment; filename="' . $name . '.' @@ -222,10 +242,18 @@ final class ApiController extends Controller $view->setTemplate('/' . \substr($tcoll['powerpoint']->getPath(), 0, -8), 'ppt.php'); break; case 'json': + if (!isset($tcoll['json'])) { + break; + } + $response->header->set('Content-Type', MimeType::M_JSON, true); $view->setTemplate('/' . \substr($tcoll['json']->getPath(), 0, -9), 'json.php'); break; default: + if (!isset($tcoll['template'])) { + break; + } + $response->header->set('Content-Type', 'text/html; charset=utf-8'); $view->setTemplate('/' . \substr($tcoll['template']->getPath(), 0, -8)); } diff --git a/Controller/CliController.php b/Controller/CliController.php index 593c16a..4dc43d2 100755 --- a/Controller/CliController.php +++ b/Controller/CliController.php @@ -55,7 +55,7 @@ final class CliController extends Controller $hooks = $workflow->getHooks(); foreach ($hooks as $hook) { - /** @var array{':triggerGroup'?:string} $data */ + /** @var array{'@triggerGroup':string} $data */ $triggerIsRegex = \stripos($data['@triggerGroup'], '/') === 0; $matched = false; diff --git a/Docs/Dev/en/structure.md b/Docs/Dev/en/structure.md deleted file mode 100755 index 2cb12b2..0000000 --- a/Docs/Dev/en/structure.md +++ /dev/null @@ -1,9 +0,0 @@ -# Structure - -## ER - -![ER](Modules/Workflow/Docs/Dev/img/er.png) - -## Call graph - -![Call graph](Modules/Workflow/Docs/Dev/img/workflow_execution_path.drawio.svg) \ No newline at end of file diff --git a/Docs/Help/en/introduction.md b/Docs/Help/en/introduction.md index 5085657..799d68f 100755 --- a/Docs/Help/en/introduction.md +++ b/Docs/Help/en/introduction.md @@ -16,7 +16,7 @@ By default the application will test during the installation process if the Cli # Setup -This module doesn't have any additional setup requirements since it is installed during the application install process. +This module doesn't have any additional setup requirements. # Features diff --git a/info.json b/info.json index 4f6d992..afa2301 100755 --- a/info.json +++ b/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "description": "Workflow module.", "directory": "Workflow",