Commit 44524f60 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch '5591-remove-warnings' into 'master'

5591 remove warnings

See merge request !38
parents f58ddc38 8a56ef2f
Pipeline #1084 passed with stage
in 5 seconds
......@@ -11,6 +11,8 @@ class build_base implements iBuildplugin{
protected $_sBuildDir = false;
protected $_sOutfile = false;
protected $_aPlugininfos = false;
protected $_sLang = "en-en";
protected $_aLang = [];
......
......@@ -647,7 +647,7 @@ class project extends base {
$this->getAllPhaseInfos();
foreach ($this->_aData["phases"] as $sPhase => $aData) {
foreach (array_keys($this->_aPlaces) as $sPlace) {
if (array_key_exists($sPlace, $aData) && array_key_exists("version", $aData[$sPlace])) {
if (isset($aData[$sPlace]["version"])) {
$this->_aVersions[$aData[$sPlace]["version"]][] = array('phase' => $sPhase, 'place' => $sPlace);
}
}
......
......@@ -176,7 +176,7 @@ class rollout_awx extends rollout_base {
// ----- Checks:
$sCmdChecks='';
if($aConfig['extravars']){
if(isset($aConfig['extravars']) && $aConfig['extravars']){
$aTmp=json_decode($aConfig['extravars'], 1);
if (!$aTmp || !is_array($aTmp) || !count($aTmp) ){
$sCmdChecks.='echo "ERROR: Value in extravars has wrong Syntax - this is no JSON: '.$aConfig['extravars'].'"; exit 1; ';
......@@ -184,14 +184,14 @@ class rollout_awx extends rollout_base {
$aConfig['extravars']=json_encode($aTmp);
}
if(!(int)$aConfig['inventory']){
if(!isset($aConfig['inventory']) || !(int)$aConfig['inventory']){
$sCmdChecks.='echo "ERROR: no inventory was given."; exit 1; ';
}
// ----- Send variables having values only
$aBodyvars=array();
foreach(['inventory'=>'inventory', 'limit'=>'limit', 'job_tags'=>'tags', 'extra_vars'=>'extravars'] as $sParam=>$sVarkey){
if ($aConfig[$sVarkey]) {
if (isset($aConfig[$sVarkey]) && $aConfig[$sVarkey]) {
$aBodyvars[$sParam]=$aConfig[$sVarkey];
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment