ModifierChain: switch parameter order

Author: Thomas-Gelf

application/controllers/ConfigurationController.php

@@ -689,8 +689,8 @@ protected function showRules(
                 $modifiers,
                 $url,
                 $this->getServerRequest(),
+                $modifierRuleStore,
                 $sampleObject,
-                $modifierRuleStore
             );
             if ($info->hasModifications()) {
                 $this->redirectNow($this->url());

library/Eventtracker/Modifier/ModifierChain.php

@@ -2,11 +2,11 @@
 
 namespace Icinga\Module\Eventtracker\Modifier;
 
-use gipfl\Json\JsonString;
+use Countable;
 use JsonSerializable;
 use stdClass;
 
-class ModifierChain implements JsonSerializable, \Countable
+class ModifierChain implements JsonSerializable, Countable
 {
     protected array $modifiers = [];
 
@@ -125,7 +125,7 @@ public function jsonSerialize()
         return $result;
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->modifiers);
     }

library/Eventtracker/Web/Table/ChannelRulesTable.php

@@ -14,13 +14,11 @@
 use gipfl\Web\Widget\Hint;
 use Icinga\Module\Eventtracker\Data\PlainObjectRenderer;
 use Icinga\Module\Eventtracker\Modifier\ModifierChain;
-use Icinga\Module\Eventtracker\Modifier\ModifierRegistry;
 use Icinga\Module\Eventtracker\Modifier\ModifierRuleStore;
 use Icinga\Module\Eventtracker\Web\Form\ChannelConfigForm;
 use Icinga\Module\Eventtracker\Web\Form\InstanceInlineForm;
 use ipl\Html\Html;
 use ipl\Html\Table;
-use mysql_xdevapi\CrudOperationBindable;
 use Psr\Http\Message\ServerRequestInterface;
 
 class ChannelRulesTable extends Table
@@ -37,7 +35,7 @@ class ChannelRulesTable extends Table
     protected ModifierChain $modifierChain;
     protected Url $url;
     protected ServerRequestInterface $request;
-    protected ModifierRuleStore $ruleStore;
+    protected ModifierRuleStore $modifierRuleStore;
     private ?object $sampleObject;
 
     public function getModifierChain(): ModifierChain
@@ -48,11 +46,11 @@ public function getModifierChain(): ModifierChain
     private bool $hasBeenModified = false;
 
     public function __construct(
-        ModifierChain          $modifierChain,
-        Url                    $url,
+        ModifierChain $modifierChain,
+        Url $url,
         ServerRequestInterface $request,
-        ?object                $sampleObject = null,
-        ModifierRuleStore $modifierRuleStore
+        ModifierRuleStore $modifierRuleStore,
+        ?object $sampleObject = null
     ) {
         $this->modifierChain = $modifierChain;
         $this->url = $url;