Set up autoload of classes before starting autoload scripts, and load them in a predictable fashion.

tux- · tux- · commit 407f06528c2c · 2016-12-06T22:03:31.000+01:00
diff --git a/init.php b/init.php
@@ -483,14 +483,20 @@ class FileStreamMainStatic extends FileStreamBase
 unset($config);
 
 foreach (System::getModules(GIMLE5) as $name) {
+	if (is_executable(SITE_DIR . 'module/' . $name . '/lib/')) {
+		System::autoloadRegister(SITE_DIR . 'module/' . $name . '/lib/');
+	}
+	$loadfiles = [];
 	if (is_executable(SITE_DIR . 'module/' . $name . '/autoload/')) {
 		foreach (new \RecursiveDirectoryIterator(SITE_DIR . 'module/' . $name . '/autoload/', \FilesystemIterator::SKIP_DOTS) as $fileInfo) {
-			include SITE_DIR . 'module/' . $name . '/autoload/' . $fileInfo->getFilename();
+			$loadfiles[] = $fileInfo->getFilename();
 		}
 	}
-	if (is_executable(SITE_DIR . 'module/' . $name . '/lib/')) {
-		System::autoloadRegister(SITE_DIR . 'module/' . $name . '/lib/');
+	sort($loadfiles);
+	foreach ($loadfiles as $file) {
+		include SITE_DIR . 'module/' . $name . '/autoload/' . $file;
 	}
+	unset($loadfiles);
 }
 
 if (is_executable(SITE_DIR . 'lib/')) {

Original file line number	Diff line number	Diff line change
`@@ -483,14 +483,20 @@ class FileStreamMainStatic extends FileStreamBase`
`483`	`483`	`unset($config);`
`484`	`484`
`485`	`485`	`foreach (System::getModules(GIMLE5) as $name) {`
	`486`	`+ if (is_executable(SITE_DIR . 'module/' . $name . '/lib/')) {`
	`487`	`+ System::autoloadRegister(SITE_DIR . 'module/' . $name . '/lib/');`
	`488`	`+ }`
	`489`	`+ $loadfiles = [];`
`486`	`490`	`if (is_executable(SITE_DIR . 'module/' . $name . '/autoload/')) {`
`487`	`491`	`foreach (new \RecursiveDirectoryIterator(SITE_DIR . 'module/' . $name . '/autoload/', \FilesystemIterator::SKIP_DOTS) as $fileInfo) {`
`488`		`- include SITE_DIR . 'module/' . $name . '/autoload/' . $fileInfo->getFilename();`
	`492`	`+ $loadfiles[] = $fileInfo->getFilename();`
`489`	`493`	`}`
`490`	`494`	`}`
`491`		`- if (is_executable(SITE_DIR . 'module/' . $name . '/lib/')) {`
`492`		`- System::autoloadRegister(SITE_DIR . 'module/' . $name . '/lib/');`
	`495`	`+ sort($loadfiles);`
	`496`	`+ foreach ($loadfiles as $file) {`
	`497`	`+ include SITE_DIR . 'module/' . $name . '/autoload/' . $file;`
`493`	`498`	`}`
	`499`	`+ unset($loadfiles);`
`494`	`500`	`}`
`495`	`501`
`496`	`502`	`if (is_executable(SITE_DIR . 'lib/')) {`