From a55f4228745beed686fedb554d84542ff332e843 Mon Sep 17 00:00:00 2001 From: Juan Algaba Date: Thu, 30 Aug 2018 16:27:26 -0700 Subject: [PATCH 1/2] Fix broken sample links on windows due to $baseDir having backslash instead of forward slash --- src/PhpSpreadsheet/Helper/Sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhpSpreadsheet/Helper/Sample.php b/src/PhpSpreadsheet/Helper/Sample.php index 54e0e2988e..e40100fb68 100644 --- a/src/PhpSpreadsheet/Helper/Sample.php +++ b/src/PhpSpreadsheet/Helper/Sample.php @@ -82,7 +82,7 @@ public function getSamples() $files = []; foreach ($regex as $file) { - $file = str_replace($baseDir . '/', '', $file[0]); + $file = str_replace(str_replace('\\','/',$baseDir) . '/', '', str_replace('\\','/',$file[0])); $info = pathinfo($file); $category = str_replace('_', ' ', $info['dirname']); $name = str_replace('_', ' ', preg_replace('/(|\.php)/', '', $info['filename'])); From 1430897fd3a9fc0d5f586afdc21b521652bdedb1 Mon Sep 17 00:00:00 2001 From: Juan Algaba Date: Fri, 31 Aug 2018 09:50:30 -0700 Subject: [PATCH 2/2] Fix broken sample links on windows due to $baseDir having backslash instead of forward slash --- src/PhpSpreadsheet/Helper/Sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhpSpreadsheet/Helper/Sample.php b/src/PhpSpreadsheet/Helper/Sample.php index e40100fb68..e199c807c0 100644 --- a/src/PhpSpreadsheet/Helper/Sample.php +++ b/src/PhpSpreadsheet/Helper/Sample.php @@ -82,7 +82,7 @@ public function getSamples() $files = []; foreach ($regex as $file) { - $file = str_replace(str_replace('\\','/',$baseDir) . '/', '', str_replace('\\','/',$file[0])); + $file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0])); $info = pathinfo($file); $category = str_replace('_', ' ', $info['dirname']); $name = str_replace('_', ' ', preg_replace('/(|\.php)/', '', $info['filename']));