Add RangeValueInterface

Author: Tigrov

src/Column/AbstractMultiRangeColumn.php

@@ -7,6 +7,7 @@
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\ExpressionInterface;
 use Yiisoft\Db\Pgsql\Expression\MultiRangeValue;
+use Yiisoft\Db\Pgsql\Expression\RangeValueInterface;
 use Yiisoft\Db\Schema\Column\AbstractColumn;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 
@@ -15,7 +16,7 @@
 use function is_string;
 
 /**
- * @template T of ExpressionInterface
+ * @template T of RangeValueInterface
  */
 abstract class AbstractMultiRangeColumn extends AbstractColumn
 {
@@ -53,7 +54,7 @@ public function dbTypecast(mixed $value): mixed
     /**
      * @inheritDoc
      *
-     * @return ?ExpressionInterface[]
+     * @return ?RangeValueInterface[]
      *
      * @psalm-return ?T[]
      */

src/Column/AbstractRangeColumn.php

@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Expression\ExpressionInterface;
+use Yiisoft\Db\Pgsql\Expression\RangeValueInterface;
 use Yiisoft\Db\Schema\Column\AbstractColumn;
 use Yiisoft\Db\Schema\Column\ColumnInterface;
 
@@ -16,7 +17,7 @@
 use function sprintf;
 
 /**
- * @template T of ExpressionInterface
+ * @template T of RangeValueInterface
  */
 abstract class AbstractRangeColumn extends AbstractColumn
 {
@@ -56,7 +57,7 @@ public function dbTypecast(mixed $value): mixed
     /**
      * @inheritDoc
      *
-     * @return ?ExpressionInterface
+     * @return ?RangeValueInterface
      *
      * @psalm-return ?T
      */
@@ -88,6 +89,8 @@ abstract protected function getBoundColumn(): ColumnInterface;
     /**
      * @throws NotSupportedException
      *
+     * @return RangeValueInterface
+     *
      * @psalm-return T
      */
     abstract protected function createRangeValue(

src/Expression/DateRangeValue.php

@@ -5,9 +5,11 @@
 namespace Yiisoft\Db\Pgsql\Expression;
 
 use DateTimeImmutable;
-use Yiisoft\Db\Expression\ExpressionInterface;
 
-final class DateRangeValue implements ExpressionInterface
+/**
+ * @implements RangeValueInterface<DateTimeImmutable>
+ */
+final class DateRangeValue implements RangeValueInterface
 {
     public function __construct(
         public readonly ?DateTimeImmutable $lower = null,

src/Expression/Int4RangeValue.php

@@ -4,9 +4,10 @@
 
 namespace Yiisoft\Db\Pgsql\Expression;
 
-use Yiisoft\Db\Expression\ExpressionInterface;
-
-final class Int4RangeValue implements ExpressionInterface
+/**
+ * @implements RangeValueInterface<int>
+ */
+final class Int4RangeValue implements RangeValueInterface
 {
     public function __construct(
         public readonly ?int $lower = null,

src/Expression/Int8RangeValue.php

@@ -4,13 +4,15 @@
 
 namespace Yiisoft\Db\Pgsql\Expression;
 
-use Yiisoft\Db\Expression\ExpressionInterface;
 use InvalidArgumentException;
 
 use const PHP_INT_MAX;
 use const PHP_INT_MIN;
 
-final class Int8RangeValue implements ExpressionInterface
+/**
+ * @implements RangeValueInterface<int|string>
+ */
+final class Int8RangeValue implements RangeValueInterface
 {
     public function __construct(
         public readonly int|string|null $lower = null,

src/Expression/NumRangeValue.php

@@ -4,10 +4,12 @@
 
 namespace Yiisoft\Db\Pgsql\Expression;
 
-use Yiisoft\Db\Expression\ExpressionInterface;
 use RuntimeException;
 
-final class NumRangeValue implements ExpressionInterface
+/**
+ * @implements RangeValueInterface<int|float>
+ */
+final class NumRangeValue implements RangeValueInterface
 {
     public function __construct(
         public readonly int|float|null $lower = null,

src/Expression/RangeValueInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql\Expression;
+
+use Yiisoft\Db\Expression\ExpressionInterface;
+
+/**
+ * @template T
+ */
+interface RangeValueInterface extends ExpressionInterface
+{
+    /**
+     * Returns the lower and upper bounds of a range, inclusive.
+     *
+     * @psalm-return array{0: ?T, 1: ?T}
+     */
+    public function getBounds(): array;
+}

src/Expression/TsRangeValue.php

@@ -5,9 +5,11 @@
 namespace Yiisoft\Db\Pgsql\Expression;
 
 use DateTimeImmutable;
-use Yiisoft\Db\Expression\ExpressionInterface;
 
-final class TsRangeValue implements ExpressionInterface
+/**
+ * @implements RangeValueInterface<DateTimeImmutable>
+ */
+final class TsRangeValue implements RangeValueInterface
 {
     public function __construct(
         public readonly ?DateTimeImmutable $lower = null,

src/Expression/TsTzRangeValue.php

@@ -5,9 +5,11 @@
 namespace Yiisoft\Db\Pgsql\Expression;
 
 use DateTimeImmutable;
-use Yiisoft\Db\Expression\ExpressionInterface;
 
-final class TsTzRangeValue implements ExpressionInterface
+/**
+ * @implements RangeValueInterface<DateTimeImmutable>
+ */
+final class TsTzRangeValue implements RangeValueInterface
 {
     public function __construct(
         public readonly ?DateTimeImmutable $lower = null,