Merge branch 'develop' into feature/faf_event_service

This commit is contained in:
Eric Espie
2022-06-30 14:22:52 +02:00
2379 changed files with 100697 additions and 63433 deletions

View File

@@ -139,7 +139,15 @@ class MFModule
*/
protected $sAutoSelect;
/**
* @var array
* @see ModelFactory::FindModules init of this structure from the module.*.php files
* @var array{
* business: string[],
* webservices: string[],
* addons: string[],
* }
* Warning, there are naming mismatches between this structure and the module.*.php :
* - `business` here correspond to `datamodel` in module.*.php
* - `webservices` here correspond to `webservice` in module.*.php
*/
protected $aFilesToInclude;
@@ -320,6 +328,14 @@ class MFModule
return $this->aFilesToInclude[$sCategory];
}
public function AddFileToInclude($sCategory, $sFile)
{
if (in_array($sFile, $this->aFilesToInclude[$sCategory], true)) {
return;
}
$this->aFilesToInclude[$sCategory][] = $sFile;
}
}
/**