From b89b4d920e9cbb56392798ba01c454118593f94c Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Sat, 3 Jan 2026 15:56:38 -0800 Subject: [PATCH] Make Tests non-Static --- src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php | 5 +---- src/PhpSpreadsheet/Reader/Html.php | 5 +---- tests/PhpSpreadsheetTests/Cell/Hyperlink2Test.php | 10 +++++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php b/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php index 62317f477..ab35ae358 100644 --- a/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php +++ b/src/PhpSpreadsheet/Calculation/LookupRef/Hyperlink.php @@ -37,10 +37,7 @@ class Hyperlink return ExcelError::REF(); } - if (is_object($displayName)) { - $displayName = $linkURL; - } - $displayName = StringHelper::convertToString($displayName); + $displayName = StringHelper::convertToString($displayName, false); if (trim($displayName) === '') { $displayName = $linkURL; } diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php index b78c2a4c5..7e3b9decc 100644 --- a/src/PhpSpreadsheet/Reader/Html.php +++ b/src/PhpSpreadsheet/Reader/Html.php @@ -321,10 +321,7 @@ class Html extends BaseReader } //catching the Exception and ignoring the invalid data types - $hyperlink = null; - if ($sheet->hyperlinkExists($column . $row)) { - $hyperlink = $sheet->getHyperlink($column . $row); - } + $hyperlink = $sheet->hyperlinkExists($column . $row) ? $sheet->getHyperlink($column . $row) : null; try { $sheet->setCellValueExplicit($column . $row, $cellContent, $attributeArray['data-type']); diff --git a/tests/PhpSpreadsheetTests/Cell/Hyperlink2Test.php b/tests/PhpSpreadsheetTests/Cell/Hyperlink2Test.php index 63190a0ce..255d0550e 100644 --- a/tests/PhpSpreadsheetTests/Cell/Hyperlink2Test.php +++ b/tests/PhpSpreadsheetTests/Cell/Hyperlink2Test.php @@ -10,7 +10,7 @@ use PHPUnit\Framework\TestCase; class Hyperlink2Test extends TestCase { - public static function testTwoLiterals(): void + public function testTwoLiterals(): void { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); @@ -35,7 +35,7 @@ class Hyperlink2Test extends TestCase $spreadsheet->disconnectWorksheets(); } - public static function testCellAndLiteral(): void + public function testCellAndLiteral(): void { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); @@ -60,7 +60,7 @@ class Hyperlink2Test extends TestCase $spreadsheet->disconnectWorksheets(); } - public static function testLiteralAndCell(): void + public function testLiteralAndCell(): void { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); @@ -110,7 +110,7 @@ class Hyperlink2Test extends TestCase $spreadsheet->disconnectWorksheets(); } - public static function testResetOnSet(): void + public function testResetOnSet(): void { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); @@ -132,7 +132,7 @@ class Hyperlink2Test extends TestCase self::assertSame('', $hyperlink->getTooltip()); } - public static function testResetOnSetExplicit(): void + public function testResetOnSetExplicit(): void { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet();