Skip to content

Commit 395aadf

Browse files
Removed useless Hyperf\Di\ClassLoader::$proxies, because merge it into Composer\Autoload\ClassLoader::$classMap. (#4888)
Co-authored-by: assert <[email protected]> Co-authored-by: 李铭昕 <[email protected]>
1 parent a6b0bd1 commit 395aadf

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

src/ClassLoader.php

+4-14
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ class ClassLoader
2626
{
2727
protected ComposerClassLoader $composerClassLoader;
2828

29-
/**
30-
* The container to collect all the classes that would be proxy.
31-
* [ OriginalClassName => ProxyFileAbsolutePath ].
32-
*/
33-
protected array $proxies = [];
34-
3529
public function __construct(ComposerClassLoader $classLoader, string $proxyFileDir, string $configDir, ScanHandlerInterface $handler)
3630
{
3731
$this->setComposerClassLoader($classLoader);
@@ -44,8 +38,9 @@ public function __construct(ComposerClassLoader $classLoader, string $proxyFileD
4438
$classLoader->addClassMap($config->getClassMap());
4539

4640
$scanner = new Scanner($this, $config, $handler);
47-
48-
$this->proxies = $scanner->scan($this->getComposerClassLoader()->getClassMap(), $proxyFileDir);
41+
$classLoader->addClassMap(
42+
$scanner->scan($classLoader->getClassMap(), $proxyFileDir)
43+
);
4944
}
5045

5146
public function loadClass(string $class): void
@@ -112,12 +107,7 @@ public function getComposerClassLoader(): ComposerClassLoader
112107

113108
protected function locateFile(string $className): ?string
114109
{
115-
if (isset($this->proxies[$className]) && file_exists($this->proxies[$className])) {
116-
$file = $this->proxies[$className];
117-
} else {
118-
$file = $this->getComposerClassLoader()->findFile($className);
119-
}
120-
110+
$file = $this->getComposerClassLoader()->findFile($className);
121111
return is_string($file) ? $file : null;
122112
}
123113

0 commit comments

Comments
 (0)