HP-2496: fixing psalm

Author: VadymHrechukha

src/product/behavior/BehaviorRegistry.php

@@ -4,24 +4,13 @@
 
 namespace hiqdev\php\billing\product\behavior;
 
-use hiqdev\php\billing\product\price\PriceTypeDefinitionInterface;
-use hiqdev\php\billing\product\TariffTypeDefinitionInterface;
 use hiqdev\php\billing\product\trait\HasLockInterface;
 
-/**
- * @template-covariant TParentCollection of PriceTypeDefinitionInterface|TariffTypeDefinitionInterface
- * @implements HasBehaviorsInterface<TParentCollection>
- */
 abstract class BehaviorRegistry implements HasLockInterface, HasBehaviorsInterface
 {
-    /**
-     * @return BehaviorCollectionInterface<TParentCollection>
-     */
-    abstract protected function getBehaviorCollection(): BehaviorCollectionInterface;
-
     public function hasBehavior(string $behaviorClassName): bool
     {
-        foreach ($this->getBehaviorCollection() as $behavior) {
+        foreach ($this->withBehaviors() as $behavior) {
             if ($behavior instanceof $behaviorClassName) {
                 return true;
             }
@@ -32,7 +21,7 @@ public function hasBehavior(string $behaviorClassName): bool
 
     public function findBehaviorByClass(string $class)
     {
-        foreach ($this->getBehaviorCollection() as $behavior) {
+        foreach ($this->withBehaviors() as $behavior) {
             if ($behavior instanceof $class) {
                 return $behavior;
             }
@@ -43,6 +32,6 @@ public function findBehaviorByClass(string $class)
 
     public function lock(): void
     {
-        $this->getBehaviorCollection()->lock();
+        $this->withBehaviors()->lock();
     }
 }

src/product/behavior/PriceTypeBehaviorRegistry.php

@@ -8,25 +8,25 @@
 use hiqdev\php\billing\product\price\PriceTypeDefinitionInterface;
 
 /**
- * @extends BehaviorRegistry<PriceTypeDefinitionInterface>
+ * @template-covariant T of PriceTypeDefinitionInterface
  */
 final class PriceTypeBehaviorRegistry extends BehaviorRegistry
 {
     /**
-     * @var BehaviorPriceTypeDefinitionCollection<PriceTypeDefinitionInterface>
+     * @var BehaviorPriceTypeDefinitionCollection<T>
      */
     private BehaviorPriceTypeDefinitionCollection $behaviorCollection;
 
     /**
-     * @psalm-param PriceTypeDefinitionInterface $priceTypeDefinition
+     * @psalm-param T $priceTypeDefinition
      */
     public function __construct(PriceTypeDefinitionInterface $priceTypeDefinition, TariffTypeInterface $tariffType)
     {
         $this->behaviorCollection = new BehaviorPriceTypeDefinitionCollection($priceTypeDefinition, $tariffType);
     }
 
     /**
-     * @return BehaviorPriceTypeDefinitionCollection<PriceTypeDefinitionInterface>
+     * @return BehaviorPriceTypeDefinitionCollection<T>
      */
     public function withBehaviors(): BehaviorPriceTypeDefinitionCollection
     {

src/product/behavior/TariffTypeBehaviorRegistry.php

@@ -24,25 +24,25 @@
  *  - To separate concerns by handling behavior-related logic in a dedicated class.
  *  - To improve maintainability and testability of tariff behavior handling.
  *
- * @extends BehaviorRegistry<TariffTypeDefinitionInterface>
+ * @template-covariant T of TariffTypeDefinitionInterface
  */
 final class TariffTypeBehaviorRegistry extends BehaviorRegistry
 {
     /**
-     * @var BehaviorTariffTypeCollection<TariffTypeDefinitionInterface>
+     * @var BehaviorTariffTypeCollection<T>
      */
     private BehaviorTariffTypeCollection $behaviorCollection;
 
     /**
-     * @psalm-param TariffTypeDefinitionInterface $tariffTypeDefinition
+     * @psalm-param T $tariffTypeDefinition
      */
     public function __construct(TariffTypeDefinitionInterface $tariffTypeDefinition, TariffTypeInterface $tariffType)
     {
         $this->behaviorCollection = new BehaviorTariffTypeCollection($tariffTypeDefinition, $tariffType);
     }
 
     /**
-     * @return BehaviorTariffTypeCollection<TariffTypeDefinitionInterface>
+     * @return BehaviorTariffTypeCollection<T>
      */
     public function withBehaviors(): BehaviorTariffTypeCollection
     {