From 07745dea781f2b7932a7253fd8fc6d54067884a1 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Fri, 18 Sep 2020 09:40:25 +0200
Subject: [PATCH] Do not use global in autoload

---
 src/amdaintegration_autoload.php | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
 1 file changed, 86 insertions(+), 54 deletions(-)

diff --git a/src/amdaintegration_autoload.php b/src/amdaintegration_autoload.php
index 72cc3a0..db0a059 100644
--- a/src/amdaintegration_autoload.php
+++ b/src/amdaintegration_autoload.php
@@ -1,59 +1,91 @@
 <?php
 //autoload configuration
 
-$autoload_cache = array();
+class AutoloadData {
+	private static $integration_dirs = NULL;
 
-$autoload_dirs = array(
-	'InputOutput',
-	'InputOutput/IHMImpl',
-	'InputOutput/IHMImpl/Config',
-	'InputOutput/IHMImpl/Params',
-	'InputOutput/IHMImpl/Params/DataMiningImpl',
-	'InputOutput/IHMImpl/Params/StatisticsImpl',
-	'InputOutput/IHMImpl/Params/DownloadImpl',
-	'InputOutput/IHMImpl/Params/PlotImpl',
-	'InputOutput/IHMImpl/Params/GeneratorImpl',
-	'InputOutput/IHMImpl/Params/GenInfoParamImpl',
-	'InputOutput/IHMImpl/Process',
-	'InputOutput/IHMImpl/ParamInfo',
-	'InputOutput/IHMImpl/Tools',
-	'InputOutput/IHMImpl/TimeTables',
-	'InputOutput/TestImpl',
-	'InputOutput/WSImpl',
-	'InputOutput/WSImpl/Config',
-	'InputOutput/WSImpl/Process',
-	'InputOutput/WSImpl/Params/DownloadImpl',
-	'InputOutput/WSImpl/Params/PlotImpl',
-	'InputOutput/WSImpl/Tools',
-	'InputOutput/WSImpl/TimeTables',
-	'InputOutput/SharedObjectsUpdater',
-	'InputOutput/SharedObjectsUpdater/TimeTables',
-	'Request',
-	'Request/Config',
-	'Request/ParamsRequestImpl',
-	'Request/ParamsRequestImpl/Nodes',
-	'Request/ParamsRequestImpl/Nodes/Infos',
-	'Request/ParamsRequestImpl/Nodes/Params',
-	'Request/ParamsRequestImpl/Nodes/Requests',
-	'Request/ProcessRequestImpl',
-	'Request/ProcessRequestImpl/Process',
-	'Request/TTRequestImpl',
-	'Request/ParserRequestImpl',
-);
+	private static $ihm_dirs = NULL;
 
-$autoload_ihm_dirs = array(
-	IHM_SRC_DIR.'/php/classes',
-	IHM_SRC_DIR.'/php/RemoteDataCenter',
-	IHM_SRC_DIR.'/php/WebServices',
-	IHM_SRC_DIR.'/php/WebServices/Client'
-);
+	private static $cache = NULL;
+
+	public static function integration_dirs() {
+		if (self::$integration_dirs == NULL) {
+			self::$integration_dirs = array(
+				'InputOutput',
+				'InputOutput/IHMImpl',
+				'InputOutput/IHMImpl/Config',
+				'InputOutput/IHMImpl/Params',
+				'InputOutput/IHMImpl/Params/DataMiningImpl',
+				'InputOutput/IHMImpl/Params/StatisticsImpl',
+				'InputOutput/IHMImpl/Params/DownloadImpl',
+				'InputOutput/IHMImpl/Params/PlotImpl',
+				'InputOutput/IHMImpl/Params/GeneratorImpl',
+				'InputOutput/IHMImpl/Params/GenInfoParamImpl',
+				'InputOutput/IHMImpl/Process',
+				'InputOutput/IHMImpl/ParamInfo',
+				'InputOutput/IHMImpl/Tools',
+				'InputOutput/IHMImpl/TimeTables',
+				'InputOutput/TestImpl',
+				'InputOutput/WSImpl',
+				'InputOutput/WSImpl/Config',
+				'InputOutput/WSImpl/Process',
+				'InputOutput/WSImpl/Params/DownloadImpl',
+				'InputOutput/WSImpl/Params/PlotImpl',
+				'InputOutput/WSImpl/Tools',
+				'InputOutput/WSImpl/TimeTables',
+				'InputOutput/SharedObjectsUpdater',
+				'InputOutput/SharedObjectsUpdater/TimeTables',
+				'Request',
+				'Request/Config',
+				'Request/ParamsRequestImpl',
+				'Request/ParamsRequestImpl/Nodes',
+				'Request/ParamsRequestImpl/Nodes/Infos',
+				'Request/ParamsRequestImpl/Nodes/Params',
+				'Request/ParamsRequestImpl/Nodes/Requests',
+				'Request/ProcessRequestImpl',
+				'Request/ProcessRequestImpl/Process',
+				'Request/TTRequestImpl',
+				'Request/ParserRequestImpl',
+			);
+		}
+		return self::$integration_dirs;
+	}
+
+	public static function ihm_dirs() {
+		if (self::$ihm_dirs == NULL) {
+			self::$ihm_dirs = array(
+				IHM_SRC_DIR.'/php/classes',
+				IHM_SRC_DIR.'/php/RemoteDataCenter',
+				IHM_SRC_DIR.'/php/WebServices',
+				IHM_SRC_DIR.'/php/WebServices/Client'
+			);
+		}
+		return self::$ihm_dirs;
+	}
+
+	public static function get_cache($class_name) {
+		if (self::$cache == NULL) {
+			self::$cache = array();
+		}
+		if (isset(self::$cache[$class_name])) {
+			return self::$cache[$class_name];
+		}
+		return NULL;
+	}
+
+	public static function set_cache($class_name, $file) {
+		if (self::$cache == NULL) {
+			self::$cache = array();
+		}
+		self::$cache[$class_name] = $file;
+	}
+}
 
 function amdaintegration_autoload($class_name)
 {
-	global $autoload_cache, $autoload_dirs, $autoload_ihm_dirs;
-
-	if (isset($autoload_cache[$class_name])) {
-		require $autoload_cache[$class_name];
+	$file = AutoloadData::get_cache($class_name);
+	if (isset($file)) {
+		require $file;
 		return;
 	}
 
@@ -62,28 +94,28 @@ function amdaintegration_autoload($class_name)
 	if (file_exists($file))
 	{
 		require $file;
-		$autoload_cache[$class_name] = $file;
+		AutoloadData::set_cache($class_name, $file);
 		return;	
 	}
-		
-	foreach($autoload_dirs as $dir)
+
+	foreach(AutoloadData::integration_dirs() as $dir)
 	{
 		$file = __DIR__.'/'.$dir.'/'.$class_name.'.php';
 		if (file_exists($file))
 		{
 			require $file;
-			$autoload_cache[$class_name] = $file;
+			AutoloadData::set_cache($class_name, $file);
 			return;
 		}
 	}
 	
-	foreach($autoload_ihm_dirs as $dir)
+	foreach(AutoloadData::ihm_dirs() as $dir)
 	{
 		$file = $dir.'/'.$class_name.'.php';
 		if (file_exists($file))
 		{
 			require $file;
-			$autoload_cache[$class_name] = $file;
+			AutoloadData::set_cache($class_name, $file);
 			break;
 		}
 	}
--
libgit2 0.21.2