[XLSX] Fix sheet title extract function

guillaume-ro-fr · guillaume-ro-fr · commit 231d06a13f83 · 2018-10-29T16:23:46.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
@@ -2734,7 +2734,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
`@@ -2734,7 +2734,14 @@ public static function extractSheetTitle($pRange, $returnRange = false)`
`2734`	`2734`	`}`
`2735`	`2735`
`2736`	`2736`	`if ($returnRange) {`
`2737`		`- return [substr($pRange, 0, $sep), substr($pRange, $sep + 1)];`
	`2737`	`+ $sheet = substr($pRange, 0, $sep);`
	`2738`	`+ if (($pos = strpos($sheet, "'")) !== false) {`
	`2739`	`+ $sheet = substr_replace($sheet, '', $pos, 1);`
	`2740`	`+ }`
	`2741`	`+ if (($pos = strrpos($sheet, "'")) !== false) {`
	`2742`	`+ $sheet = substr_replace($sheet, '', $pos, 1);`
	`2743`	`+ }`
	`2744`	`+ return [$sheet, substr($pRange, $sep + 1)];`
`2738`	`2745`	`}`
`2739`	`2746`
`2740`	`2747`	`return substr($pRange, $sep + 1);`