8000 [ClassLoader] Use only forward slashes in generated class map · src-run/symfony@6d1f1b5 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6d1f1b5

Browse files
nicolas-grekasfabpot
authored andcommitted
[ClassLoader] Use only forward slashes in generated class map
1 parent ec937cb commit 6d1f1b5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Symfony/Component/ClassLoader/ClassCollectionLoader.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
6363
throw new \RuntimeException(sprintf('Class Collection Loader was not able to create directory "%s"', $cacheDir));
6464
}
6565
$cacheDir = rtrim(realpath($cacheDir) ?: $cacheDir, '/'.DIRECTORY_SEPARATOR);
66-
$cache = $cacheDir.DIRECTORY_SEPARATOR.$name.$extension;
66+
$cache = $cacheDir.'/'.$name.$extension;
6767

6868
// auto-reload
6969
$reload = false;
@@ -114,7 +114,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
114114
REGEX;
115115
$dontInlineRegex = str_replace('.', $spacesRegex, $dontInlineRegex);
116116

117-
$cacheDir = explode(DIRECTORY_SEPARATOR, $cacheDir);
117+
$cacheDir = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $cacheDir));
118118
$files = array();
119119
$content = '';
120120
foreach (self::getOrderedClasses($classes) as $class) {
@@ -126,19 +126,19 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
126126
$c = file_get_contents($file);
127127

128128
if (preg_match($dontInlineRegex, $c)) {
129-
$file = explode(DIRECTORY_SEPARATOR, $file);
129+
$file = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $file));
130130

131131
for ($i = 0; isset($file[$i], $cacheDir[$i]); ++$i) {
132132
if ($file[$i] !== $cacheDir[$i]) {
133133
break;
134134
}
135135
}
136136
if (1 >= $i) {
137-
$file = var_export(implode(DIRECTORY_SEPARATOR, $file), true);
137+
$file = var_export(implode('/', $file), true);
138138
} else {
139139
$file = array_slice($file, $i);
140-
$file = str_repeat('..'.DIRECTORY_SEPARATOR, count($cacheDir) - $i).implode(DIRECTORY_SEPARATOR, $file);
141-
$file = '__DIR__.'.var_export(DIRECTORY_SEPARATOR.$file, true);
140+
$file = str_repeat('../', count($cacheDir) - $i).implode('/', $file);
141+
$file = '__DIR__.'.var_export('/'.$file, true);
142142
}
143143

144144
$c = "\nnamespace {require $file;}";

0 commit comments

Comments
 (0)
0