From ea6ed77fdd90a1ed267b30c4f72a18495eb39a48 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:26:30 +0700 Subject: [PATCH 1/5] refactor: cleanup code twice calling --- src/PhpSpreadsheet/Spreadsheet.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index 09022bbc63..0a2fc54a67 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -660,9 +660,11 @@ public function getAllSheets(): array */ public function getSheetByName(string $worksheetName): ?Worksheet { - $worksheetCount = count($this->workSheetCollection); + $worksheetCount = count($this->workSheetCollection); + $trimWorksheetName = trim($worksheetName, "'"); + for ($i = 0; $i < $worksheetCount; ++$i) { - if (strcasecmp($this->workSheetCollection[$i]->getTitle(), trim($worksheetName, "'")) === 0) { + if (strcasecmp($this->workSheetCollection[$i]->getTitle(), $trimWorksheetName) === 0) { return $this->workSheetCollection[$i]; } } From ca12ffd6ef6aae5ac72e92be28105301370809c5 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:34:42 +0700 Subject: [PATCH 2/5] refactor: using function count instead --- src/PhpSpreadsheet/Spreadsheet.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index 0a2fc54a67..fc85757a37 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -608,7 +608,7 @@ public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null, bool $re */ public function removeSheetByIndex(int $sheetIndex): void { - $numSheets = count($this->workSheetCollection); + $numSheets = $this->getSheetCount(); if ($sheetIndex > $numSheets - 1) { throw new Exception( "You tried to remove a sheet by the out of bounds index: {$sheetIndex}. The actual number of sheets is {$numSheets}." @@ -660,10 +660,9 @@ public function getAllSheets(): array */ public function getSheetByName(string $worksheetName): ?Worksheet { - $worksheetCount = count($this->workSheetCollection); $trimWorksheetName = trim($worksheetName, "'"); - for ($i = 0; $i < $worksheetCount; ++$i) { + for ($i = 0; $i < $this->getSheetCount(); ++$i) { if (strcasecmp($this->workSheetCollection[$i]->getTitle(), $trimWorksheetName) === 0) { return $this->workSheetCollection[$i]; } @@ -792,8 +791,8 @@ public function setActiveSheetIndexByName(string $worksheetName): Worksheet public function getSheetNames(): array { $returnValue = []; - $worksheetCount = $this->getSheetCount(); - for ($i = 0; $i < $worksheetCount; ++$i) { + + for ($i = 0; $i < $this->getSheetCount(); ++$i) { $returnValue[] = $this->getSheet($i)->getTitle(); } From 852182039f50a2d77816ee0ef54bf4638ba68611 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Fri, 4 Jul 2025 07:39:08 -0700 Subject: [PATCH 3/5] Update Spreadsheet.php --- src/PhpSpreadsheet/Spreadsheet.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index fc85757a37..deb6be58da 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -608,7 +608,7 @@ public function addSheet(Worksheet $worksheet, ?int $sheetIndex = null, bool $re */ public function removeSheetByIndex(int $sheetIndex): void { - $numSheets = $this->getSheetCount(); + $numSheets = count($this->workSheetCollection); if ($sheetIndex > $numSheets - 1) { throw new Exception( "You tried to remove a sheet by the out of bounds index: {$sheetIndex}. The actual number of sheets is {$numSheets}." @@ -660,9 +660,10 @@ public function getAllSheets(): array */ public function getSheetByName(string $worksheetName): ?Worksheet { + $worksheetCount = count($this->workSheetCollection); $trimWorksheetName = trim($worksheetName, "'"); - for ($i = 0; $i < $this->getSheetCount(); ++$i) { + for ($i = 0; $i < $wroksheetCount; ++$i) { if (strcasecmp($this->workSheetCollection[$i]->getTitle(), $trimWorksheetName) === 0) { return $this->workSheetCollection[$i]; } @@ -791,8 +792,8 @@ public function setActiveSheetIndexByName(string $worksheetName): Worksheet public function getSheetNames(): array { $returnValue = []; - - for ($i = 0; $i < $this->getSheetCount(); ++$i) { + $worksheetCount = $this->getSheetCount(); + for ($i = 0; $i < $worksheetCount; ++$i) { $returnValue[] = $this->getSheet($i)->getTitle(); } From f52d70984f8767198b353db5cedcb02b80360ac2 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Fri, 4 Jul 2025 07:41:56 -0700 Subject: [PATCH 4/5] Update Spreadsheet.php --- src/PhpSpreadsheet/Spreadsheet.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index deb6be58da..bdab99655e 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -663,7 +663,7 @@ public function getSheetByName(string $worksheetName): ?Worksheet $worksheetCount = count($this->workSheetCollection); $trimWorksheetName = trim($worksheetName, "'"); - for ($i = 0; $i < $wroksheetCount; ++$i) { + for ($i = 0; $i < $worksheetCount; ++$i) { if (strcasecmp($this->workSheetCollection[$i]->getTitle(), $trimWorksheetName) === 0) { return $this->workSheetCollection[$i]; } From ca284fac354aace25753929ce9954c59665db3bf Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Fri, 4 Jul 2025 09:15:02 -0700 Subject: [PATCH 5/5] Update Spreadsheet.php --- src/PhpSpreadsheet/Spreadsheet.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index bdab99655e..549e4cdda9 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -660,12 +660,10 @@ public function getAllSheets(): array */ public function getSheetByName(string $worksheetName): ?Worksheet { - $worksheetCount = count($this->workSheetCollection); $trimWorksheetName = trim($worksheetName, "'"); - - for ($i = 0; $i < $worksheetCount; ++$i) { - if (strcasecmp($this->workSheetCollection[$i]->getTitle(), $trimWorksheetName) === 0) { - return $this->workSheetCollection[$i]; + foreach ($this->workSheetCollection as $worksheet) { + if (strcasecmp($worksheet->getTitle(), $trimWorksheetName) === 0) { + return $worksheet; } }