From 8e28fff5243c00dddbbcee3b7e7c5759a394afae Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Thu, 6 Nov 2014 10:41:28 +0100 Subject: [PATCH] Setup/Webserver: Adapt class names to filename refs #6120 --- application/clicommands/SetupCommand.php | 4 ++-- library/Icinga/Config/Webserver/Apache2.php | 2 +- library/Icinga/Config/Webserver/Webserver.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/clicommands/SetupCommand.php b/application/clicommands/SetupCommand.php index d4de4e26b..a8b9ea4f6 100644 --- a/application/clicommands/SetupCommand.php +++ b/application/clicommands/SetupCommand.php @@ -6,7 +6,7 @@ namespace Icinga\Clicommands; use Icinga\Application\Logger; use Icinga\Cli\Command; -use Icinga\Config\Webserver\WebServer; +use Icinga\Config\Webserver\Webserver; use Icinga\Exception\ProgrammingError; /** @@ -153,7 +153,7 @@ class SetupCommand extends Command $this->fail($this->translate('Argument type is mandatory.')); } try { - $webserver = WebServer::createInstance($type); + $webserver = Webserver::createInstance($type); } catch (ProgrammingError $e) { $this->fail($this->translate('Unknown type') . ': ' . $type); } diff --git a/library/Icinga/Config/Webserver/Apache2.php b/library/Icinga/Config/Webserver/Apache2.php index 2b9d756cf..077bf8bc3 100644 --- a/library/Icinga/Config/Webserver/Apache2.php +++ b/library/Icinga/Config/Webserver/Apache2.php @@ -7,7 +7,7 @@ namespace Icinga\Config\Webserver; /** * Generate apache 2.x (< 2.4) configuration */ -class Apache2 extends WebServer +class Apache2 extends Webserver { /** * @return array diff --git a/library/Icinga/Config/Webserver/Webserver.php b/library/Icinga/Config/Webserver/Webserver.php index 2bbd1cbb6..349af82de 100644 --- a/library/Icinga/Config/Webserver/Webserver.php +++ b/library/Icinga/Config/Webserver/Webserver.php @@ -10,7 +10,7 @@ use Icinga\Exception\ProgrammingError; /** * Generate webserver configuration */ -abstract class WebServer +abstract class Webserver { /** * Web path