From 4ff82f5c12e5e24d2e4c5e785af1cb2d288ad9b9 Mon Sep 17 00:00:00 2001
From: Eric Espie <eric.espie@combodo.com>
Date: Mon, 21 Nov 2022 09:54:36 +0100
Subject: [PATCH] Fix CI

---
 application/startup.inc.php |  9 +++++----
 application/utils.inc.php   | 23 +----------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/application/startup.inc.php b/application/startup.inc.php
index 8ff213745..da2b674b6 100644
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -19,10 +19,11 @@ use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Service\EventData;
 use Combodo\iTop\Service\EventService;
 
-require_once(APPROOT.'/core/cmdbobject.class.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-require_once(APPROOT.'/core/contexttag.class.inc.php');
-require_once(APPROOT.'/core/kpi.class.inc.php');
+require_once(APPROOT.'core/cmdbobject.class.inc.php');
+require_once(APPROOT.'application/utils.inc.php');
+require_once(APPROOT.'core/contexttag.class.inc.php');
+require_once(APPROOT.'core/kpi.class.inc.php');
+require_once(APPROOT.'setup/setuputils.class.inc.php');
 
 
 /**
diff --git a/application/utils.inc.php b/application/utils.inc.php
index 0f62fd60e..b98ae2c75 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -2772,7 +2772,7 @@ HTML;
 			if (!utils::IsDevelopmentEnvironment()) {
 				// Save to cache
 				$sCacheContent = "<?php\n\nreturn ".var_export($aMatchingClasses, true).";";
-				self::builddir(dirname($sCacheFileName));
+				SetupUtils::builddir(dirname($sCacheFileName));
 				file_put_contents($sCacheFileName, $sCacheContent);
 			}
 		}
@@ -3194,25 +3194,4 @@ HTML;
 	{
 		return hash('sha256', uniqid(sprintf('%x', rand()), true).sprintf('%x', rand()));
 	}
-
-	/**
-	 * Helper to build the full path of a new directory
-	 * @param $dir
-	 */
-	public static function builddir($dir)
-	{
-		if (empty($dir))
-		{
-			// avoid infinite loops :/
-			return;
-		}
-		if (!is_dir($dir))
-		{
-			$parent = dirname($dir);
-			self::builddir($parent);
-			if (!mkdir($dir) && !is_dir($dir)) {
-				throw new \RuntimeException(sprintf('Directory "%s" was not created', $dir));
-			}
-		}
-	}
 }