refactor: set data structure for getLevels method return

impress-org · Apr 30, 2024 · 48ba42b · 48ba42b
1 parent 553ef04
commit 48ba42b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/FormBuilder/BlockModels/DonationAmountBlockModel.php b/src/FormBuilder/BlockModels/DonationAmountBlockModel.php
@@ -67,7 +67,13 @@ public function getLabel(): string
      */
     public function getLevels(): array
     {
-        return $this->block->getAttribute('levels');
+        return array_map(static function($level) {
+            return [
+                'label' => (string)filter_var($level['label'], FILTER_SANITIZE_STRING),
+                'value' => (float)filter_var($level['value'], FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION),
+                'checked' => (bool)filter_var($level['checked'], FILTER_VALIDATE_BOOLEAN),
+            ];
+        }, $this->block->getAttribute('levels'));
     }
 
     /**

diff --git a/src/FormBuilder/BlockTypes/DonationAmountBlockType.php b/src/FormBuilder/BlockTypes/DonationAmountBlockType.php
@@ -54,15 +54,20 @@ public static function name(): string
     ];
 
     /**
+     * @unreleased Update levels array schema.
      * @since 3.8.0
      *
      * @return float[]
      */
     public function getLevels(): array
     {
-        return array_map(static function ($level) {
-            return (float)filter_var($level, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-        }, $this->levels);
+        return array_map(static function($level) {
+            return [
+                'label' => (string)filter_var($level['label'], FILTER_SANITIZE_STRING),
+                'value' => (float)filter_var($level['value'], FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION),
+                'checked' => (bool)filter_var($level['checked'], FILTER_VALIDATE_BOOLEAN),
+            ];
+        }, $this->block->getAttribute('levels'));
     }
 
     /**