Skip to content

Commit

Permalink
chore: psalm simplify positive-int|0 to non-negative-int (for tests) (#…
Browse files Browse the repository at this point in the history
…781)

Co-authored-by: Christopher Georg <[email protected]>
  • Loading branch information
Chris53897 and Chris8934 committed Feb 2, 2024
1 parent a829bd4 commit 68e3392
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 31 deletions.
30 changes: 15 additions & 15 deletions tests/ConverterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ final class ConverterTest extends TestCase
/**
* @psalm-param non-empty-string $baseCurrencyCode
* @psalm-param non-empty-string $counterCurrencyCode
* @psalm-param positive-int|0 $subunitBase
* @psalm-param positive-int|0 $subunitCounter
* @psalm-param non-negative-int $subunitBase
* @psalm-param non-negative-int $subunitCounter
* @psalm-param int|float $ratio
* @psalm-param positive-int|numeric-string $amount
* @psalm-param positive-int|0 $expectedAmount
* @psalm-param non-negative-int $expectedAmount
*
* @dataProvider convertExamples
* @test
Expand Down Expand Up @@ -74,11 +74,11 @@ public function itConvertsToADifferentCurrency(
/**
* @psalm-param non-empty-string $baseCurrencyCode
* @psalm-param non-empty-string $counterCurrencyCode
* @psalm-param positive-int|0 $subunitBase
* @psalm-param positive-int|0 $subunitCounter
* @psalm-param non-negative-int $subunitBase
* @psalm-param non-negative-int $subunitCounter
* @psalm-param int|float $ratio
* @psalm-param positive-int|numeric-string $amount
* @psalm-param positive-int|0 $expectedAmount
* @psalm-param non-negative-int $expectedAmount
*
* @dataProvider convertExamples
* @test
Expand Down Expand Up @@ -127,11 +127,11 @@ public function itConvertsAndReturnWithCurrencyPair(
/**
* @psalm-param non-empty-string $baseCurrencyCode
* @psalm-param non-empty-string $counterCurrencyCode
* @psalm-param positive-int|0 $subunitBase
* @psalm-param positive-int|0 $subunitCounter
* @psalm-param non-negative-int $subunitBase
* @psalm-param non-negative-int $subunitCounter
* @psalm-param int|float $ratio
* @psalm-param positive-int|numeric-string $amount
* @psalm-param positive-int|0 $expectedAmount
* @psalm-param non-negative-int $expectedAmount
*
* @dataProvider convertExamples
* @test
Expand Down Expand Up @@ -174,11 +174,11 @@ public function itConvertsAgainstCurrencyPair(
/**
* @psalm-param non-empty-string $baseCurrencyCode
* @psalm-param non-empty-string $counterCurrencyCode
* @psalm-param positive-int|0 $subunitBase
* @psalm-param positive-int|0 $subunitCounter
* @psalm-param non-negative-int $subunitBase
* @psalm-param non-negative-int $subunitCounter
* @psalm-param int|float $ratio
* @psalm-param positive-int|numeric-string $amount
* @psalm-param positive-int|0 $expectedAmount
* @psalm-param non-negative-int $expectedAmount
*
* @dataProvider convertExamples
* @test
Expand Down Expand Up @@ -224,11 +224,11 @@ public function itThrowsWhenConvertingAgainstTheWrongBaseCurrency(): void
* @psalm-return non-empty-list<array{
* non-empty-string,
* non-empty-string,
* positive-int|0,
* positive-int|0,
* non-negative-int,
* non-negative-int,
* int|float,
* positive-int|numeric-string,
* positive-int|0
* non-negative-int
* }>
*/
public function convertExamples(): array
Expand Down
4 changes: 2 additions & 2 deletions tests/Formatter/BitcoinMoneyFormatterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class BitcoinMoneyFormatterTest extends TestCase
/**
* @psalm-param positive-int $value
* @psalm-param non-empty-string $formatted
* @psalm-param positive-int|0 $fractionDigits
* @psalm-param non-negative-int $fractionDigits
*
* @dataProvider bitcoinExamples
* @test
Expand All @@ -41,7 +41,7 @@ public function itFormatsMoney(int $value, string $formatted, int $fractionDigit
* @psalm-return non-empty-list<array{
* positive-int,
* non-empty-string,
* positive-int|0
* non-negative-int
* }>
*/
public function bitcoinExamples(): array
Expand Down
4 changes: 2 additions & 2 deletions tests/Formatter/DecimalMoneyFormatterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class DecimalMoneyFormatterTest extends TestCase
{
/**
* @psalm-param non-empty-string $currency
* @psalm-param positive-int|0 $subunit
* @psalm-param non-negative-int $subunit
* @psalm-param numeric-string $result
*
* @dataProvider moneyExamples
Expand All @@ -39,7 +39,7 @@ public function itFormatsMoney(int $amount, string $currency, int $subunit, stri
* @psalm-return non-empty-list<array{
* int,
* non-empty-string,
* positive-int|0,
* non-negative-int,
* numeric-string
* }>
*/
Expand Down
4 changes: 2 additions & 2 deletions tests/Formatter/IntlLocalizedDecimalFormatterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ final class IntlLocalizedDecimalFormatterTest extends TestCase
* @psalm-param non-empty-string $currency
* @psalm-param positive-int $subunit
* @psalm-param non-empty-string $result
* @psalm-param positive-int|0 $fractionDigits
* @psalm-param non-negative-int $fractionDigits
*
* @dataProvider moneyExamples
* @test
Expand Down Expand Up @@ -48,7 +48,7 @@ public function itFormatsMoney(int $amount, string $currency, int $subunit, stri
* positive-int,
* non-empty-string,
* int,
* positive-int|0
* non-negative-int
* }>
*/
public static function moneyExamples(): array
Expand Down
4 changes: 2 additions & 2 deletions tests/Formatter/IntlMoneyFormatterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ final class IntlMoneyFormatterTest extends TestCase
* @psalm-param positive-int $subunit
* @psalm-param non-empty-string $result
* @psalm-param positive-int $mode
* @psalm-param positive-int|0 $fractionDigits
* @psalm-param non-negative-int $fractionDigits
*
* @dataProvider moneyExamples
* @test
Expand Down Expand Up @@ -54,7 +54,7 @@ public function itFormatsMoney(int $amount, string $currency, int $subunit, stri
* non-empty-string,
* positive-int,
* bool,
* positive-int|0
* non-negative-int
* }>
*/
public static function moneyExamples(): array
Expand Down
12 changes: 6 additions & 6 deletions tests/MoneyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public function it_divides_the_amount(int|string $divisor, int $roundingMode, st

/**
* @psalm-param int $amount
* @psalm-param non-empty-array<positive-int|0|float> $ratios
* @psalm-param non-empty-array<non-negative-int|float> $ratios
* @psalm-param non-empty-array<int> $results
*
* @dataProvider allocationExamples
Expand Down Expand Up @@ -208,7 +208,7 @@ public function itHasComparators(int|string $amount, bool $isZero, bool $isPosit

/**
* @psalm-param int|numeric-string $amount
* @psalm-param positive-int|0 $result
* @psalm-param non-negative-int $result
*
* @dataProvider absoluteExamples
* @test
Expand Down Expand Up @@ -419,7 +419,7 @@ public function itCalculatesAvg(array $values, Money $avg): void

/**
* @psalm-param int $amount
* @psalm-param positive-int|0 $unit
* @psalm-param non-negative-int $unit
* @psalm-param int $expected
* @psalm-param int $roundingMode
*
Expand Down Expand Up @@ -487,7 +487,7 @@ public function comparisonExamples(): array
/**
* @psalm-return non-empty-list<array{
* int,
* non-empty-array<int|string, positive-int|0|float>,
* non-empty-array<int|string, non-negative-int|float>,
* non-empty-array<int|string, int>
* }>
*/
Expand Down Expand Up @@ -554,7 +554,7 @@ public function comparatorExamples(): array
/**
* @psalm-return non-empty-list<array{
* int|numeric-string,
* positive-int|0
* non-negative-int
* }>
*/
public function absoluteExamples(): array
Expand Down Expand Up @@ -607,7 +607,7 @@ public function modExamples(): array
/**
* @psalm-return non-empty-list<array{
* int,
* positive-int|0,
* non-negative-int,
* int,
* int
* }>
Expand Down
4 changes: 2 additions & 2 deletions tests/Parser/DecimalMoneyParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class DecimalMoneyParserTest extends TestCase
{
/**
* @psalm-param non-empty-string $currency
* @psalm-param positive-int|0 $subunit
* @psalm-param non-negative-int $subunit
* @psalm-param int $result
*
* @dataProvider formattedMoneyExamples
Expand Down Expand Up @@ -58,7 +58,7 @@ public function itThrowsAnExceptionUponInvalidInputs($input): void
* @psalm-return non-empty-list<array{
* string,
* non-empty-string,
* positive-int|0,
* non-negative-int,
* int
* }>
*/
Expand Down

0 comments on commit 68e3392

Please sign in to comment.