phpcs: some more

This commit is contained in:
Thomas Gelf 2016-11-23 12:35:17 +01:00
parent 2b98629f3e
commit afcf42e871
6 changed files with 18 additions and 9 deletions

View file

@ -40,7 +40,7 @@ class BpConfigForm extends QuickForm
'label' => $this->translate('Title'),
'description' => $this->translate(
'Usually this title will be shown for this process. Equals name'
. ' if not given'
. ' if not given'
),
));
@ -48,7 +48,7 @@ class BpConfigForm extends QuickForm
'label' => $this->translate('Backend'),
'description' => $this->translate(
'Icinga Web Monitoring Backend where current object states for'
. ' this process should be retrieved from'
. ' this process should be retrieved from'
),
'multiOptions' => array(
null => $this->translate('Use the configured default backend'),
@ -193,7 +193,9 @@ class BpConfigForm extends QuickForm
public function shouldBeDeleted()
{
if (! $this->hasDeleteButton()) return false;
if (! $this->hasDeleteButton()) {
return false;
}
$name = $this->deleteButtonName;
return $this->getSentValue($name) === $this->getElement($name)->getLabel();

View file

@ -13,7 +13,7 @@ class Zend_View_Helper_RenderStateBadges extends Zend_View_Helper_Abstract
foreach ($summary as $state => $cnt) {
if ($cnt === 0
|| $state === 'OK'
||$ state === 'UP'
|| $state === 'UP'
) {
continue;
}

View file

@ -362,7 +362,10 @@ class BpNode extends Node
foreach ($this->getChildren() as $name => $child) {
$children[] = (string) $child;
if (array_key_exists($name, $rendered)) { continue; }
if (array_key_exists($name, $rendered)) {
continue;
}
if ($child instanceof BpNode) {
$cfg .= $child->toLegacyConfigString($rendered) . "\n";
}

View file

@ -21,4 +21,4 @@ abstract class MonitoredNode extends Node
)
);
}
}
}

View file

@ -465,8 +465,12 @@ abstract class Node
return ' ';
}
public function toLegacyConfigString(& $rendered = array()) { return '';}
//abstract public function toLegacyConfigString();
// TODO: Why isn't this abstract?
// abstract public function toLegacyConfigString();
public function toLegacyConfigString(& $rendered = array())
{
return '';
}
public function __toString()
{

View file

@ -49,7 +49,7 @@ class ServiceNode extends MonitoredNode
if (! $this->bp->isLocked()) {
$url = Url::fromPath( 'businessprocess/node/simulate', array(
$url = Url::fromPath('businessprocess/node/simulate', array(
'config' => $this->bp->getName(),
'node' => $this->name
));