N°8632 - Check existence of parameter file within iTop

Author: eespie

application/utils.inc.php

@@ -181,6 +181,7 @@ class utils
 
 	protected static function LoadParamFile($sParamFile)
 	{
+		$sParamFile = self::AbsolutePath($sParamFile);
 		if (!file_exists($sParamFile)) {
 			throw new Exception("Could not find the parameter file: '".utils::HtmlEntities($sParamFile)."'");
 		}

tests/php-unit-tests/unitary-tests/application/utilsTest.php

@@ -996,4 +996,31 @@ public function VSprintfProvider()
 			],
 		];
 	}
+
+	public function testLoadParamFile()
+	{
+		$sTmpFileOutsideItop = tempnam(sys_get_temp_dir(), 'utils');
+		$sParamName = 'param_test_p1';
+		$sParamValue = 'My own value';
+		$sParams = <<<INI
+# comment
+$sParamName = $sParamValue
+INI;
+
+		file_put_contents($sTmpFileOutsideItop, $sParams);
+
+		self::assertNull(utils::ReadParam($sParamName, null));
+		self::expectException(\Exception::class);
+		self::expectExceptionMessage('Could not find the parameter file: \'\'');
+		self::InvokeNonPublicStaticMethod(utils::class, 'LoadParamFile', [$sTmpFileOutsideItop]);
+
+		self::assertNotEquals($sParamValue, utils::ReadParam($sParamName, null), "utils::LoadParamFile() has loaded the file: $sTmpFileOutsideItop");
+
+		unlink($sTmpFileOutsideItop);
+
+		$sTmpFileInsideItop = tempnam(utils::GetCachePath(), 'utils-test');
+		file_put_contents($sTmpFileInsideItop, $sParams);
+		self::InvokeNonPublicStaticMethod(utils::class, 'LoadParamFile', [$sTmpFileInsideItop]);
+		self::assertEquals($sParamValue, utils::ReadParam($sParamName, null), "utils::LoadParamFile() has not loaded the file: $sTmpFileOutsideItop");
+	}
 }