Merge branch '2021.11' into 2022.11

tine20 · Jun 27, 2022 · b9b263a · b9b263a
2 parents 23c67ca + f77fb71
commit b9b263a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ci/gitlab-ci/test_jobs.yml b/ci/gitlab-ci/test_jobs.yml
@@ -76,7 +76,7 @@ phpstan-analysis:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $PHPSTAN_ANALYSES_SCHEDULE != "false"
     - if: $CI_COMMIT_TAG && $PHPSTAN_ANALYSES_STRICT == "true"
       allow_failure: false
-  timeout: 30m
+  timeout: 40m
   interruptible: true
 
 parallel-lint-analysis:

diff --git a/tine20/Tinebase/ActionQueue.php b/tine20/Tinebase/ActionQueue.php
@@ -220,7 +220,11 @@ protected function __construct($_queue, $_forceBackend = null)
       */
     public function executeAction($message)
     {
-        if (! is_array($message) || ! (isset($message['action']) || array_key_exists('action', $message)) || strpos($message['action'], '.') === FALSE) {
+        if (
+            ! is_array($message)
+            || ! isset($message['action'])
+            || strpos($message['action'], '.') === FALSE
+        ) {
             throw new Tinebase_Exception_NotFound('Could not execute action, invalid message/action param');
         }
 
@@ -231,7 +235,8 @@ public function executeAction($message)
         $controller = Tinebase_Core::getApplicationInstance($appName, '', true);
 
         if (! method_exists($controller, $actionName)) {
-            throw new Tinebase_Exception_NotFound('Could not execute action, requested action does not exist');
+            throw new Tinebase_Exception_NotFound('Could not execute action, requested action does not exist: '
+                . $message['action']);
         }
 
         return call_user_func_array(array($controller, $actionName), $message['params']);