Use JsonSerializable

Signed-off-by: Matthias Held <matthias.held@uni-konstanz.de>

2 files changed, 6 insertions, 20 deletions

diff --git a/lib/Analyzer/EntropyFunnellingResult.php b/lib/Analyzer/EntropyFunnellingResult.php
index a3c7325..8b8c238 100644
--- a/lib/Analyzer/EntropyFunnellingResult.php
+++ b/lib/Analyzer/EntropyFunnellingResult.php
@@ -21,7 +21,7 @@
 
 namespace OCA\RansomwareDetection\Analyzer;
 
-class EntropyFunnellingResult
+class EntropyFunnellingResult implements \JsonSerializable
 {
     /** @var float */
     protected $medianWritten;
@@ -141,15 +141,8 @@ class EntropyFunnellingResult
         $this->entropyFunnelling = $entropyFunnelling;
     }
 
-    public function toArray()
+    public function jsonSerialize()
     {
-        $var = get_object_vars($this);
-        foreach ($var as &$value) {
-            if (is_object($value) && method_exists($value, 'toArray')) {
-                $value = $value->toArray();
-            }
-        }
-
-        return $var;
+        return get_object_vars($this);
     }
 }
diff --git a/lib/Analyzer/SequenceResult.php b/lib/Analyzer/SequenceResult.php
index b5fce8b..6994b73 100644
--- a/lib/Analyzer/SequenceResult.php
+++ b/lib/Analyzer/SequenceResult.php
@@ -21,7 +21,7 @@
 
 namespace OCA\RansomwareDetection\Analyzer;
 
-class SequenceResult
+class SequenceResult implements \JsonSerializable
 {
     /** @var int */
     protected $sequenceId;
@@ -164,15 +164,8 @@ class SequenceResult
         $this->sequence = $sequence;
     }
 
-    public function toArray()
+    public function jsonSerialize()
     {
-        $var = get_object_vars($this);
-        foreach ($var as &$value) {
-            if (is_object($value) && method_exists($value, 'toArray')) {
-                $value = $value->toArray();
-            }
-        }
-
-        return $var;
+        return get_object_vars($this);
     }
 }