[XLSX] Fix sheet title extract function

guillaume-ro-fr · guillaume-ro-fr · commit 5b61d6c609a6 · 2020-11-09T17:23:25.000+01:00
XLSX extractSheetTitle return the quote character in sheet name Fix PHPOffice#739
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -2696,7 +2696,14 @@ public static function extractSheetTitle($pRange, $returnRange = false)
         }
 
         if ($returnRange) {
-            return [substr($pRange, 0, $sep), substr($pRange, $sep + 1)];
+            $sheet = substr($pRange, 0, $sep);
+            if (($pos = strpos($sheet, "'")) !== false) {
+                $sheet = substr_replace($sheet, '', $pos, 1);
+            }
+            if (($pos = strrpos($sheet, "'")) !== false) {
+                $sheet = substr_replace($sheet, '', $pos, 1);
+            }
+            return [$sheet, substr($pRange, $sep + 1)];
         }
 
         return substr($pRange, $sep + 1);

Original file line number	Diff line number	Diff line change
`@@ -2696,7 +2696,14 @@ public static function extractSheetTitle($pRange, $returnRange = false)`
`2696`	`2696`	`}`
`2697`	`2697`
`2698`	`2698`	`if ($returnRange) {`
`2699`		`- return [substr($pRange, 0, $sep), substr($pRange, $sep + 1)];`
	`2699`	`+ $sheet = substr($pRange, 0, $sep);`
	`2700`	`+ if (($pos = strpos($sheet, "'")) !== false) {`
	`2701`	`+ $sheet = substr_replace($sheet, '', $pos, 1);`
	`2702`	`+ }`
	`2703`	`+ if (($pos = strrpos($sheet, "'")) !== false) {`
	`2704`	`+ $sheet = substr_replace($sheet, '', $pos, 1);`
	`2705`	`+ }`
	`2706`	`+ return [$sheet, substr($pRange, $sep + 1)];`
`2700`	`2707`	`}`
`2701`	`2708`
`2702`	`2709`	`return substr($pRange, $sep + 1);`