Merge branch 'develop' into patch-1

src/psm/Module/AbstractController.php

@@ -165,7 +165,9 @@ abstract class AbstractController implements ControllerInterface
         }
         $this->xhr = (bool) psm_GET('xhr', psm_POST('xhr', false));
 
-        if (!in_array($action, $this->actions) || !($result = $this->runAction($action))) {
+        $result = $this->runAction($action);
+
+        if (!in_array($action, $this->actions) || !$result) {
             $result = $this->runAction($this->action_default);
         }
 

src/psm/Module/Server/Controller/AbstractServerController.php

@@ -35,11 +35,6 @@ use psm\Service\Database;
 abstract class AbstractServerController extends AbstractController
 {
 
-    public function __construct(Database $db, \Twig_Environment $twig)
-    {
-        parent::__construct($db, $twig);
-    }
-
     /**
      * Get all servers for the current user
      * @param Countable|array|\PDOStatement $server_id (int) if true only that server will be retrieved.

src/psm/Util/Server/Updater/StatusNotifier.php

@@ -275,7 +275,6 @@ class StatusNotifier
         
         $this->combiNotification['notifications'][$method][$status][$this->server_id] =
             psm_parse_msg($this->status_new, $method . '_message', $this->server, true);
-        return;
     }
 
     /**
@@ -324,7 +323,6 @@ class StatusNotifier
             }
         }
         unset($notifications);
-        return;
     }
 
     /**
@@ -403,7 +401,6 @@ class StatusNotifier
             $mail->Send();
             $mail->ClearAddresses();
         }
-        return;
     }
 
     /**