Merge pull request #38 from NETWAYS/various-cleanup

Various cleanup

Author: martialblog

application/controllers/GraphController.php

@@ -9,6 +9,9 @@
 use Icinga\Web\Controller;
 use Icinga\Web\Notification;
 
+/**
+ * GraphController for the graphs configuration table and forms.
+ */
 class GraphController extends Controller
 {
     public function init()
@@ -38,8 +41,7 @@ public function newAction()
 
         $graphs = new GraphForm();
 
-        $graphs
-            ->setIniConfig($this->Config('graphs'))
+        $graphs->setIniConfig($this->Config('graphs'))
             ->setRedirectUrl('grafana/graph')
             ->handleRequest();
 
@@ -61,9 +63,7 @@ public function removeAction()
         $graphs = new GraphForm();
 
         try {
-            $graphs
-                ->setIniConfig($this->Config('graphs'))
-                ->bind($graph);
+            $graphs->setIniConfig($this->Config('graphs'))->bind($graph);
         } catch (NotFoundError $e) {
             $this->httpNotFound($e->getMessage());
         }
@@ -79,8 +79,7 @@ public function removeAction()
             }
         ]);
 
-        $confirmation
-            ->setRedirectUrl('grafana/graph')
+        $confirmation->setRedirectUrl('grafana/graph')
             ->setSubmitLabel($this->translate('Remove graph'))
             ->handleRequest();
 
@@ -102,16 +101,12 @@ public function updateAction()
         $graphs = new GraphForm();
 
         try {
-            $graphs
-                ->setIniConfig($this->Config('graphs'))
-                ->bind($graph);
+            $graphs->setIniConfig($this->Config('graphs'))->bind($graph);
         } catch (NotFoundError $e) {
             $this->httpNotFound($e->getMessage());
         }
 
-        $graphs
-            ->setRedirectUrl('grafana/graph')
-            ->handleRequest();
+        $graphs->setRedirectUrl('grafana/graph')->handleRequest();
 
         $this->view->form = $graphs;
     }

application/controllers/IcingadbdashboardController.php

@@ -41,14 +41,10 @@ public function indexAction()
 
         if ($serviceName != null) {
             $object = $this->getServiceObject($serviceName, $hostName);
+            $graph = new ServiceDetailExtension();
         } else {
             $object = $this->getHostObject($hostName);
-        }
-
-        if ($object instanceof Host) {
             $graph = new HostDetailExtension();
-        } else {
-            $graph = new ServiceDetailExtension();
         }
 
         $this->addContent($graph->getPreviewHtml($object));

library/Grafana/Helpers/Util.php

@@ -38,12 +38,12 @@ public static function getUserThemeMode(User $user): string
     }
 
     /**
-     * httpStatusCodetoString translates a HTTP status code to a readable message
+     * httpStatusCodeToString translates a HTTP status code to a readable message
      *
      * @param int $code HTTP status code
      * @return string
      */
-    public static function httpStatusCodetoString(int $code = 0): string
+    public static function httpStatusCodeToString(int $code = 0): string
     {
         $statuscodes = [
             '100' => 'Continue',