Merge pull request #9 from symcon/fixes/upgrade-style-to-v3

Update Style
symcon · Nov 16, 2023 · e1f4289 · e1f4289
2 parents 4a4820f + 8e8fecb
commit e1f4289
Show file tree

Hide file tree

Showing 7 changed files with 109 additions and 48 deletions.
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -10,4 +10,4 @@ jobs:
     - name: Checkout module
       uses: actions/checkout@master
     - name: Check style
-      uses: symcon/action-style@master
+      uses: symcon/action-style@v3
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
 .idea/
 .phpunit.*
-.php_cs.cache
+.php_cs.cache
+.php-cs-fixer.cache
diff --git a/.style b/.style
diff --git a/Alpha2/form.json b/Alpha2/form.json
@@ -1,24 +1,85 @@
 {
-  "elements":
-  [
-	{ "type": "ValidationTextBox", "name": "IPAddress", "caption": "IP-Adresse" },
-	{ "type": "Label", "label":  "Intervall für das Abfragen der Daten" },
-	{ "type": "IntervalBox", "name" : "Interval", "caption": "Sekunden" },
-	{ "type": "CheckBox", "name": "ShowHeatArea01", "caption": "Heizzone 1" },
-	{ "type": "CheckBox", "name": "ShowHeatArea02", "caption": "Heizzone 2" },
-	{ "type": "CheckBox", "name": "ShowHeatArea03", "caption": "Heizzone 3" },
-	{ "type": "CheckBox", "name": "ShowHeatArea04", "caption": "Heizzone 4" },
-	{ "type": "CheckBox", "name": "ShowHeatArea05", "caption": "Heizzone 5" },
-	{ "type": "CheckBox", "name": "ShowHeatArea06", "caption": "Heizzone 6" },
-	{ "type": "CheckBox", "name": "ShowHeatArea07", "caption": "Heizzone 7" },
-	{ "type": "CheckBox", "name": "ShowHeatArea08", "caption": "Heizzone 8" },
-	{ "type": "CheckBox", "name": "ShowHeatArea09", "caption": "Heizzone 9" },
-	{ "type": "CheckBox", "name": "ShowHeatArea10", "caption": "Heizzone 10" },
-	{ "type": "CheckBox", "name": "ShowHeatArea11", "caption": "Heizzone 11" },
-	{ "type": "CheckBox", "name": "ShowHeatArea12", "caption": "Heizzone 12" }
-  ],
-  "actions":
-  [
-	{ "type": "Button", "label": "Gerät auslesen", "onClick": "MA2_RequestStatus($id);" }
-  ]
+    "elements": [
+        {
+            "type": "ValidationTextBox",
+            "name": "IPAddress",
+            "caption": "IP-Adresse"
+        },
+        {
+            "type": "Label",
+            "label": "Intervall für das Abfragen der Daten"
+        },
+        {
+            "type": "IntervalBox",
+            "name": "Interval",
+            "caption": "Sekunden"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea01",
+            "caption": "Heizzone 1"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea02",
+            "caption": "Heizzone 2"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea03",
+            "caption": "Heizzone 3"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea04",
+            "caption": "Heizzone 4"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea05",
+            "caption": "Heizzone 5"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea06",
+            "caption": "Heizzone 6"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea07",
+            "caption": "Heizzone 7"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea08",
+            "caption": "Heizzone 8"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea09",
+            "caption": "Heizzone 9"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea10",
+            "caption": "Heizzone 10"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea11",
+            "caption": "Heizzone 11"
+        },
+        {
+            "type": "CheckBox",
+            "name": "ShowHeatArea12",
+            "caption": "Heizzone 12"
+        }
+    ],
+    "actions": [
+        {
+            "type": "Button",
+            "label": "Gerät auslesen",
+            "onClick": "MA2_RequestStatus($id);"
+        }
+    ]
 }
diff --git a/Alpha2/module.json b/Alpha2/module.json
@@ -3,8 +3,7 @@
     "name": "MoehlenhoffAlpha2",
     "type": 3,
     "vendor": "Möhlenhoff",
-    "aliases": 
-    [
+    "aliases": [
         "Möhlenhoff Alpha 2"
     ],
     "parentRequirements": [],

diff --git a/Alpha2/module.php b/Alpha2/module.php
@@ -726,6 +726,24 @@ public function RequestAction($Ident, $Value)
         $this->WriteValue($Ident, $Value);
     }
 
+    public function RequestStatus()
+    {
+        $xml = @simplexml_load_file('http://' . $this->ReadPropertyString('IPAddress') . '/data/static.xml');
+        if ($xml === false) {
+            return;
+        }
+
+        $this->SetValuesArray(self::$values, $xml);
+
+        if (GetValue($this->GetIDForIdent($this->ReduceToIdent('VERS_SW_STM'))) >= '02.02') {
+            $this->MaintainArray(self::$valuesHeatCtrlExt);
+            $this->SetValuesArray(self::$valuesHeatCtrlExt, $xml);
+        } else {
+            $this->MaintainArray(self::$valuesHeatCtrl);
+            $this->SetValuesArray(self::$valuesHeatCtrl, $xml);
+        }
+    }
+
     private function SendChanges($Xml)
     {
         $url = 'http://' . $this->ReadPropertyString('IPAddress') . '/data/changes.xml';
@@ -755,24 +773,6 @@ private function SendChanges($Xml)
         }
     }
 
-    public function RequestStatus()
-    {
-        $xml = @simplexml_load_file('http://' . $this->ReadPropertyString('IPAddress') . '/data/static.xml');
-        if ($xml === false) {
-            return;
-        }
-
-        $this->SetValuesArray(self::$values, $xml);
-
-        if (GetValue($this->GetIDForIdent($this->ReduceToIdent('VERS_SW_STM'))) >= '02.02') {
-            $this->MaintainArray(self::$valuesHeatCtrlExt);
-            $this->SetValuesArray(self::$valuesHeatCtrlExt, $xml);
-        } else {
-            $this->MaintainArray(self::$valuesHeatCtrl);
-            $this->SetValuesArray(self::$valuesHeatCtrl, $xml);
-        }
-    }
-
     private function MaintainArray($Array)
     {
         foreach ($Array as $key => $value) {

diff --git a/library.json b/library.json
@@ -4,9 +4,9 @@
     "name": "Möhlenhoff",
     "url": "",
     "compatibility": {
-		"version": "4.0"
-	},
+        "version": "4.0"
+    },
     "version": "1.1",
     "build": 0,
     "date": 0
-}
+}