Skip to content

Commit 1ccbcfc

Browse files
committed
fix: move code for autoloading to closure where all the checks for needed files already happens
1 parent d86ea74 commit 1ccbcfc

2 files changed

Lines changed: 8 additions & 49 deletions

File tree

Sources/Autoloader.php

Lines changed: 0 additions & 46 deletions
This file was deleted.

index.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
*/
3333

3434
use SMF\Config;
35-
use SMF\IntegrationHook;
3635

3736
if (!defined('SMF')) {
3837
define('SMF', 1);
@@ -127,6 +126,14 @@
127126

128127
// Ensure $db_last_error is set, too.
129128
SMF\Config::getDbLastError();
129+
130+
$loader = require Config::$vendordir . '/autoload.php';
131+
132+
if (isset(Config::$modSettings['integrate_autoload'])) {
133+
foreach (explode(',', Config::$modSettings['integrate_autoload']) as $prefix => $dirname) {
134+
$loader->addPsr4($prefix, $dirname);
135+
}
136+
}
130137
});
131138

132139
// Devs want all error messages, but others don't.
@@ -138,8 +145,6 @@
138145
* 3. Load some other essential includes.
139146
*/
140147

141-
require_once SMF\Config::$sourcedir . '/Autoloader.php';
142-
143148
// Ensure we don't trip over disabled internal functions
144149
require_once SMF\Config::$sourcedir . '/Subs-Compat.php';
145150

0 commit comments

Comments
 (0)