Merge branch 'master' into feature/bump-dev-dependencies

.github/workflows/ci.yml

@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
           architecture: 'x64'

composer.json

@@ -34,6 +34,7 @@
         "ext-intl": "*",
         "cache/taggable-cache": "^1.1.0",
         "doctrine/coding-standard": "^12.0",
+        "doctrine/coding-standard": "^9.0",
         "doctrine/instantiator": "^1.5.0 || ^2.0",
         "florianv/exchanger": "^2.8.1",
         "florianv/swap": "^4.3.0",

src/Currencies/CryptoCurrencies.php

@@ -25,7 +25,7 @@ final class CryptoCurrencies implements Currencies
      *
      * @psalm-var non-empty-array<non-empty-string, array{
      *     symbol: non-empty-string,
-     *     minorUnit: positive-int|0
+     *     minorUnit: non-negative-int
      * }>|null
      */
     private static array|null $currencies = null;
@@ -62,7 +62,7 @@ static function ($code) {
      *
      * @psalm-return non-empty-array<non-empty-string, array{
      *     symbol: non-empty-string,
-     *     minorUnit: positive-int|0
+     *     minorUnit: non-negative-int
      * }>
      */
     private function getCurrencies(): array
@@ -77,7 +77,7 @@ private function getCurrencies(): array
     /**
      * @psalm-return non-empty-array<non-empty-string, array{
      *     symbol: non-empty-string,
-     *     minorUnit: positive-int|0
+     *     minorUnit: non-negative-int
      * }>
      */
     private function loadCurrencies(): array

src/Currencies/CurrencyList.php

@@ -25,7 +25,7 @@ final class CurrencyList implements Currencies
      */
     private array $currencies;
 
-    /** @psalm-param array<non-empty-string, positive-int|0> $currencies */
+    /** @psalm-param array<non-empty-string, non-negative-int> $currencies */
     public function __construct(array $currencies)
     {
         $this->currencies = $currencies;

src/Currencies/ISOCurrencies.php

@@ -26,7 +26,7 @@ final class ISOCurrencies implements Currencies
      * @psalm-var non-empty-array<non-empty-string, array{
      *     alphabeticCode: non-empty-string,
      *     currency: non-empty-string,
-     *     minorUnit: positive-int|0,
+     *     minorUnit: non-negative-int,
      *     numericCode: positive-int
      * }>|null
      */
@@ -79,7 +79,7 @@ static function ($code) {
      * @psalm-return non-empty-array<non-empty-string, array{
      *     alphabeticCode: non-empty-string,
      *     currency: non-empty-string,
-     *     minorUnit: positive-int|0,
+     *     minorUnit: non-negative-int,
      *     numericCode: positive-int
      * }>
      */
@@ -96,7 +96,7 @@ private function getCurrencies(): array
      * @psalm-return non-empty-array<non-empty-string, array{
      *     alphabeticCode: non-empty-string,
      *     currency: non-empty-string,
-     *     minorUnit: positive-int|0,
+     *     minorUnit: non-negative-int,
      *     numericCode: positive-int
      * }>
      */

src/Money.php

@@ -395,7 +395,7 @@ private function round(string $amount, int $roundingMode): string
     /**
      * Round to a specific unit.
      *
-     * @psalm-param positive-int|0  $unit
+     * @psalm-param non-negative-int  $unit
      * @psalm-param self::ROUND_* $roundingMode
      */
     public function roundToUnit(int $unit, int $roundingMode = self::ROUND_HALF_UP): self

src/Number.php

@@ -264,7 +264,7 @@ public static function roundMoneyValue(string $moneyValue, int $targetDigits, in
 
         if ($shouldRound && $moneyValue[$valueLength - $havingDigits + $targetDigits] >= 5) {
             $position = $valueLength - $havingDigits + $targetDigits;
-            /** @psalm-var positive-int|0 $addend */
+            /** @psalm-var non-negative-int $addend */
             $addend = 1;
 
             while ($position > 0) {

tests/ConverterTest.php

@@ -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
@@ -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
@@ -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
@@ -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
@@ -222,11 +222,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

tests/Formatter/BitcoinMoneyFormatterTest.php

@@ -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
@@ -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

tests/Formatter/DecimalMoneyFormatterTest.php

@@ -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
@@ -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
      * }>
      */

tests/Formatter/IntlLocalizedDecimalFormatterTest.php

@@ -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
@@ -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

tests/Formatter/IntlMoneyFormatterTest.php

@@ -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
@@ -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

tests/MoneyTest.php

@@ -129,7 +129,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
@@ -206,7 +206,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
@@ -403,7 +403,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
      *
@@ -469,7 +469,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>
      * }>
      */
@@ -536,7 +536,7 @@ public function comparatorExamples(): array
     /**
      * @psalm-return non-empty-list<array{
      *     int|numeric-string,
-     *     positive-int|0
+     *     non-negative-int
      * }>
      */
     public function absoluteExamples(): array
@@ -589,7 +589,7 @@ public function modExamples(): array
     /**
      * @psalm-return non-empty-list<array{
      *     int,
-     *     positive-int|0,
+     *     non-negative-int,
      *     int,
      *     int
      * }>

tests/Parser/DecimalMoneyParserTest.php

@@ -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
@@ -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
      * }>
      */