@@ -26,12 +26,6 @@ class ClassLoader
26
26
{
27
27
protected ComposerClassLoader $ composerClassLoader ;
28
28
29
- /**
30
- * The container to collect all the classes that would be proxy.
31
- * [ OriginalClassName => ProxyFileAbsolutePath ].
32
- */
33
- protected array $ proxies = [];
34
-
35
29
public function __construct (ComposerClassLoader $ classLoader , string $ proxyFileDir , string $ configDir , ScanHandlerInterface $ handler )
36
30
{
37
31
$ this ->setComposerClassLoader ($ classLoader );
@@ -44,8 +38,9 @@ public function __construct(ComposerClassLoader $classLoader, string $proxyFileD
44
38
$ classLoader ->addClassMap ($ config ->getClassMap ());
45
39
46
40
$ 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
+ );
49
44
}
50
45
51
46
public function loadClass (string $ class ): void
@@ -112,12 +107,7 @@ public function getComposerClassLoader(): ComposerClassLoader
112
107
113
108
protected function locateFile (string $ className ): ?string
114
109
{
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 );
121
111
return is_string ($ file ) ? $ file : null ;
122
112
}
123
113
0 commit comments