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

Jump to bottom

[Order] Fix getters and setters to use a proper flag name after upmerge issue #13700

Merged
merged 1 commit into from Feb 25, 2022
Merged

[Order] Fix getters and setters to use a proper flag name after upmerge issue #13700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Sylius/Component/Core/Model/Order.php
View file
Open in desktop
Expand Up @@ -477,12 +477,12 @@ public function getNonDiscountedItemsTotal(): int
return $total;
}

public function getByGuest(): bool
public function getCreatedByGuest(): bool
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't it be isCreatedByGuest instead ?

Copy link
Member

Choose a reason for hiding this comment

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

It probably should... but this is a PR just to fix conflicts after upmerge, we can fix it from 1.10 ⬆️ later on :)

Copy link
Member Author

Choose a reason for hiding this comment

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

It could be, it looks probably more natural, but it should be changed on 1.10 branch, as the new field has been introduced there, in this PR I'm only fixing the problem after upmerge branches

{
return $this->createdByGuest;
}

public function setByGuest(bool $createdByGuest): void
public function setCreatedByGuest(bool $createdByGuest): void
{
$this->createdByGuest = $createdByGuest;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Component/Core/Model/OrderInterface.php
View file
Open in desktop
Expand Up @@ -113,9 +113,9 @@ public function getCustomerIp(): ?string;

public function setCustomerIp(?string $customerIp): void;

public function getByGuest(): bool;
public function getCreatedByGuest(): bool;

public function setByGuest(bool $guest): void;
public function setCreatedByGuest(bool $createdByGuest): void;

/**
* @return Collection|OrderItemInterface[]
Expand Down