Add method return types and remove superfluous $db property

Author: sukhwinder33445

application/controllers/ChannelsController.php

@@ -15,7 +15,6 @@
 use Icinga\Web\Notification;
 use Icinga\Web\Widget\Tab;
 use Icinga\Web\Widget\Tabs;
-use ipl\Sql\Connection;
 use ipl\Sql\Expression;
 use ipl\Stdlib\Filter;
 use ipl\Web\Compat\CompatController;
@@ -30,22 +29,17 @@ class ChannelsController extends CompatController
 {
     use SearchControls;
 
-    /** @var Connection */
-    private $db;
-
     /** @var Filter\Rule Filter from query string parameters */
     private $filter;
 
-    public function init()
+    public function init(): void
     {
         $this->assertPermission('config/modules');
-
-        $this->db = Database::get();
     }
 
-    public function indexAction()
+    public function indexAction(): void
     {
-        $channels = Channel::on($this->db);
+        $channels = Channel::on(Database::get());
         $this->mergeTabs($this->Module()->getConfigTabs());
         $this->getTabs()->activate('channels');
 
@@ -95,7 +89,7 @@ public function indexAction()
         ))->setBaseTarget('_next');
 
         $emptyStateMessage = null;
-        if (AvailableChannelType::on($this->db)->columns([new Expression('1')])->first() === null) {
+        if (AvailableChannelType::on(Database::get())->columns([new Expression('1')])->first() === null) {
             $emptyStateMessage = t('No channel types available. Make sure Icinga Notifications is running.');
             $addButton->disable($emptyStateMessage);
         }
@@ -112,10 +106,10 @@ public function indexAction()
         }
     }
 
-    public function addAction()
+    public function addAction(): void
     {
         $this->addTitleTab(t('Add Channel'));
-        $form = (new ChannelForm($this->db))
+        $form = (new ChannelForm(Database::get()))
             ->on(ChannelForm::ON_SUCCESS, function (ChannelForm $form) {
                 $form->addChannel();
                 Notification::success(
@@ -142,7 +136,7 @@ public function completeAction(): void
     public function searchEditorAction(): void
     {
         $editor = $this->createSearchEditor(
-            Channel::on($this->db),
+            Channel::on(Database::get()),
             [
                 LimitControl::DEFAULT_LIMIT_PARAM,
                 SortControl::DEFAULT_SORT_PARAM,

application/forms/ChannelForm.php

@@ -59,7 +59,7 @@ public function __construct(Connection $db)
     /**
      * @throws ConfigurationError
      */
-    protected function assemble()
+    protected function assemble(): void
     {
         $query = AvailableChannelType::on($this->db)
             ->columns(['type', 'name', 'config_attrs'])
@@ -164,7 +164,7 @@ protected function assemble()
         }
     }
 
-    public function isValid()
+    public function isValid(): bool
     {
         if ($this->getPressedSubmitElement()->getName() === 'delete') {
             $csrfElement = $this->getElement('CSRFToken');
@@ -179,7 +179,7 @@ public function isValid()
         return parent::isValid();
     }
 
-    public function hasBeenSubmitted()
+    public function hasBeenSubmitted(): bool
     {
         if ($this->getPressedSubmitElement() !== null && $this->getPressedSubmitElement()->getName() === 'delete') {
             return true;