Updated to support PHP 8.4

.github/workflows/behat-tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.3']
+        php: ['8.4']
         coverage-driver: [pcov]
     name: PHP ${{ matrix.php }}
     steps:

.github/workflows/phpunit-tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.3']
+        php: ['8.4']
         coverage-driver: [pcov]
     name: PHP ${{ matrix.php }}
     steps:

.github/workflows/psalm-analysis.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.3' ]
+        php: [ '8.4' ]
         coverage-driver: [ pcov ]
     name: PHP ${{ matrix.php }}
     steps:
@@ -41,4 +41,4 @@ jobs:
         run: composer install -n
 
       - name: Run Psalm
-        run: vendor/bin/psalm
+        run: vendor/bin/psalm

composer.json

@@ -65,7 +65,8 @@
         "opis/closure": "3.x-dev as 3.6.x-dev",
         "cache/array-adapter": "*",
         "matthiasnoback/behat-expect-exception": "^v0.3.0",
-        "behat/gherkin": "~v4.11.0"
+        "behat/gherkin": "~v4.11.0",
+        "rector/rector": "dev-main"
     },
     "suggest": {
         "ext-intl": "intl extension is required for formula support",

rector.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Caching\ValueObject\Storage\FileCacheStorage;
+use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
+use Rector\CodeQuality\Rector\Concat\JoinStringConcatRector;
+use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
+use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
+use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
+use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector;
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
+use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
+use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
+use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
+use Rector\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector;
+use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
+use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
+use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
+use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
+
+/**
+ * How to run:
+ *
+ * ```bash
+ * composer require rector/rector --dev
+ * ./vendor/bin/rector process
+ * ```
+ */
+return RectorConfig::configure()
+    ->withAutoloadPaths([
+        file_exists(__DIR__ . '/../../autoload.php') ? __DIR__ . '/../../autoload.php' : null,
+        file_exists(__DIR__ . '/vendor/autoload.php') ? __DIR__ . '/vendor/autoload.php' : null,
+    ])
+    ->withCache(__DIR__ . '/../../../runtime/cache/rector', FileCacheStorage::class)
+    ->withPreparedSets(deadCode: true, codeQuality: true)
+    ->withPhpSets(php83: true, php84: true)
+    ->withPhpVersion(\Rector\ValueObject\PhpVersion::PHP_84)
+    ->withoutParallel()
+    ->withPaths([
+        __DIR__ . '/src',
+    ])
+    ->withRules([
+        RemoveAlwaysElseRector::class,
+        ChangeNestedIfsToEarlyReturnRector::class,
+        ChangeIfElseValueAssignToEarlyReturnRector::class,
+        ChangeNestedForeachIfsToEarlyContinueRector::class,
+    ])
+    ->withSkip([
+        // Too many places where json_decode was used intentionally on wrong data =\
+        JsonThrowOnErrorRector::class,
+
+        // Frequently used for debug. Maybe, such places should be annotated with @noRector?
+        SimplifyUselessVariableRector::class,
+
+        // Legacy modules are full of `_doSomeShit()` methods that are likely called as `$this->_do{$operation}`
+        RemoveUnusedPrivateMethodRector::class,
+
+        // Does not make sense for us
+        SimplifyRegexPatternRector::class,
+
+        // Requires whole project autoloaded to work well
+        RemoveUnusedPrivateClassConstantRector::class,
+
+        // don't refactor with `empty` check function
+        DisallowedEmptyRuleFixerRector::class,
+        SimplifyEmptyArrayCheckRector::class,
+        SimplifyEmptyCheckOnEmptyArrayRector::class,
+
+        // do not refactor `query` attribute like " . '$select' . " to 'SELECT $select ...'
+        JoinStringConcatRector::class,
+
+        // do not refactor php version id checkers
+        RemovePhpVersionIdCheckRector::class,
+        RemoveExtraParametersRector::class,
+
+        SwitchNegatedTernaryRector::class,
+    ]);

src/EntityInterface.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing;
 
 /**

src/Exception/CannotReassignException.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\Exception;
 
 use Exception;

src/Exception/EntityNotFoundException.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\Exception;
 
 use hiqdev\php\billing\ExceptionInterface;

src/Exception/NotSupportedException.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\Exception;
 
 use Exception;

src/Exception/UnknownEntityException.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\Exception;
 
 use hiqdev\php\billing\ExceptionInterface;

src/ExceptionInterface.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing;
 
 /**

src/Money/MultipliedMoney.php

@@ -35,7 +35,6 @@ private function __construct(
 
     /**
      * @param numeric-string $amount
-     * @param string $currencyCode
      */
     public static function create(string $amount, string $currencyCode): MultipliedMoney
     {
@@ -87,7 +86,7 @@ private static function calculateMultiplierToInteger(string $amount): int
         }
 
         [, $fraction] = explode('.', $amount, 2);
-        return (int)('1' . implode(array_fill(0, strlen($fraction), 0)));
+        return (int)('1' . implode('', array_fill(0, strlen($fraction), 0)));
     }
 
     /**

src/action/AbstractAction.php

@@ -28,9 +28,6 @@
  */
 abstract class AbstractAction implements \JsonSerializable, ActionInterface
 {
-    /** @var int */
-    protected $id;
-
     /** @var TypeInterface */
     protected $type;
 
@@ -55,25 +52,21 @@
     /** @var ActionInterface */
     protected $parent;
 
-    protected float $fractionOfMonth = 0.0;
-
     /**
-     * @param SaleInterface $sale
-     * @param ActionInterface $parent
+     * @param int $id
      */
     public function __construct(
-        $id,
+        protected $id,
         TypeInterface $type,
         TargetInterface $target,
         QuantityInterface $quantity,
         CustomerInterface $customer,
         DateTimeImmutable $time,
-        SaleInterface $sale = null,
-        ActionState $state = null,
-        ActionInterface $parent = null,
-        float $fractionOfMonth = 0.0
+        ?SaleInterface $sale = null,
+        ?ActionState $state = null,
+        ?ActionInterface $parent = null,
+        protected float $fractionOfMonth = 0.0
     ) {
-        $this->id       = $id;
         $this->type     = $type;
         $this->target   = $target;
         $this->quantity = $quantity;
@@ -82,14 +75,13 @@
         $this->sale     = $sale;
         $this->state    = $state;
         $this->parent   = $parent;
-        $this->fractionOfMonth = $fractionOfMonth;
     }
 
     /**
      * Provides unique string.
      * Can be used to compare or aggregate actions.
      */
     public function getUniqueString(): string
     {
         $parts = [
             'buyer'     => $this->customer->getUniqueId(),
@@ -157,7 +149,7 @@
         return $this->time;
     }
 
     public function setTime(DateTimeImmutable $time)
     {
         $this->time = $time;
     }
@@ -167,7 +159,7 @@
         return $this->state;
     }
 
     public function setFinished(): void
     {
         $this->state = ActionState::finished();
     }
@@ -188,7 +180,7 @@
     /**
      * {@inheritdoc}
      */
     public function hasParent()
     {
         return $this->parent !== null;
     }
@@ -198,7 +190,7 @@
         return $this->id !== null;
     }
 
     public function setId($id)
     {
         if ((string) $this->id === (string) $id) {
             return;

src/action/Action.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\action;
 
 use hiqdev\php\billing\price\PriceInterface;

src/action/ActionCreationDto.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\action;
 
 /**

src/action/ActionFactoryInterface.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\action;
 
 /**
@@ -21,5 +23,5 @@
      * Creates action object.
      * @return Action
      */
     public function create(ActionCreationDto $dto);
 }

src/action/ActionInterface.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\action;
 
 use DateTimeImmutable;
@@ -73,7 +75,7 @@
      */
     public function isFinished(): ?bool;
 
     public function getParent(): ?ActionInterface;
 
     public function getState(): ?ActionState;
 

src/action/ActionState.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\action;
 
 /**

src/action/TemporaryAction.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\action;
 
 use hiqdev\php\billing\customer\CustomerInterface;

src/action/TemporaryActionInterface.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * PHP Billing Library
  *
@@ -7,7 +10,6 @@
  * @license   BSD-3-Clause
  * @copyright Copyright (c) 2017-2020, HiQDev (http://hiqdev.com/)
  */
-
 namespace hiqdev\php\billing\action;
 
 /**