Fix float number in property value (#32)

* feat: add support for float number * feat: add support for float number
brd6 · Nov 29, 2023 · f0cb787 · f0cb787
1 parent 5712a79
commit f0cb787
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 8 deletions.
diff --git a/src/Resource/AbstractJsonSerializable.php b/src/Resource/AbstractJsonSerializable.php
@@ -25,6 +25,9 @@ abstract class AbstractJsonSerializable implements JsonSerializable
     private bool $ignoreEmptyValue = true;
     private array $onlyKeys = [];
 
+    /**
+     * @psalm-suppress MixedArgumentTypeCoercion
+     */
     public function jsonSerialize(): array
     {
         return array_filter(

diff --git a/src/Resource/Page/PropertyValue/NumberPropertyValue.php b/src/Resource/Page/PropertyValue/NumberPropertyValue.php
@@ -6,20 +6,20 @@
 
 class NumberPropertyValue extends AbstractPropertyValue
 {
-    protected ?int $number = null;
+    protected ?float $number = null;
 
     protected function initialize(): void
     {
         $data = $this->getRawData();
-        $this->number = isset($data['number']) ? (int) $data['number'] : null;
+        $this->number = isset($data['number']) ? (float) $data['number'] : null;
     }
 
-    public function getNumber(): ?int
+    public function getNumber(): ?float
     {
         return $this->number;
     }
 
-    public function setNumber(int $number): self
+    public function setNumber(float $number): self
     {
         $this->number = $number;
 

diff --git a/src/Resource/Property/Value/NumberValueProperty.php b/src/Resource/Property/Value/NumberValueProperty.php
@@ -6,21 +6,21 @@
 
 class NumberValueProperty extends AbstractValueProperty
 {
-    protected ?int $number = null;
+    protected ?float $number = null;
 
     protected function initialize(): void
     {
         $this->number = isset($this->getRawData()['number']) ?
-            (int) $this->getRawData()['number'] :
+            (float) $this->getRawData()['number'] :
             null;
     }
 
-    public function getNumber(): ?int
+    public function getNumber(): ?float
     {
         return $this->number;
     }
 
-    public function setNumber(int $number): self
+    public function setNumber(float $number): self
     {
         $this->number = $number;
 

diff --git a/tests/Fixtures/client_pages_retrieve_page_properties_200.json b/tests/Fixtures/client_pages_retrieve_page_properties_200.json
@@ -52,6 +52,11 @@
             "type": "number",
             "number": 42
         },
+        "My number float": {
+            "id": "%40aiB",
+            "type": "number",
+            "number": 42.42
+        },
         "formula2": {
             "id": "H%3BxC",
             "type": "formula",

diff --git a/tests/Resource/PageTest.php b/tests/Resource/PageTest.php
@@ -8,6 +8,7 @@
 use Brd6\NotionSdkPhp\Resource\File\Emoji;
 use Brd6\NotionSdkPhp\Resource\File\External;
 use Brd6\NotionSdkPhp\Resource\Page;
+use Brd6\NotionSdkPhp\Resource\Page\PropertyValue\NumberPropertyValue;
 use PHPUnit\Framework\TestCase;
 
 use function count;
@@ -88,4 +89,28 @@ public function testPageProperties(): void
             $this->assertNotEmpty($property->toArray());
         }
     }
+
+    public function testNumberProperty(): void
+    {
+        /** @var Page $page */
+        $page = Page::fromRawData(
+            (array) json_decode(
+                (string) file_get_contents('tests/Fixtures/client_pages_retrieve_page_properties_200.json'),
+                true,
+            ),
+        );
+
+        $properties = $page->getProperties();
+
+        /** @var NumberPropertyValue $myNumber */
+        $myNumber = $properties['My number'];
+
+        $this->assertInstanceOf(NumberPropertyValue::class, $myNumber);
+        $this->assertEquals(42, $myNumber->getNumber());
+
+        $myNumberFloat = $properties['My number float'];
+
+        $this->assertInstanceOf(NumberPropertyValue::class, $myNumberFloat);
+        $this->assertEquals(42.42, $myNumberFloat->getNumber());
+    }
 }