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.

Sign up for GitHub

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

HP-1928: array => string type #64

Merged
merged 11 commits into from
Jun 5, 2024
Merged

HP-1928: array => string type #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da86587
HP-1928: array => string type
bladeroot Apr 17, 2024
dfeb822
change
bladeroot Apr 22, 2024
2978053
HP-1632 Add previous month notation Y-pm-01 support to Behat
SilverFire May 29, 2024
a0b33a7
HP-1632 Allow charge reducing by default
SilverFire May 30, 2024
1d91fdd
HP-1888: add call set auto tariff (#65)
bladeroot May 30, 2024
02617b7
Merge branch 'sale-data-type' of https://github.com/bladeroot/php-bil…
bladeroot Jun 4, 2024
2f0f4c9
change
bladeroot Jun 4, 2024
c0c1a82
change
bladeroot Jun 4, 2024
24ca334
Update src/sale/Sale.php
bladeroot Jun 5, 2024
c1cf2f7
revert
bladeroot Jun 5, 2024
bc5b93b
revert
bladeroot Jun 5, 2024
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
4 changes: 2 additions & 2 deletions src/sale/Sale.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ public function setId($id)
$this->id = $id;
}

public function getData()
public function getData(): ?array
{
return $this->data;
return !empty($this->data) ? $this->data : null;
Comment on lines +132 to +134
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update getData method to handle JSON strings.

The getData method should return an array decoded from the JSON string stored in $data, as per the PR's objective and the AI-generated summary. Currently, it still treats $data as an array.

- return !empty($this->data) ? $this->data : null;
+ return !empty($this->data) ? json_decode($this->data, true) : null;
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
public function getData(): ?array
{
return $this->data;
return !empty($this->data) ? $this->data : null;
public function getData(): ?array
{
return !empty($this->data) ? json_decode($this->data, true) : null;

}

public function jsonSerialize(): array
Expand Down
2 changes: 2 additions & 0 deletions src/sale/SaleCreationDto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@ class SaleCreationDto
public $closeTime;

public $data;

public $reason;
}
2 changes: 1 addition & 1 deletion src/sale/SaleFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class SaleFactory implements SaleFactoryInterface
*/
public function create(SaleCreationDto $dto)
{
$sale = new Sale($dto->id, $dto->target, $dto->customer, $dto->plan, $dto->time);
$sale = new Sale($dto->id, $dto->target, $dto->customer, $dto->plan, $dto->time, $dto->data);

if ($dto->closeTime !== null) {
$sale->close($dto->closeTime);
Expand Down
4 changes: 2 additions & 2 deletions src/sale/SaleInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ public function getTime();
public function getCloseTime(): ?DateTimeImmutable;

/**
* @return string|array|null
* @return array|null
*/
public function getData();
public function getData(): ?array;

/**
* @param DateTimeImmutable $time
Expand Down
Loading