From cdce4ebf319b2390e56cd8465e159ae2f47637ad Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 29 Feb 2024 00:47:25 +0000
Subject: [PATCH] Issue #3422485 by mondrake, smustgrave: Change
DrupalLogErrorTest::provideFatalExitCodeData to static
(cherry picked from commit 5eca8bf8d99500aa0f1aa2f7c903871e5dcf790e)
---
core/tests/Drupal/Tests/Core/Error/DrupalLogErrorTest.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/tests/Drupal/Tests/Core/Error/DrupalLogErrorTest.php b/core/tests/Drupal/Tests/Core/Error/DrupalLogErrorTest.php
index d07c425ea545..4bd3e8bbab4f 100644
--- a/core/tests/Drupal/Tests/Core/Error/DrupalLogErrorTest.php
+++ b/core/tests/Drupal/Tests/Core/Error/DrupalLogErrorTest.php
@@ -19,7 +19,7 @@ class DrupalLogErrorTest extends UnitTestCase {
*
* @dataProvider provideFatalExitCodeData
*/
- public function testFatalExitCode(string $script, string $output, string $errorOutput, bool $processIsSuccessful) {
+ public function testFatalExitCode(string $script, string $output, string $errorOutput, bool $processIsSuccessful): void {
// We need to override the current working directory for invocations from
// run-tests.sh to work properly.
$process = new PhpProcess($script, $this->root);
@@ -32,9 +32,9 @@ public function testFatalExitCode(string $script, string $output, string $errorO
$this->assertSame($processIsSuccessful, $process->isSuccessful());
}
- public function provideFatalExitCodeData() {
+ public function provideFatalExitCodeData(): array {
$verbose = "\$GLOBALS['config']['system.logging']['error_level'] = 'verbose';";
- $scriptBody = $this->getScriptBody();
+ $scriptBody = self::getScriptBody();
$data['normal'] = [
"<?php\n\$fatal = TRUE;\n$scriptBody",
"kernel test: This is a test message in test_function (line 456 of test.module).\n",
@@ -50,7 +50,7 @@ public function provideFatalExitCodeData() {
return $data;
}
- protected function getScriptBody() {
+ protected static function getScriptBody(): string {
return <<<'EOT'
if (PHP_SAPI !== 'cli') {
return;
--
GitLab