diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 90866cd703..e8e48b5bbf 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -14425,11 +14425,6 @@ parameters: count: 1 path: src/Table/Table.php - - - message: "#^Dead catch \\- RuntimeException is never thrown in the try block\\.$#" - count: 1 - path: src/Template.php - - message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#" count: 1 diff --git a/src/Template.php b/src/Template.php index f32006a0ad..f8bce6c28d 100644 --- a/src/Template.php +++ b/src/Template.php @@ -26,12 +26,6 @@ use Twig\Loader\FilesystemLoader; use Twig\RuntimeLoader\ContainerRuntimeLoader; use Twig\TemplateWrapper; -use function __; -use function sprintf; -use function trigger_error; - -use const E_USER_WARNING; - /** * Handle front end templating */ @@ -106,23 +100,13 @@ class Template } try { - $template = static::$twig->load($templateName . '.twig'); - } catch (RuntimeException $e) { + return static::$twig->load($templateName . '.twig'); + } catch (RuntimeException) { // @phpstan-ignore-line thrown by Twig\Cache\FilesystemCache /* Retry with disabled cache */ static::$twig->setCache(false); - $template = static::$twig->load($templateName . '.twig'); - // The trigger error is intentionally after second load - // to avoid triggering error when disabling cache does not solve it. - trigger_error( - sprintf( - __('Error while working with template cache: %s'), - $e->getMessage(), - ), - E_USER_WARNING, - ); - } - return $template; + return static::$twig->load($templateName . '.twig'); + } } /**