Revert "Revert "remove new error catch syntax with '|' since gitlab runner PHP does not support""

This reverts commit ec46cdf0

extension/Classes/Core/Exception/AbstractException.php

@@ -175,7 +175,9 @@ class AbstractException extends \Exception {
                     $arrMerged[ERROR_MESSAGE_TO_DEVELOPER] = QuickFormQuery::buildInlineReport(\UserReportException::$report_uid,
                             \UserReportException::$report_pathFileName,  \UserReportException::$report_bodytext,
                             \UserReportException::$report_header) . $arrMerged[ERROR_MESSAGE_TO_DEVELOPER];
-                } catch (\Error | \Exception $e) {
+                } catch (\Error $e) {
+                    $arrMerged[ERROR_MESSAGE_TO_DEVELOPER] .= "<br>(inline report editor not available)";
+                } catch (\Exception $e) {
                     $arrMerged[ERROR_MESSAGE_TO_DEVELOPER] .= "<br>(inline report editor not available)";
                 }
 

extension/Classes/Core/Report/ColumnScript.php

@@ -64,7 +64,9 @@ class ColumnScript {
                 // this will be caught bellow
                 throw new \Exception('Include failed.');
             }
-        } catch (\Exception | \Error $e) {
+        } catch (\Exception $e) {
+            Thrower::userReportException('Error during reading script file.', "Error message:\n" . $e->getMessage());
+        } catch (\Error $e) {
             Thrower::userReportException('Error during reading script file.', "Error message:\n" . $e->getMessage());
         }
 
@@ -76,7 +78,11 @@ class ColumnScript {
         try {
             $return = call_user_func_array($param[TOKEN_FUNCTION_CALL], [$param, new ScriptFunctions()]);
             $output = ob_get_clean();
-        } catch (\Exception | \Error $e) {
+        } catch (\Exception $e) {
+            ob_end_clean();
+            Thrower::userReportException('Function execution failed.',
+                "Error message:\n" . $e->getMessage() . "\n\nFunction: " . $param[TOKEN_FUNCTION_CALL] . "\n\nParameters:\n" . print_r($param,true));
+        } catch (\Error $e) {
             ob_end_clean();
             Thrower::userReportException('Function execution failed.',
                 "Error message:\n" . $e->getMessage() . "\n\nFunction: " . $param[TOKEN_FUNCTION_CALL] . "\n\nParameters:\n" . print_r($param,true));

extension/NoT3Page/index.php

@@ -414,7 +414,9 @@ try {
 } catch (\DownloadException $e) {
     $html = $e->formatMessage();
 
-} catch (\Error | \Exception $e) {
+} catch (\Error $e) {
+    $html = "Generic Exception: " . $e->getMessage() . (IS_DEBUG ? ("<br>" . nl2br($e->getTraceAsString())) : '');
+} catch (\Exception $e) {
     $html = "Generic Exception: " . $e->getMessage() . (IS_DEBUG ? ("<br>" . nl2br($e->getTraceAsString())) : '');
 }