Skip to content

Commit

Permalink
Remove symfony/serializer conflict and bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
shishir-intelli committed Sep 11, 2024
1 parent 04d36d2 commit 71fd8eb
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 31 deletions.
13 changes: 5 additions & 8 deletions composer.json
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@

/**
* 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 @@ -127,7 +121,7 @@ public function getApps(): array
*
* @return \self
*/
public function apps(string ...$appIds): self
public function setApps(string ...$appIds): self
{
$this->apps = $appIds;

Expand All @@ -147,7 +141,7 @@ public function getCurrencies(): array
*
* @return \self
*/
public function currencies(string ...$currencyIds): self
public function setCurrencies(string ...$currencyIds): self
{
$this->currencies = $currencyIds;

Expand All @@ -167,7 +161,7 @@ public function getCurrencyOption(): ?string
*
* @return \self
*/
public function currencyOption(?string $currencyOption): 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.
Expand All @@ -181,7 +175,7 @@ public function currencyOption(?string $currencyOption): self
*
* @return \self
*/
public function developers(string ...$developerIds): self
public function setDevelopers(string ...$developerIds): self
{
$this->developers = $developerIds;

Expand Down Expand Up @@ -209,7 +203,7 @@ public function getApiPackages(): array
*
* @return \self
*/
public function apiPackages(string ...$apiPackageIds): self
public function setApiPackages(string ...$apiPackageIds): self
{
$this->apiPackages = $apiPackageIds;

Expand All @@ -229,7 +223,7 @@ public function getApiProducts(): array
*
* @return \self
*/
public function apiProducts(string ...$apiProductIds): self
public function setApiProducts(string ...$apiProductIds): self
{
$this->apiProducts = $apiProductIds;

Expand All @@ -249,7 +243,7 @@ public function getPricingTypes(): array
*
* @return \self
*/
public function pricingTypes(string ...$pricingTypes): self
public function setPricingTypes(string ...$pricingTypes): self
{
$this->pricingTypes = $pricingTypes;

Expand All @@ -269,7 +263,7 @@ public function getRatePlanLevels(): array
*
* @return \self
*/
public function ratePlanLevels(string ...$ratePlanLevels): self
public function setRatePlanLevels(string ...$ratePlanLevels): self
{
$this->ratePlanLevels = $ratePlanLevels;

Expand Down Expand Up @@ -313,7 +307,7 @@ public function getShowTransactionType(): bool
*
* @return \self
*/
public function showRevenueSharePercentage(bool $show): self
public function setShowRevenueSharePercentage(bool $show): self
{
$this->showRevenueSharePercentage = $show;

Expand All @@ -325,7 +319,7 @@ public function showRevenueSharePercentage(bool $show): self
*
* @return \self
*/
public function showSummary(bool $show): self
public function setShowSummary(bool $show): self
{
$this->showSummary = $show;

Expand All @@ -337,7 +331,7 @@ public function showSummary(bool $show): self
*
* @return \self
*/
public function showTransactionDetail(bool $show): self
public function setShowTransactionDetail(bool $show): self
{
$this->showTransactionDetail = $show;

Expand All @@ -349,7 +343,7 @@ public function showTransactionDetail(bool $show): self
*
* @return \self
*/
public function showTransactionType(bool $show): self
public function setShowTransactionType(bool $show): self
{
$this->showTransactionType = $show;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function getGroupBy(): array
*
* @return \self
*/
public function groupBy(string ...$groupBy): self
public function setGroupBy(string ...$groupBy): self
{
$this->groupBy = $groupBy;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function getTransactionTypes(): array
*
* @return \self
*/
public function transactionTypes(string ...$transactionTypes): self
public function setTransactionTypes(string ...$transactionTypes): self
{
$this->transactionTypes = $transactionTypes;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ trait ReportDefinitionEntityProviderTrait
protected static function getNewReportDefinition(bool $randomData = true): ReportDefinitionInterface
{
$criteria = new BillingReportCriteria('JANUARY', $randomData ? date('Y') : 2019);
$criteria->groupBy('PACKAGE', 'PRODUCT', 'DEVELOPER')->ratePlanLevels('STANDARD', 'DEVELOPER')->developers('[email protected]');
$criteria->setGroupBy('PACKAGE', 'PRODUCT', 'DEVELOPER')->setRatePlanLevels('STANDARD', 'DEVELOPER')->setDevelopers('[email protected]');
$entity = new ReportDefinition([
'name' => $randomData ? static::randomGenerator()->machineName() : 'PHPUnit',
'description' => $randomData ? static::randomGenerator()->text() : 'test report definition provider',
Expand All @@ -47,7 +47,7 @@ protected static function getUpdatedReportDefinition(ReportDefinitionInterface $
/** @var \Apigee\Edge\Api\Monetization\Structure\Reports\Criteria\BillingReportCriteria $criteria */
$criteria = $updated->getCriteria();
$criteria->setBillingMonth('FEBRUARY');
$criteria->showSummary(!$criteria->getShowSummary());
$criteria->setShowSummary(!$criteria->getShowSummary());
$updated->setCriteria($criteria);

return $updated;
Expand Down

0 comments on commit 71fd8eb

Please sign in to comment.