Merge pull request #117: Add hints for ULID and snowflake column types

Author: roxblnfk

composer.json

@@ -38,6 +38,7 @@
     ],
     "require": {
         "php": ">=8.1",
+        "cycle/database": "^2.15",
         "cycle/orm": "^2.9.2",
         "cycle/schema-builder": "^2.11.1",
         "spiral/attributes": "^2.8|^3.0",

src/Annotation/Column.php

@@ -51,7 +51,7 @@ public function __construct(
         #[ExpectedValues(values: ['primary', 'bigPrimary', 'enum', 'boolean',
             'integer', 'tinyInteger', 'smallInteger', 'bigInteger', 'string', 'text', 'tinyText', 'longText', 'double',
             'float', 'decimal', 'datetime', 'date', 'time', 'timestamp', 'binary', 'tinyBinary', 'longBinary', 'json',
-            'uuid', 'bit',
+            'snowflake', 'ulid', 'uuid', 'bit',
             // PostgreSQL
             'smallPrimary', 'timetz', 'timestamptz', 'interval', 'bitVarying', 'int4range', 'int8range', 'numrange',
             'tsrange', 'tstzrange', 'daterange', 'jsonb', 'point', 'line', 'lseg', 'box', 'path', 'polygon', 'circle',

tests/Annotated/Fixtures/Fixtures26/City.php

@@ -13,13 +13,13 @@ private function __construct(string $value)
         $this->value = $value;
     }
 
-    public function __toString(): string
+    public static function fromString(string $value): self
     {
-        return $this->value;
+        return new self($value);
     }
 
-    public static function fromString(string $value): self
+    public function __toString(): string
     {
-        return new self($value);
+        return $this->value;
     }
 }

tests/Annotated/Fixtures/Fixtures26/CityTypecast.php

@@ -43,7 +43,7 @@ public function uncast(array $data): array
                 continue;
             }
 
-            $data[$column] = (string)$value;
+            $data[$column] = (string) $value;
         }
 
         return $data;