feat: support for encrypted and parameterized casts (#1439)

larastan · Nov 6, 2022 · 055d689 · 055d689
1 parent 333e791
commit 055d689
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - feat: Added stub for the DB::transaction method by @jdjfisher
 - feat: conditional return types for `Eloquent\Collection::find()` by @sebdesign
 - feat: add support for generic paginators by @erikgaal
+- feat: add support for encrypted and parameterized eloquent casts by @jdjfisher
 
 ## [2.2.0] - 2022-08-31
 

diff --git a/src/Properties/ModelPropertyExtension.php b/src/Properties/ModelPropertyExtension.php
@@ -232,12 +232,21 @@ private function castPropertiesType(Model $modelInstance): void
                 continue;
             }
 
+            // Reduce encrypted castable types
+            if (in_array($type, ['encrypted', 'encrypted:array', 'encrypted:collection', 'encrypted:json', 'encrypted:object'], true)) {
+                $type = Str::after($type, 'encrypted:');
+            }
+
+            // Truncate cast parameters
+            $type = Str::before($type, ':');
+
             switch ($type) {
                 case 'boolean':
                 case 'bool':
                     $realType = 'boolean';
                     break;
                 case 'string':
+                case 'decimal':
                     $realType = 'string';
                     break;
                 case 'array':

diff --git a/tests/Application/app/User.php b/tests/Application/app/User.php
@@ -46,6 +46,8 @@ class User extends Authenticatable
         'meta' => 'array',
         'blocked' => 'boolean',
         'email_verified_at' => 'date',
+        'allowed_ips' => 'encrypted:array',
+        'floatButRoundedDecimalString' => 'decimal:1',
         'options' => AsArrayObject::class,
         'properties' => AsCollection::class,
     ];

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
@@ -22,6 +22,8 @@ public function up(): void
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->string('stringButInt');
+            $table->float('floatButRoundedDecimalString');
+            $table->json('allowed_ips');
             $table->json('meta');
             $table->json('options');
             $table->json('properties');

diff --git a/tests/Features/Properties/ModelPropertyExtension.php b/tests/Features/Properties/ModelPropertyExtension.php
@@ -158,6 +158,17 @@ public function testNullablePropertyWithCast(User $user): void
         $user->email_verified_at = null;
     }
 
+    /** @return array<string> */
+    public function testEncryptedArrayCast(User $user): array
+    {
+        return $user->allowed_ips;
+    }
+
+    public function testPrecisionDecimalCast(User $user): string
+    {
+        return $user->floatButRoundedDecimalString;
+    }
+
     /** @return ArrayObject<array-key, mixed> */
     public function testAsArrayObjectCast(User $user): ArrayObject
     {

diff --git a/tests/Type/data/model-properties.php b/tests/Type/data/model-properties.php
@@ -9,3 +9,5 @@
 assertType('int', $user->newStyleAttribute);
 assertType('int', $user->stringButInt);
 assertType('string', $user->email);
+assertType('array', $user->allowed_ips);
+assertType('string', $user->floatButRoundedDecimalString);