Autoloader improved

Author: mirekmarek

library/Jet/Autoloader.php

@@ -13,6 +13,7 @@
 require_once 'Autoloader/Loader.php';
 require_once 'Autoloader/Cache.php';
 require_once 'Autoloader/Cache/Backend.php';
+require_once 'SysConf/Jet/Autoloader.php';
 require_once 'IO/Dir.php';
 require_once 'IO/File.php';
 
@@ -45,50 +46,6 @@ class Autoloader
 	 */
 	protected static bool $save_class_map = false;
 
-	/**
-	 * @var string
-	 */
-	protected static string $application_autoloaders_dir_name = 'Autoloaders';
-	
-	/**
-	 * @var string
-	 */
-	protected static string $library_autoloader_file_name = 'JetAutoloader.php';
-	
-	/**
-	 * @return string
-	 */
-	public static function getApplicationAutoloadersDirName(): string
-	{
-		return self::$application_autoloaders_dir_name;
-	}
-	
-	/**
-	 * @param string $application_autoloaders_dir_name
-	 */
-	public static function setApplicationAutoloadersDirName( string $application_autoloaders_dir_name ): void
-	{
-		self::$application_autoloaders_dir_name = $application_autoloaders_dir_name;
-	}
-	
-	/**
-	 * @return string
-	 */
-	public static function getLibraryAutoloaderFileName(): string
-	{
-		return self::$library_autoloader_file_name;
-	}
-	
-	/**
-	 * @param string $library_autoloader_file_name
-	 */
-	public static function setLibraryAutoloaderFileName( string $library_autoloader_file_name ): void
-	{
-		self::$library_autoloader_file_name = $library_autoloader_file_name;
-	}
-
-
-	
 
 	/**
 	 *
@@ -121,7 +78,7 @@ public static function registerLibraryAutoloaders( ?string $dir=null ) : void
 
 		$dirs = IO_Dir::getSubdirectoriesList( $dir );
 		foreach($dirs as $path=>$name) {
-			$path .= static::getLibraryAutoloaderFileName();
+			$path .= SysConf_Jet_Autoloader::getLibraryAutoloaderFileName();
 			if(!IO_File::exists($path)) {
 				continue;
 			}
@@ -138,7 +95,7 @@ public static function registerLibraryAutoloaders( ?string $dir=null ) : void
 	public static function  registerApplicationAutoloaders( ?string $dir=null ) : void
 	{
 		if(!$dir) {
-			$dir = SysConf_Path::getApplication().static::getApplicationAutoloadersDirName();
+			$dir = SysConf_Path::getApplication().SysConf_Jet_Autoloader::getApplicationAutoloadersDirName();
 		}
 
 		$files = IO_Dir::getFilesList( $dir, '*.php' );

library/Jet/SysConf/Jet/Autoloader.php

@@ -15,21 +15,59 @@ class SysConf_Jet_Autoloader
 {
 
 	protected static bool $cache_enabled = false;
-
+	
+	protected static string $application_autoloaders_dir_name = 'Autoloaders';
+	
+	protected static string $library_autoloader_file_name = 'JetAutoloader.php';
+	
+	
 	/**
 	 * @return bool
 	 */
 	public static function getCacheEnabled(): bool
 	{
-		return self::$cache_enabled;
+		return static::$cache_enabled;
 	}
 
 	/**
 	 * @param bool $cache_enabled
 	 */
 	public static function setCacheEnabled( bool $cache_enabled ): void
 	{
-		self::$cache_enabled = $cache_enabled;
+		static::$cache_enabled = $cache_enabled;
+	}
+	
+	/**
+	 * @return string
+	 */
+	public static function getApplicationAutoloadersDirName(): string
+	{
+		return static::$application_autoloaders_dir_name;
+	}
+	
+	/**
+	 * @param string $application_autoloaders_dir_name
+	 */
+	public static function setApplicationAutoloadersDirName( string $application_autoloaders_dir_name ): void
+	{
+		static::$application_autoloaders_dir_name = $application_autoloaders_dir_name;
+	}
+	
+	/**
+	 * @return string
+	 */
+	public static function getLibraryAutoloaderFileName(): string
+	{
+		return static::$library_autoloader_file_name;
+	}
+	
+	/**
+	 * @param string $library_autoloader_file_name
+	 */
+	public static function setLibraryAutoloaderFileName( string $library_autoloader_file_name ): void
+	{
+		static::$library_autoloader_file_name = $library_autoloader_file_name;
 	}
+	
 
 }