HP-1631: renamed ActionState::isFinished() into ActionState::isNotActive() and removed ActionState::expired() because it is the same as ActionState::finished()

Author: VadymHrechukha

src/action/AbstractAction.php

@@ -169,9 +169,9 @@ public function setFinished(): void
         $this->state = ActionState::finished();
     }
 
-    public function isFinished(): ?bool
+    public function isNotActive(): ?bool
     {
-        return $this->state === null ? null : $this->state->isFinished();
+        return $this->state === null ? null : $this->state->isNotActive();
     }
 
     /**

src/action/ActionInterface.php

@@ -70,7 +70,7 @@ public function getSale(): ?SaleInterface;
     /**
      * Returns null if the action state is not set.
      */
-    public function isFinished(): ?bool;
+    public function isNotActive(): ?bool;
 
     public function getParent(): ?ActionInterface;
 

src/action/ActionState.php

@@ -27,8 +27,6 @@ class ActionState
 
     private const STATE_CANCELED  = 'canceled';
 
-    private const STATE_EXPIRED   = 'expired';
-
     private function __construct(protected string $state = self::STATE_NEW)
     {
     }
@@ -43,7 +41,7 @@ public function isNew(): bool
         return $this->state === self::STATE_NEW;
     }
 
-    public function isFinished(): bool
+    public function isNotActive(): bool
     {
         return !$this->isNew();
     }
@@ -53,10 +51,6 @@ public static function new(): self
         return new self(self::STATE_NEW);
     }
 
-    /**
-     * @deprecated use ActionState::expired()
-     * @return self
-     */
     public static function finished(): self
     {
         return new self(self::STATE_FINISHED);
@@ -77,11 +71,6 @@ public static function canceled(): self
         return new self(self::STATE_CANCELED);
     }
 
-    public static function expired(): self
-    {
-        return new self(self::STATE_EXPIRED);
-    }
-
     public static function fromString(string $name): self
     {
         $allowedStates = [
@@ -90,7 +79,6 @@ public static function fromString(string $name): self
             self::STATE_PREMATURE,
             self::STATE_FUTURE,
             self::STATE_CANCELED,
-            self::STATE_EXPIRED,
         ];
         foreach ($allowedStates as $state) {
             if ($state === $name) {

src/order/Calculator.php

@@ -106,7 +106,7 @@ public function calculatePrice(PriceInterface $price, ActionInterface $action):
             $charges = [$charge];
         }
 
-        if ($action->isFinished()) {
+        if ($action->isNotActive()) {
             foreach ($charges as $charge) {
                 $charge->setFinished();
             }