Fix CI

This commit is contained in:
Eric Espie
2026-01-28 15:59:56 +01:00
parent bb1c4f865a
commit d7451fe2ea
13 changed files with 64 additions and 41 deletions

View File

@@ -21,10 +21,12 @@ class PropertyTypeService
public const FORM_CACHE_POOL = 'Forms';
private DataModelDependantCache $oCacheService;
private PropertyTypeCompiler $oCompiler;
public function __construct()
{
$this->oCacheService = MetaModel::GetService('DataModelDependantCache');
$this->oCompiler = MetaModel::GetService('PropertyTypeCompiler');
}
/**
@@ -44,7 +46,7 @@ class PropertyTypeService
if (!$this->oCacheService->HasEntry(self::FORM_CACHE_POOL, $sCacheKey) || utils::IsDevelopmentEnvironment()) {
// Cache not found, compile the form
$sPHPContent = PropertyTypeCompiler::GetInstance()->CompileForm($sFilteredId, $sType);
$sPHPContent = $this->oCompiler->CompileForm($sFilteredId, $sType);
$this->oCacheService->StorePhpContent(self::FORM_CACHE_POOL, $sCacheKey, "<?php\n\n$sPHPContent");
}
$this->oCacheService->FetchPHP(self::FORM_CACHE_POOL, $sCacheKey);
@@ -63,14 +65,14 @@ class PropertyTypeService
*/
public function ListPropertyTypesByType(string $sType): array
{
return PropertyTypeCompiler::GetInstance()->ListPropertyTypesByType($sType);
return $this->oCompiler->ListPropertyTypesByType($sType);
}
public function GetPropertyType(string $sId, string $sType = 'Dashlet'): PropertyType
{
$sXML = PropertyTypeCompiler::GetInstance()->GetXMLContent($sId, $sType);
$sXML = $this->oCompiler->GetXMLContent($sId, $sType);
return PropertyTypeCompiler::GetInstance()->CompilePropertyTypeFromXML($sXML);
return $this->oCompiler->CompilePropertyTypeFromXML($sXML);
}
/**