composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 17:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix all the tests

Browse Source
This commit is contained in:
odain
2020-06-11 21:29:03 +02:00
parent c798e0a9cd
commit 4d3aefe2a4
9 changed files with 182 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
application/themehandler.class.inc.php
View File

@@ -320,7 +320,7 @@ CSS;
$aCompleteUrls = array();
$aToCompleteUrls = array();
$aMissingVariables = array();
$aFoundVariables = array();
$aFoundVariables = array('version'=>'');
$aMap = array(
'aCompleteUrls' => $aCompleteUrls,
'aToCompleteUrls' => $aToCompleteUrls,
@@ -389,6 +389,11 @@ CSS;
$aToCompleteUrls=$aMap['aToCompleteUrls'];
$aCompleteUrls=$aMap['aCompleteUrls'];
list($aMissingVariables, $aFoundVariables) = static::FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent);
if (array_key_exists('version', $aMissingVariables))
{
//handle removed $version from css-variables.scss
$aFoundVariables['version'] = '';
}
list($aToCompleteUrls, $aCompleteUrls) = static::ResolveUrls($aFoundVariables, $aToCompleteUrls, $aCompleteUrls);
$aMap['aMissingVariables']=$aMissingVariables;
$aMap['aFoundVariables']=$aFoundVariables;
@@ -408,6 +413,7 @@ CSS;
*/
public static function FindMissingVariables($aThemeParametersVariables, $aMissingVariables, $aFoundVariables, $sContent)
{
$aNewMissingVars = array();
if (!empty($aMissingVariables))
{
foreach ($aMissingVariables as $var)
@@ -415,20 +421,34 @@ CSS;
if (array_key_exists($var, $aThemeParametersVariables))
{
$aFoundVariables[$var] = $aThemeParametersVariables[$var];
unset($aMissingVariables[$var]);
}
else
{
if (preg_match_all("/\\\$$var\s*:\s*[\"'](.*)[\"']/", $sContent, $aValues))
if (preg_match_all("/\\\$$var\s*:\s*[\"']{0,1}(.*)[\"']{0,1};/", $sContent, $aValues))
{
$aFoundVariables[$var] = $aValues[1][0];
unset($aMissingVariables[$var]);
$sValue = $aValues[1][0];
if (preg_match_all("/([^!]+)!/", $sValue, $aSubValues))
{
$sValue = trim($aSubValues[1][0], ' "\'');
}
if (strpos($sValue, '$') === false)
{
$aFoundVariables[$var] = $sValue;
}
else{
$aNewMissingVars[] = $var;
}
}
else
{
$aNewMissingVars[] = $var;
}
}
}
}
return array($aMissingVariables, $aFoundVariables);
return array($aNewMissingVars, $aFoundVariables);
}
/**
@@ -542,7 +562,7 @@ CSS;
$aReplacement[]=$aFoundVariableValue;
}
$sResolvedUrl=preg_replace($aPattern, $aReplacement, $sUrlTemplate);
if (strpos($sResolvedUrl, "+")!=false)
if (strpos($sResolvedUrl, "+")!==false)
{
return false;
}