From c3ef50978a2eead5ef1647937e36c306570f4b0a Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Tue, 19 Sep 2017 14:41:10 +0200 Subject: [PATCH] style: Fix minor styleguide issues for PHPCS --- .../Icinga/Exception/Http/BaseHttpException.php | 1 - .../Exception/Http/HttpExceptionInterface.php | 1 - library/Icinga/Util/Json.php | 2 +- library/Icinga/Web/Form.php | 3 ++- library/Icinga/Web/Widget/Chart/InlinePie.php | 7 ++++--- library/Icinga/Web/Widget/Tabs.php | 4 +++- .../Migrate/Config/UserDomainMigration.php | 1 - .../forms/Config/TransportConfigForm.php | 4 +++- .../Command/Transport/ApiCommandTransport.php | 15 ++++++++++++--- .../application/clicommands/ConfigCommand.php | 11 ++++++++--- 10 files changed, 33 insertions(+), 16 deletions(-) diff --git a/library/Icinga/Exception/Http/BaseHttpException.php b/library/Icinga/Exception/Http/BaseHttpException.php index 781fa906d..cad41c622 100644 --- a/library/Icinga/Exception/Http/BaseHttpException.php +++ b/library/Icinga/Exception/Http/BaseHttpException.php @@ -5,7 +5,6 @@ namespace Icinga\Exception\Http; use Icinga\Exception\IcingaException; - /** * Base class for HTTP exceptions */ diff --git a/library/Icinga/Exception/Http/HttpExceptionInterface.php b/library/Icinga/Exception/Http/HttpExceptionInterface.php index 559b1d27a..c5e0cc749 100644 --- a/library/Icinga/Exception/Http/HttpExceptionInterface.php +++ b/library/Icinga/Exception/Http/HttpExceptionInterface.php @@ -3,7 +3,6 @@ namespace Icinga\Exception\Http; - interface HttpExceptionInterface { /** diff --git a/library/Icinga/Util/Json.php b/library/Icinga/Util/Json.php index 0f757c745..b41da82d5 100644 --- a/library/Icinga/Util/Json.php +++ b/library/Icinga/Util/Json.php @@ -25,7 +25,7 @@ class Json { if (version_compare(phpversion(), '5.4.0', '<')) { $encoded = json_encode($value); - } else if (version_compare(phpversion(), '5.5.0', '<')) { + } elseif (version_compare(phpversion(), '5.5.0', '<')) { $encoded = json_encode($value, $options); } else { $encoded = json_encode($value, $options, $depth); diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php index 08b66f933..9d0d5d707 100644 --- a/library/Icinga/Web/Form.php +++ b/library/Icinga/Web/Form.php @@ -772,7 +772,8 @@ class Form extends Zend_Form $action = $action->without(array_keys($this->getElements())); } - // TODO(el): Re-evalute this necessity. JavaScript could use the container's URL if there's no action set. + // TODO(el): Re-evalute this necessity. + // JavaScript could use the container'sURL if there's no action set. // We MUST set an action as JS gets confused otherwise, if // this form is being displayed in an additional column $this->setAction($action); diff --git a/library/Icinga/Web/Widget/Chart/InlinePie.php b/library/Icinga/Web/Widget/Chart/InlinePie.php index aa0046d35..a88fc8a12 100644 --- a/library/Icinga/Web/Widget/Chart/InlinePie.php +++ b/library/Icinga/Web/Widget/Chart/InlinePie.php @@ -74,14 +74,15 @@ class InlinePie extends AbstractWidget * @var string */ private $template =<<<'EOD' - - + {noscript} EOD; private $noscript =<<<'EOD' EOD; diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php index 2bc296939..979b5ef0a 100644 --- a/library/Icinga/Web/Widget/Tabs.php +++ b/library/Icinga/Web/Widget/Tabs.php @@ -36,7 +36,9 @@ EOT; */ private $dropdownTpl = <<< 'EOT'
  • - + + + diff --git a/modules/migrate/library/Migrate/Config/UserDomainMigration.php b/modules/migrate/library/Migrate/Config/UserDomainMigration.php index f7e52c438..d56722b4e 100644 --- a/modules/migrate/library/Migrate/Config/UserDomainMigration.php +++ b/modules/migrate/library/Migrate/Config/UserDomainMigration.php @@ -127,7 +127,6 @@ class UserDomainMigration rename($from, $to); } } - } protected function migrateNavigation() diff --git a/modules/monitoring/application/forms/Config/TransportConfigForm.php b/modules/monitoring/application/forms/Config/TransportConfigForm.php index 3c41ec800..059ea401d 100644 --- a/modules/monitoring/application/forms/Config/TransportConfigForm.php +++ b/modules/monitoring/application/forms/Config/TransportConfigForm.php @@ -369,7 +369,9 @@ class TransportConfigForm extends ConfigForm 'order' => 0, 'ignore' => true, 'label' => $this->translate('Force Changes'), - 'description' => $this->translate('Check this box to enforce changes without connectivity validation') + 'description' => $this->translate( + 'Check this box to enforce changes without connectivity validation' + ) ) ); diff --git a/modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php index 6dc5fea24..b371e500f 100644 --- a/modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php +++ b/modules/monitoring/library/Monitoring/Command/Transport/ApiCommandTransport.php @@ -204,7 +204,10 @@ class ApiCommandTransport implements CommandTransportInterface ->setPayload($command->getData()) ->send(); } catch (JsonDecodeException $e) { - throw new CommandTransportException('Got invalid JSON response from the Icinga 2 API: %s', $e->getMessage()); + throw new CommandTransportException( + 'Got invalid JSON response from the Icinga 2 API: %s', + $e->getMessage() + ); } if (isset($response['error'])) { @@ -256,9 +259,15 @@ class ApiCommandTransport implements CommandTransportInterface try { $response = $request->send(); } catch (CurlException $e) { - throw new CommandTransportException('Couldn\'t connect to the Icinga 2 API: %s', $e->getMessage()); + throw new CommandTransportException( + 'Couldn\'t connect to the Icinga 2 API: %s', + $e->getMessage() + ); } catch (JsonDecodeException $e) { - throw new CommandTransportException('Got invalid JSON response from the Icinga 2 API: %s', $e->getMessage()); + throw new CommandTransportException( + 'Got invalid JSON response from the Icinga 2 API: %s', + $e->getMessage() + ); } if (isset($response['error'])) { diff --git a/modules/setup/application/clicommands/ConfigCommand.php b/modules/setup/application/clicommands/ConfigCommand.php index 5f5d16c04..8e80b9368 100644 --- a/modules/setup/application/clicommands/ConfigCommand.php +++ b/modules/setup/application/clicommands/ConfigCommand.php @@ -96,7 +96,8 @@ class ConfigCommand extends Command * * --path= The URL path to Icinga Web 2 [/icingaweb2] * - * --root|--document-root= The directory from which the webserver will serve files [/path/to/icingaweb2/public] + * --root|--document-root= The directory from which the webserver will serve files + * [/path/to/icingaweb2/public] * * --config= Path to Icinga Web 2's configuration files [/etc/icingaweb2] * @@ -106,9 +107,13 @@ class ConfigCommand extends Command * * icingacli setup config webserver apache * - * icingacli setup config webserver apache --path=/icingaweb2 --document-root=/usr/share/icingaweb2/public --config=/etc/icingaweb2 + * icingacli setup config webserver apache \ + * --path=/icingaweb2 \ + * --document-root=/usr/share/icingaweb2/public \ + * --config=/etc/icingaweb2 * - * icingacli setup config webserver apache --file=/etc/apache2/conf.d/icingaweb2.conf + * icingacli setup config webserver apache \ + * --file=/etc/apache2/conf.d/icingaweb2.conf * * icingacli setup config webserver nginx */