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

[Task] Follow up native params and return type hints #13653

Merged
merged 21 commits into from
Nov 28, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
371123c
Fix: pdfreactor buildPdf declaration not compatible with Abstract
kingjia90 Nov 22, 2022
5962727
Update Environment.php
kingjia90 Nov 22, 2022
0228e99
Fix: clearEnv a nullable property should set it to `null`
kingjia90 Nov 22, 2022
32cee53
[Task]: Apply native parameter and return type hints
mcop1 Nov 23, 2022
8f14261
[Task]: Apply native parameter and return type hints
mcop1 Nov 23, 2022
b777d77
[Task]: Apply native parameter and return type hints
mcop1 Nov 24, 2022
eb4bcf6
Update lib/Navigation/Renderer/Breadcrumbs.php
mcop1 Nov 24, 2022
11ecb76
Update bundles/EcommerceFrameworkBundle/src/Tracking/AbstractProductD…
mcop1 Nov 24, 2022
fa3a909
[Task]: Apply native parameter and return type hints
mcop1 Nov 24, 2022
49512f8
Merge remote-tracking branch 'origin/followup-13474' into followup-13474
mcop1 Nov 24, 2022
37d2120
[Task]: Apply native parameter and return type hints
mcop1 Nov 24, 2022
2a82235
Merge branch '11.x' into followup-13474
mcop1 Nov 25, 2022
643b8ae
[Task]: Apply native parameter and return type hints
mcop1 Nov 25, 2022
14a8ab5
[Task]: Apply native parameter and return type hints
mcop1 Nov 28, 2022
9651827
Task: remove getColor phpstan ignore it got fixed
kingjia90 Nov 28, 2022
a107bd3
[Task]: Apply native parameter and return type hints
mcop1 Nov 28, 2022
5f415a9
Revert "Task: remove getColor phpstan ignore it got fixed"
mcop1 Nov 28, 2022
cbb696c
Revert "Revert "Task: remove getColor phpstan ignore it got fixed""
mcop1 Nov 28, 2022
561bd0c
[Task]: Apply native parameter and return type hints
mcop1 Nov 28, 2022
b21f5e4
[Task]: Apply native parameter and return type hints
mcop1 Nov 28, 2022
4f91af7
[Task]: Apply native parameter and return type hints
mcop1 Nov 28, 2022
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
6 changes: 3 additions & 3 deletions bundles/EcommerceFrameworkBundle/src/PriceSystem/Price.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Price implements PriceInterface

private Decimal $netAmount;

private string $taxEntryCombinationMode = TaxEntry::CALCULATION_MODE_COMBINE;
private ?string $taxEntryCombinationMode = TaxEntry::CALCULATION_MODE_COMBINE;

private bool $minPrice;

Expand Down Expand Up @@ -122,7 +122,7 @@ public function getTaxEntries(): array
/**
* {@inheritdoc}
*/
public function getTaxEntryCombinationMode(): string
public function getTaxEntryCombinationMode(): ?string
{
return $this->taxEntryCombinationMode;
}
Expand Down Expand Up @@ -162,7 +162,7 @@ public function setTaxEntries(array $taxEntries): void
/**
* {@inheritdoc}
*/
public function setTaxEntryCombinationMode(string $taxEntryCombinationMode): void
public function setTaxEntryCombinationMode(?string $taxEntryCombinationMode = null): void
{
$this->taxEntryCombinationMode = $taxEntryCombinationMode;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ public function getTaxEntries(): array;
/**
* Returns tax entry combination mode needed for tax calculation
*
* @return string
* @return string|null
*/
public function getTaxEntryCombinationMode(): string;
public function getTaxEntryCombinationMode(): ?string;

/**
* Sets gross amount of price. If $recalc is set to true, corresponding net price
Expand Down Expand Up @@ -113,9 +113,9 @@ public function setTaxEntries(array $taxEntries): void;
/**
* Sets $taxEntryCombinationMode for price.
*
* @param string $taxEntryCombinationMode
* @param string|null $taxEntryCombinationMode
*
* @return void
*/
public function setTaxEntryCombinationMode(string $taxEntryCombinationMode): void;
public function setTaxEntryCombinationMode(?string $taxEntryCombinationMode = null): void;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ abstract class AbstractProductData extends AbstractData

protected string $name;

protected string $brand;
protected ?string $brand = null;

protected array $categories;

Expand Down Expand Up @@ -56,12 +56,12 @@ public function setName(string $name): static
return $this;
}

public function getBrand(): string
public function getBrand(): ?string
{
return $this->brand;
}

public function setBrand(string $brand): static
public function setBrand(?string $brand = null): static
mcop1 marked this conversation as resolved.
Show resolved Hide resolved
{
$this->brand = $brand;

Expand Down