From cb850c3bf6de112a64dc2e75c55e9b332d3741dc Mon Sep 17 00:00:00 2001 From: Lauri Eskola <lauri.eskola@acquia.com> Date: Sat, 29 Jul 2023 16:40:49 +0300 Subject: [PATCH] Issue #3376396 by longwave: Fix PHPStan error in run-tests.sh --- core/phpstan.neon.dist | 7 +++++-- core/scripts/run-tests.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/phpstan.neon.dist b/core/phpstan.neon.dist index cf022ac13f93..ca2787a16bda 100644 --- a/core/phpstan.neon.dist +++ b/core/phpstan.neon.dist @@ -8,6 +8,9 @@ parameters: level: 1 + fileExtensions: + - sh + paths: - . - ../composer @@ -20,8 +23,8 @@ parameters: - */tests/fixtures/*.php - */tests/fixtures/*.php.gz # Skip Drupal 6 & 7 code. - - core/scripts/generate-d6-content.sh - - core/scripts/generate-d7-content.sh + - scripts/dump-database-d?.sh + - scripts/generate-d?-content.sh # Skip data files. - lib/Drupal/Component/Transliteration/data/*.php # Below extends on purpose a non existing class for testing. diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh index 32f021702f1d..7cf7a856c6f1 100755 --- a/core/scripts/run-tests.sh +++ b/core/scripts/run-tests.sh @@ -1236,7 +1236,7 @@ function simpletest_script_format_result($result) { $message = trim(strip_tags($result->message)); if ($args['non-html']) { - $message = Html::decodeEntities($message, ENT_QUOTES, 'UTF-8'); + $message = Html::decodeEntities($message); } $lines = explode("\n", wordwrap($message), 76); foreach ($lines as $line) { -- GitLab