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

Remove symfony/serializer conflict and bump version #376

Merged
merged 5 commits into from
Sep 13, 2024
Merged

Remove symfony/serializer conflict and bump version #376

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71fd8eb
Remove symfony/serializer conflict and bump version
shishir-intelli Sep 11, 2024
2881cfc
Fix style
shishir-intelli Sep 11, 2024
8092c99
Depreciated non-setter methods and will be removed in 4.0.0
shishir-intelli Sep 12, 2024
b7618af
Added trigger error for all deprecated methods
shishir-intelli Sep 12, 2024
394f7ff
Added blank line before statement
shishir-intelli Sep 12, 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
13 changes: 5 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"php-http/message-factory": "^1.0",
"phpdocumentor/reflection-docblock": "^5.0",
"psr/http-message": "^1.0 || ^2.0",
"symfony/options-resolver": "^6.4.6",
"symfony/property-access": "^6.4.6",
"symfony/property-info": "^6.4.6",
"symfony/serializer": "^6.4.6"
"symfony/options-resolver": "^6.4.9",
"symfony/property-access": "^6.4.9",
"symfony/property-info": "^6.4.9",
"symfony/serializer": "^6.4.9"
},
"require-dev": {
"dms/phpunit-arraysubset-asserts": "^0.4.0",
Expand All @@ -46,12 +46,9 @@
"phpmetrics/phpmetrics": "^2.7",
"phpunit/phpunit": "^9.6",
"sebastian/comparator": "^4.0.5",
"symfony/cache": "^6.4.6",
"symfony/cache": "^6.4.9",
"vimeo/psalm": "^5.20"
},
"conflict": {
"symfony/serializer": ">6.4.6"
},
"autoload": {
"psr-4": {
"Apigee\\Edge\\": "src"
Expand Down
212 changes: 194 additions & 18 deletions src/Api/Monetization/Structure/Reports/Criteria/AbstractCriteria.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@
/**
* Base class for all supported Monetization reports.
*
* Boolean getters must be prefixed with "get" instead of "is" because
* property accessor tries to call property name (without prefix) earlier
* than "is" . ucfirst('propertyName') - which is a setter method here.
*
* @see https://github.com/symfony/property-access/blob/v4.2.5/PropertyAccessor.php#L433-L435
*
* @internal
*
* @see https://docs.apigee.com/api-platform/monetization/create-reports#repdefconfigapi
Expand Down Expand Up @@ -125,7 +119,10 @@ public function getApps(): array
/**
* @param string ...$appIds
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
shishir-intelli marked this conversation as resolved.
Show resolved Hide resolved
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function apps(string ...$appIds): self
shishir-intelli marked this conversation as resolved.
Show resolved Hide resolved
{
Expand All @@ -134,6 +131,18 @@ public function apps(string ...$appIds): self
return $this;
}

/**
* @param string ...$appIds
*
* @return self
*/
public function setApps(string ...$appIds): self
shishir-intelli marked this conversation as resolved.
Show resolved Hide resolved
{
$this->apps = $appIds;

return $this;
}

/**
* @return string[]
*/
Expand All @@ -145,7 +154,10 @@ public function getCurrencies(): array
/**
* @param string ...$currencyIds
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function currencies(string ...$currencyIds): self
{
Expand All @@ -154,6 +166,18 @@ public function currencies(string ...$currencyIds): self
return $this;
}

/**
* @param string ...$currencyIds
*
* @return self
*/
public function setCurrencies(string ...$currencyIds): self
{
$this->currencies = $currencyIds;

return $this;
}

/**
* @return string|null
*/
Expand All @@ -165,7 +189,10 @@ public function getCurrencyOption(): ?string
/**
* @param string|null $currencyOption
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function currencyOption(?string $currencyOption): self
{
Expand All @@ -176,10 +203,27 @@ public function currencyOption(?string $currencyOption): self
return $this;
}

/**
* @param string|null $currencyOption
*
* @return self
*/
public function setCurrencyOption(?string $currencyOption): self
{
// This tweak allows to reset the previously configured currency option
// by calling this method with an empty string or null.
$this->currencyOption = $currencyOption;

return $this;
}

/**
* @param string ...$developerIds
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function developers(string ...$developerIds): self
{
Expand All @@ -188,6 +232,18 @@ public function developers(string ...$developerIds): self
return $this;
}

/**
* @param string ...$developerIds
*
* @return self
*/
public function setDevelopers(string ...$developerIds): self
{
$this->developers = $developerIds;

return $this;
}

/**
* @return array
*/
Expand All @@ -207,7 +263,10 @@ public function getApiPackages(): array
/**
* @param string ...$apiPackageIds
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function apiPackages(string ...$apiPackageIds): self
{
Expand All @@ -216,6 +275,18 @@ public function apiPackages(string ...$apiPackageIds): self
return $this;
}

/**
* @param string ...$apiPackageIds
*
* @return self
*/
public function setApiPackages(string ...$apiPackageIds): self
{
$this->apiPackages = $apiPackageIds;

return $this;
}

/**
* @return string[]
*/
Expand All @@ -227,7 +298,10 @@ public function getApiProducts(): array
/**
* @param string ...$apiProductIds
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function apiProducts(string ...$apiProductIds): self
{
Expand All @@ -236,6 +310,18 @@ public function apiProducts(string ...$apiProductIds): self
return $this;
}

/**
* @param string ...$apiProductIds
*
* @return self
*/
public function setApiProducts(string ...$apiProductIds): self
{
$this->apiProducts = $apiProductIds;

return $this;
}

/**
* @return string[]
*/
Expand All @@ -247,7 +333,10 @@ public function getPricingTypes(): array
/**
* @param string ...$pricingTypes
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function pricingTypes(string ...$pricingTypes): self
{
Expand All @@ -256,6 +345,18 @@ public function pricingTypes(string ...$pricingTypes): self
return $this;
}

/**
* @param string ...$pricingTypes
*
* @return self
*/
public function setPricingTypes(string ...$pricingTypes): self
{
$this->pricingTypes = $pricingTypes;

return $this;
}

/**
* @return string[]
*/
Expand All @@ -267,7 +368,10 @@ public function getRatePlanLevels(): array
/**
* @param string ...$ratePlanLevels
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function ratePlanLevels(string ...$ratePlanLevels): self
{
Expand All @@ -276,6 +380,18 @@ public function ratePlanLevels(string ...$ratePlanLevels): self
return $this;
}

/**
* @param string ...$ratePlanLevels
*
* @return self
*/
public function setRatePlanLevels(string ...$ratePlanLevels): self
{
$this->ratePlanLevels = $ratePlanLevels;

return $this;
}

/**
* @return bool
*/
Expand Down Expand Up @@ -311,7 +427,10 @@ public function getShowTransactionType(): bool
/**
* @param bool $show
*
* @return \self
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function showRevenueSharePercentage(bool $show): self
{
Expand All @@ -323,7 +442,22 @@ public function showRevenueSharePercentage(bool $show): self
/**
* @param bool $show
*
* @return \self
* @return self
*/
public function setShowRevenueSharePercentage(bool $show): self
{
$this->showRevenueSharePercentage = $show;

return $this;
}

/**
* @param bool $show
*
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function showSummary(bool $show): self
{
Expand All @@ -335,7 +469,22 @@ public function showSummary(bool $show): self
/**
* @param bool $show
*
* @return \self
* @return self
*/
public function setShowSummary(bool $show): self
{
$this->showSummary = $show;

return $this;
}

/**
* @param bool $show
*
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function showTransactionDetail(bool $show): self
{
Expand All @@ -347,12 +496,39 @@ public function showTransactionDetail(bool $show): self
/**
* @param bool $show
*
* @return \self
* @return self
*/
public function setShowTransactionDetail(bool $show): self
{
$this->showTransactionDetail = $show;

return $this;
}

/**
* @param bool $show
*
* @return self
*
* @deprecated in 3.0.7, will be removed in 4.0.0. No longer needed.
* https://github.com/apigee/apigee-client-php/issues/373
*/
public function showTransactionType(bool $show): self
{
$this->showTransactionType = $show;

return $this;
}

/**
* @param bool $show
*
* @return self
*/
public function setShowTransactionType(bool $show): self
{
$this->showTransactionType = $show;

return $this;
}
}
Loading