Make Type implementations nullable (#1357)

flow-php · Jan 12, 2025 · 17837ca · 17837ca
1 parent 81cdf31
commit 17837ca
Show file tree

Hide file tree

Showing 39 changed files with 41 additions and 41 deletions.
diff --git a/src/core/etl/src/Flow/ETL/Function/Count.php b/src/core/etl/src/Flow/ETL/Function/Count.php
@@ -54,7 +54,7 @@ public function over(Window $window) : WindowFunction
     }
 
     /**
-     * @return Entry<?int, int>
+     * @return Entry<?int, ?int>
      */
     public function result() : Entry
     {

diff --git a/src/core/etl/src/Flow/ETL/Function/Max.php b/src/core/etl/src/Flow/ETL/Function/Max.php
@@ -43,7 +43,7 @@ public function aggregate(Row $row) : void
     }
 
     /**
-     * @return Entry<?\DateTimeInterface, \DateTimeInterface>|Entry<?float, float>|Entry<?int, int>
+     * @return Entry<?\DateTimeInterface, ?\DateTimeInterface>|Entry<?float, ?float>|Entry<?int, ?int>
      */
     public function result() : Entry
     {

diff --git a/src/core/etl/src/Flow/ETL/Function/Min.php b/src/core/etl/src/Flow/ETL/Function/Min.php
@@ -43,7 +43,7 @@ public function aggregate(Row $row) : void
     }
 
     /**
-     * @return Entry<?\DateTimeInterface, \DateTimeInterface>|Entry<?float, float>|Entry<?int, int>
+     * @return Entry<?\DateTimeInterface, ?\DateTimeInterface>|Entry<?float, ?float>|Entry<?int, ?int>
      */
     public function result() : Entry
     {

diff --git a/src/core/etl/src/Flow/ETL/Function/Sum.php b/src/core/etl/src/Flow/ETL/Function/Sum.php
@@ -59,7 +59,7 @@ public function over(Window $window) : WindowFunction
     }
 
     /**
-     * @return Entry<?float, float>|Entry<?int,int>
+     * @return Entry<?float, ?float>|Entry<?int,?int>
      */
     public function result() : Entry
     {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/DateTimeType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/DateTimeType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<\DateTimeInterface>
+ * @implements Type<?\DateTimeInterface>
  */
 final readonly class DateTimeType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/DateType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/DateType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<\DateTimeInterface>
+ * @implements Type<?\DateTimeInterface>
  */
 final readonly class DateType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/JsonType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/JsonType.php
@@ -10,7 +10,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<string>
+ * @implements Type<?string>
  */
 final readonly class JsonType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/ListType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/ListType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\{Type, TypeFactory};
 
 /**
- * @implements Type<list<mixed>>
+ * @implements Type<?list<mixed>>
  */
 final readonly class ListType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/MapType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/MapType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\{Type, TypeFactory};
 
 /**
- * @implements Type<array<array-key, mixed>>
+ * @implements Type<?array<array-key, mixed>>
  */
 final readonly class MapType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/StructureType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/StructureType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\{Type, TypeFactory};
 
 /**
- * @implements Type<array<string, mixed>>
+ * @implements Type<?array<string, mixed>>
  */
 final readonly class StructureType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/TimeType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/TimeType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<\DateInterval>
+ * @implements Type<?\DateInterval>
  */
 final readonly class TimeType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/UuidType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/UuidType.php
@@ -10,7 +10,7 @@
 use Flow\ETL\PHP\Value\Uuid;
 
 /**
- * @implements Type<Uuid>
+ * @implements Type<?Uuid>
  */
 final readonly class UuidType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/XMLElementType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/XMLElementType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<\DOMElement>
+ * @implements Type<?\DOMElement>
  */
 final readonly class XMLElementType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Logical/XMLType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Logical/XMLType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<\DOMDocument>
+ * @implements Type<?\DOMDocument>
  */
 final readonly class XMLType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/ArrayType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/ArrayType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<array>
+ * @implements Type<?array>
  */
 final readonly class ArrayType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/BooleanType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/BooleanType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<boolean>
+ * @implements Type<?boolean>
  */
 final readonly class BooleanType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/CallableType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/CallableType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<callable>
+ * @implements Type<?callable>
  */
 final readonly class CallableType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/EnumType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/EnumType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<\UnitEnum>
+ * @implements Type<?\UnitEnum>
  */
 final readonly class EnumType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/FloatType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/FloatType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<float>
+ * @implements Type<?float>
  */
 final readonly class FloatType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/IntegerType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/IntegerType.php
@@ -9,7 +9,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<integer>
+ * @implements Type<?integer>
  */
 final readonly class IntegerType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/ObjectType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/ObjectType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<object>
+ * @implements Type<?object>
  */
 final readonly class ObjectType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/ResourceType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/ResourceType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<resource>
+ * @implements Type<?resource>
  */
 final readonly class ResourceType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Native/StringType.php b/src/core/etl/src/Flow/ETL/PHP/Type/Native/StringType.php
@@ -8,7 +8,7 @@
 use Flow\ETL\PHP\Type\Type;
 
 /**
- * @implements Type<string>
+ * @implements Type<?string>
  */
 final readonly class StringType implements Type
 {

diff --git a/src/core/etl/src/Flow/ETL/PHP/Type/Type.php b/src/core/etl/src/Flow/ETL/PHP/Type/Type.php
@@ -5,12 +5,12 @@
 namespace Flow\ETL\PHP\Type;
 
 /**
- * @template-covariant  TType
+ * @template-covariant T of mixed
  */
 interface Type
 {
     /**
-     * @return Type<TType>
+     * @return Type<T>
      */
     public static function fromArray(array $data) : self;
 
@@ -27,7 +27,7 @@ public function isEqual(self $type) : bool;
     public function isValid(mixed $value) : bool;
 
     /**
-     * @return Type<TType>
+     * @return Type<T>
      */
     public function makeNullable(bool $nullable) : self;
 

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/BooleanEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/BooleanEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?bool, bool>
+ * @implements Entry<?bool, ?bool>
  */
 final class BooleanEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/DateEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/DateEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?\DateTimeInterface, \DateTimeInterface>
+ * @implements Entry<?\DateTimeInterface, ?\DateTimeInterface>
  */
 final class DateEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/DateTimeEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/DateTimeEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?\DateTimeInterface, \DateTimeInterface>
+ * @implements Entry<?\DateTimeInterface, ?\DateTimeInterface>
  */
 final class DateTimeEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/EnumEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/EnumEntry.php
@@ -10,7 +10,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?\UnitEnum, \UnitEnum>
+ * @implements Entry<?\UnitEnum, ?\UnitEnum>
  */
 final class EnumEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/FloatEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/FloatEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?float, float>
+ * @implements Entry<?float, ?float>
  */
 final class FloatEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/IntegerEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/IntegerEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?int, int>
+ * @implements Entry<?int, ?int>
  */
 final class IntegerEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/JsonEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/JsonEntry.php
@@ -13,7 +13,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?array<mixed>, string>
+ * @implements Entry<?array<mixed>, ?string>
  */
 final class JsonEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/ListEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/ListEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?list<mixed>, list<mixed>>
+ * @implements Entry<?list<mixed>, ?list<mixed>>
  */
 final class ListEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/MapEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/MapEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?array<array-key, mixed>, array<array-key, mixed>>
+ * @implements Entry<?array<array-key, mixed>, ?array<array-key, mixed>>
  */
 final class MapEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/StringEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/StringEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference, Schema\Metadata};
 
 /**
- * @implements Entry<?string, string>
+ * @implements Entry<?string, ?string>
  */
 final class StringEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/StructureEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/StructureEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?array<string, mixed>, array<string, mixed>>
+ * @implements Entry<?array<string, mixed>, ?array<string, mixed>>
  */
 final class StructureEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/TimeEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/TimeEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?\DateInterval, \DateInterval>
+ * @implements Entry<?\DateInterval, ?\DateInterval>
  */
 final class TimeEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/UuidEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/UuidEntry.php
@@ -13,7 +13,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?Uuid, Uuid>
+ * @implements Entry<?Uuid, ?Uuid>
  */
 final class UuidEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/XMLElementEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/XMLElementEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?\DOMElement, \DOMElement>
+ * @implements Entry<?\DOMElement, ?\DOMElement>
  */
 final class XMLElementEntry implements Entry
 {

diff --git a/src/core/etl/src/Flow/ETL/Row/Entry/XMLEntry.php b/src/core/etl/src/Flow/ETL/Row/Entry/XMLEntry.php
@@ -12,7 +12,7 @@
 use Flow\ETL\Row\{Entry, Reference};
 
 /**
- * @implements Entry<?\DOMDocument, \DOMDocument>
+ * @implements Entry<?\DOMDocument, ?\DOMDocument>
  */
 final class XMLEntry implements Entry
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ public function over(Window $window) : WindowFunction @@
         }
         /**
-         * @return Entry<?int, int>
+         * @return Entry<?int, ?int>
          */
         public function result() : Entry
         {
@@ Expand Down @@