Skip to content

Commit a244770

Browse files
authored
Merge pull request #381 from esmero/ISSUE-380
ISSUE-380: Add extra Catch for \Errors
2 parents d8ce105 + 201b192 commit a244770

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/Form/MetadataDisplayForm.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types = 1);
23

34
namespace Drupal\format_strawberryfield\Form;
45

@@ -445,7 +446,17 @@ public static function ajaxPreview($form, FormStateInterface $form_state) {
445446
else {
446447
$message = $exception->getMessage();
447448
}
448-
} finally {
449+
} catch (\Error $error) {
450+
$render = null;
451+
// Make the Message easier to read for the end user
452+
if ($error instanceof TwigError) {
453+
$message = $error->getRawMessage() . ' at line ' . $error->getTemplateLine();
454+
}
455+
else {
456+
$message = $error->getMessage();
457+
}
458+
}
459+
finally {
449460
if (!empty($message)) {
450461
// If there's no render output, generate an error message. Otherwise,
451462
// generate a warning.

0 commit comments

Comments
 (0)