composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3249 - Fix move To Production. Fix compiler code generation broken by N°2957

Browse Source
This commit is contained in:
Eric
2020-08-18 14:17:01 +02:00
parent 0311fe330b
commit c5d265f66b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/compiler.class.inc.php
View File

@@ -282,8 +282,8 @@ class MFCompiler
}
else
{
$sRelativeDir = '';
$sRealRelativeDir = '';
$sRelativeDir = $sModuleName;
$sRealRelativeDir = $sModuleName;
}
$aModulesInfo[$sModuleName] = array('root_dir' => $sRealRelativeDir, 'version' => $sModuleVersion);
@@ -334,10 +334,10 @@ class MFCompiler
foreach ($aCompiledClasses['code'] as $sClass => $sCompiledClass)
{
$sClassFileName = DIRECTORY_SEPARATOR.$sRelativeDir.DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR.'Model'.DIRECTORY_SEPARATOR.$sClass.'.php';
$sClassFileName = '/'.$sRelativeDir.'/src/Model/'.$sClass.'.php';
$sClassFile = "{$sTempTargetDir}{$sClassFileName}";
$this->WritePHPFile($sClassFile, $sModuleName, $sModuleVersion, $sCompiledClass);
$sCompiledCode .= "require_once ('{$sFinalTargetDir}{$sClassFileName}');\n";
$sCompiledCode .= "require_once (dirname(__DIR__).'{$sClassFileName}');\n";
}
}
catch (DOMFormatException $e)
@@ -474,7 +474,7 @@ EOF;
{
// We have compiled something: write the code somewhere
//
if (strlen($sRelativeDir) > 0)
if (strlen($sModuleRootDir) > 0)
{
// Write the code into the given module as model.<module>.php
//
@@ -3018,6 +3018,10 @@ EOF;
*/
protected function WriteFile($sFilename, $sContent, $flags = null)
{
if (is_file($sFilename) || is_link($sFilename))
{
@unlink($sFilename);
}
$ret = file_put_contents($sFilename, $sContent, $flags);
if ($ret === false)
{