Skip to content

Commit 54c8481

Browse files
committed
fix(autoloader): Remove unused mtime information for each file
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
1 parent 30ea818 commit 54c8481

1 file changed

Lines changed: 5 additions & 20 deletions

File tree

lib/private/Autoloader.php

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Autoloader {
2828
/** @var string[] */
2929
private array $excludeDirs = [];
3030

31-
/** @var array<string, array{string, int}> class => [file, time] */
31+
/** @var array<string, string> class => file */
3232
private array $classes = [];
3333

3434
/** @var array<string, int> class => counter */
@@ -61,7 +61,7 @@ public function tryLoad(string $type): void {
6161
return;
6262
}
6363

64-
[$file, $mtime] = $this->classes[$type] ?? null;
64+
$file = $this->classes[$type] ?? null;
6565

6666
if ($file) {
6767
(static function ($file) {
@@ -101,12 +101,7 @@ public function excludeDirectory(string ...$paths): static {
101101
* @return array<string, string> class => filename
102102
*/
103103
public function getIndexedClasses(): array {
104-
$res = [];
105-
foreach ($this->classes as $class => [$file]) {
106-
$res[$class] = $file;
107-
}
108-
109-
return $res;
104+
return $this->classes;
110105
}
111106

112107
/**
@@ -121,13 +116,6 @@ public function rebuild(): void {
121116
* Refreshes $this->classes.
122117
*/
123118
private function refreshClasses(): void {
124-
$files = [];
125-
$classes = [];
126-
foreach ($this->classes as $class => [$file, $mtime]) {
127-
$files[$file] = $mtime;
128-
$classes[$file][] = $class;
129-
}
130-
131119
$this->classes = [];
132120

133121
foreach ($this->psr4Paths as $namespace => $path) {
@@ -145,15 +133,12 @@ private function refreshClasses(): void {
145133
throw new \RuntimeException(sprintf(
146134
'Ambiguous class %s resolution; defined in %s and in %s.',
147135
$class,
148-
$this->classes[$class][0],
136+
$this->classes[$class],
149137
$file,
150138
));
151139
}
152140

153-
//FIXME needed?
154-
$mtime = filemtime($file);
155-
156-
$this->classes[$class] = [$file, $mtime];
141+
$this->classes[$class] = $file;
157142
unset($this->missingClasses[$class]);
158143
}
159144
}

0 commit comments

Comments
 (0)