File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -326,7 +326,7 @@ class %s extends {$options['class']}
326
326
$ this ->asFiles = false ;
327
327
328
328
if ($ this ->preload && null !== $ autoloadFile = $ this ->getAutoloadFile ()) {
329
- $ autoloadFile = substr ($ this ->export ($ autoloadFile ), 2 , - 1 );
329
+ $ autoloadFile = trim ($ this ->export ($ autoloadFile ), ' () \\' );
330
330
331
331
$ preloadedFiles = array_reverse ($ preloadedFiles );
332
332
$ preloadedFiles = implode ("'; \nrequire __DIR__.'/ " , $ preloadedFiles );
@@ -2123,9 +2123,7 @@ private function doExport($value, bool $resolveEnv = false)
2123
2123
2124
2124
private function getAutoloadFile (): ?string
2125
2125
{
2126
- if (null === $ this ->targetDirRegex ) {
2127
- return null ;
2128
- }
2126
+ $ file = null ;
2129
2127
2130
2128
foreach (spl_autoload_functions () as $ autoloader ) {
2131
2129
if (!\is_array ($ autoloader )) {
@@ -2144,14 +2142,14 @@ private function getAutoloadFile(): ?string
2144
2142
if (0 === strpos ($ class , 'ComposerAutoloaderInit ' ) && $ class ::getLoader () === $ autoloader [0 ]) {
2145
2143
$ file = \dirname ((new \ReflectionClass ($ class ))->getFileName (), 2 ).'/autoload.php ' ;
2146
2144
2147
- if (preg_match ($ this ->targetDirRegex .'A ' , $ file )) {
2145
+ if (null !== $ this -> targetDirRegex && preg_match ($ this ->targetDirRegex .'A ' , $ file )) {
2148
2146
return $ file ;
2149
2147
}
2150
2148
}
2151
2149
}
2152
2150
}
2153
2151
2154
- return null ;
2152
+ return $ file ;
2155
2153
}
2156
2154
2157
2155
private function getClasses (Definition $ definition , string $ id ): array
You can’t perform that action at this time.
0 commit comments