fix: handle enum db columns correctly

larastan · Dec 23, 2022 · f4ffec0 · f4ffec0
1 parent 2e4317c
commit f4ffec0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/Properties/ModelPropertyExtension.php b/src/Properties/ModelPropertyExtension.php
@@ -143,32 +143,40 @@ public function getProperty(
 
         if ($this->hasDate($modelInstance, $propertyName)) {
             $readableType = $this->modelCastHelper->getDateType();
-            $writeableType = TypeCombinator::union($this->modelCastHelper->getDateType(), new StringType());
+            $writableType = TypeCombinator::union($this->modelCastHelper->getDateType(), new StringType());
         } elseif ($modelInstance->hasCast($propertyName)) {
             $cast = $modelInstance->getCasts()[$propertyName];
 
             $readableType = $this->modelCastHelper->getReadableType(
                 $cast,
                 $this->stringResolver->resolve($column->readableType),
             );
-            $writeableType = $this->modelCastHelper->getWriteableType(
+            $writableType = $this->modelCastHelper->getWriteableType(
                 $cast,
                 $this->stringResolver->resolve($column->writeableType),
             );
         } else {
-            $readableType = $this->stringResolver->resolve($column->readableType);
-            $writeableType = $this->stringResolver->resolve($column->writeableType);
+            if (in_array($column->readableType, ['enum', 'set'], true)) {
+                if ($column->options === null || count($column->options) < 1) {
+                    $readableType = $writableType = new StringType();
+                } else {
+                    $readableType = $writableType = $this->stringResolver->resolve('\''.implode('\'|\'', $column->options).'\'');
+                }
+            } else {
+                $readableType = $this->stringResolver->resolve($column->readableType);
+                $writableType = $this->stringResolver->resolve($column->writeableType);
+            }
         }
 
         if ($column->nullable) {
             $readableType = TypeCombinator::addNull($readableType);
-            $writeableType = TypeCombinator::addNull($writeableType);
+            $writableType = TypeCombinator::addNull($writableType);
         }
 
         return new ModelProperty(
             $classReflection,
             $readableType,
-            $writeableType,
+            $writableType,
         );
     }
 

diff --git a/tests/Application/database/migrations/2020_01_30_000000_create_users_table.php b/tests/Application/database/migrations/2020_01_30_000000_create_users_table.php
@@ -31,6 +31,7 @@ public function up(): void
             $table->boolean('blocked');
             $table->unknownColumnType('unknown_column');
             $table->rememberToken();
+            $table->enum('enum_status', ['active', 'inactive']);
 
             // Testing property casts
             $table->integer('int');

diff --git a/tests/Type/data/model-properties.php b/tests/Type/data/model-properties.php
@@ -34,6 +34,7 @@
 assertType(CarbonImmutable::class, $user->immutable_date);
 assertType(CarbonImmutable::class, $user->immutable_datetime);
 assertType('int', $user->timestamp);
+assertType('\'active\'|\'inactive\'', $user->enum_status);
 
 // CastsAttributes
 assertType('App\ValueObjects\Favorites', $user->favorites);