fix code styling

Author: christoph2497

application/controllers/ConfigurationController.php

@@ -173,21 +173,12 @@ public function channelrulesAction()
             'action' => 'add']
         )));
 
-//        $this->actions()->add(Link::create($this->translate('Edit'), 'TODO', [
-//            'what' => 'ever'
-//        ], [
-//            'class' => 'icon-edit'
-//        ]));
         $uuid = $this->requireUuid();
         $ns = $this->Window()->getSessionNamespace('eventtracker');
         $sessionKey = 'simulationObject/'. $uuid->toString();
 
         $form = $this->getForm($action); // TODO: w/o form
         $modifierRuleStore = new ModifierRuleStore($ns, $uuid, $form);
-        $rules = $modifierRuleStore->getStoredRules();
-        $rules = $modifierRuleStore->getRules();
-//        $form->addElement('submit', 'submit', ['label' => $this->translate('Save32')]);
-//        $this->addContent($form);
         if ($this->params->get('action') === 'add') {
             $ruleForm = new ChannelRuleForm();
             $ruleForm->handleRequest($this->getServerRequest());
@@ -659,7 +650,6 @@ protected function showRules(
         UuidInterface $uuid,
         UuidObjectForm $form
     ) {
-        $sessionKey = 'channelrules/' . $uuid->toString();
         $form->addElement('submit', 'add_modifier', []);
 
         if ($modifierRuleStore->getSessionRules() !== null) {
@@ -670,9 +660,6 @@ protected function showRules(
                 $message = Hint::warning(
                     'The order has been modified please safe if you want to preserver the new order'
                 );
-//                $form->addHtml(Hint::warning(
-//                    'The order has been modified please safe if you want to preserver the new order'
-//                ));
                 if ($newForm->hasBeenSubmitted()) {
                     $form->populate(['rules' => JsonString::encode($modifierRuleStore->getRules())]);
                     $form->storeObject();
@@ -681,21 +668,11 @@ protected function showRules(
                 }
                 $this->content()->add([$message, $newForm]);
             }
-            // $modifierRuleStore->setModifierRules($modifierRuleStore->getSessionRules());
         }
         if ($modifierRuleStore->getRules() === null) {
-            var_dump("foobar");
-            return;
-        }
-        try {
-            $modifiers = $modifierRuleStore->getRules();
-        } catch (JsonDecodeException $e) {
-            $this->content()->add(Hint::error(sprintf(
-                $this->translate('Configured rules are invalid: %s'),
-                $e->getMessage()
-            )));
             return;
         }
+        $modifiers = $modifierRuleStore->getRules();
         $url = Url::fromPath('eventtracker/configuration/channelrule', [
             'uuid' => $uuid->toString()
         ]);

library/Eventtracker/Modifier/ModifierRuleStore.php

@@ -67,9 +67,6 @@ public function getStoredRules(): ModifierChain
         return ModifierChain::fromSerialization($modifier);
     }
 
-    /**
-     * @return mixed
-     */
     public function getRules(): ModifierChain
     {
         return $this->getSessionRules() ?? $this->getStoredRules();

library/Eventtracker/Modifier/MoveProperty.php

@@ -29,10 +29,11 @@ public function describe(string $propertyName): ValidHtml
     public static function extendSettingsForm(ChannelRuleForm $form): void
     {
         $form->addElement('text', 'target_property', [
-        'label' => $form->translate('Target Property'),
-        'required' => false,
-        'description' => $form->translate('The value of the given property'
-        . ' will be moved to to target properties value'),
-            ]);
+            'label' => $form->translate('Target Property'),
+            'required' => false,
+            'description' => $form->translate(
+                'The value of the given property will be moved to to target properties value'
+            )
+        ]);
     }
 }

library/Eventtracker/Modifier/SimpleNameValueParser.php

@@ -46,7 +46,8 @@ public static function extendSettingsForm(ChannelRuleForm $form): void
         $form->addElement(
             'text',
             'catchall_key',
-            ['label' => $form->translate('catchall_key'),
+            [
+                'label' => $form->translate('catchall_key'),
                 'required' => false,
                 'description' => 'catchall_key'
             ]

library/Eventtracker/Web/Form/SimulateRuleForm.php

@@ -20,7 +20,6 @@ public function __construct($ns, $sessionKey)
 
     protected function assemble()
     {
-
         $this->addElement('select', 'simulation_entries', [
            'label' => $this->translate('Simulation entries'),
            'description' => $this->translate('Simulation entries'),

library/Eventtracker/Web/Table/ChannelRulesTable.php

@@ -110,7 +110,7 @@ protected function assemble()
                     'class' => ['collapsible-table-row', 'collapsed']
                 ]),
                 $this::td([
-                  $this->deleteButton($row),
+                    $this->deleteButton($row),
                     $this->moveUpButton($row),
                     $this->moveDownButton($row),
                 ])