Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix float number in property value #32

Merged
merged 3 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Resource/AbstractJsonSerializable.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
8 changes: 4 additions & 4 deletions src/Resource/Page/PropertyValue/NumberPropertyValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions src/Resource/Property/Value/NumberValueProperty.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@
"type": "number",
"number": 42
},
"My number float": {
"id": "%40aiB",
"type": "number",
"number": 42.42
},
"formula2": {
"id": "H%3BxC",
"type": "formula",
Expand Down
25 changes: 25 additions & 0 deletions tests/Resource/PageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}