wip

Author: iamgergo

src/Http/Controllers/Auth/LoginController.php

@@ -59,7 +59,7 @@ public function login(Request $request): RedirectResponse
 
         if ($request->user()->can('viewRoot') && $request->user()->shouldTwoFactorAuthenticate($request)) {
             $request->user()->notify(
-                new AuthCodeNotification($request->user()->generateAuthCode())
+                new AuthCodeNotification($request->user()->authCodes()->create())
             );
 
             $request->session()->flash('status', __('The two factor authentication link has been sent!'));

src/Http/Controllers/Auth/TwoFactorController.php

@@ -79,7 +79,7 @@ public function verify(Request $request): RedirectResponse
      */
     public function resend(Request $request): RedirectResponse
     {
-        $code = $request->user()->generateAuthCode();
+        $code = $request->user()->authCodes()->create();
 
         $request->user()->notify(new AuthCodeNotification($code));
 

src/Jobs/MoveFile.php

@@ -22,21 +22,6 @@ class MoveFile implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    /**
-     * The medium instance.
-     */
-    public Medium $medium;
-
-    /**
-     * The path to the file.
-     */
-    public string $path;
-
-    /**
-     * Indicates if the original file should be preserved.
-     */
-    public bool $preserve = true;
-
     /**
      * Delete the job if its models no longer exist.
      *
@@ -47,11 +32,12 @@ class MoveFile implements ShouldQueue
     /**
      * Create a new job instance.
      */
-    public function __construct(Medium $medium, string $path, bool $preserve = true)
-    {
-        $this->path = $path;
-        $this->medium = $medium;
-        $this->preserve = $preserve;
+    public function __construct(
+        public readonly Medium $medium,
+        public readonly string $path,
+        public readonly bool $preserve = true
+    ) {
+        //
     }
 
     /**

src/Jobs/PerformConversions.php

@@ -19,11 +19,6 @@ class PerformConversions implements ShouldQueue
     use Queueable;
     use SerializesModels;
 
-    /**
-     * The medium instance.
-     */
-    public Medium $medium;
-
     /**
      * Delete the job if its models no longer exist.
      *
@@ -34,9 +29,9 @@ class PerformConversions implements ShouldQueue
     /**
      * Create a new job instance.
      */
-    public function __construct(Medium $medium)
+    public function __construct(public readonly Medium $medium)
     {
-        $this->medium = $medium;
+        //
     }
 
     /**

src/Models/Attachment.php

@@ -33,4 +33,16 @@ class Attachment extends MorphPivot
      * @var string
      */
     protected $table = 'root_mediables';
+
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array{'meta':'json'}
+     */
+    protected function casts(): array
+    {
+        return [
+            'meta' => 'json',
+        ];
+    }
 }

src/Models/AuthCode.php

@@ -18,16 +18,6 @@ class AuthCode extends Model implements Contract
     use HasFactory;
     use InteractsWithProxy;
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'code' => 'int',
-        'expires_at' => 'datetime',
-    ];
-
     /**
      * The attributes that are mass assignable.
      *
@@ -42,6 +32,30 @@ class AuthCode extends Model implements Contract
      */
     protected $table = 'root_auth_codes';
 
+    /**
+     * Create a new Eloquent model instance.
+     *
+     * @param  array<string, mixed>  $attributes
+     */
+    public function __construct(array $attributes = [])
+    {
+        parent::__construct(
+            array_merge(['code' => static::generate()], $attributes)
+        );
+    }
+
+    /**
+     * Generate a new code.
+     */
+    public static function generate(): string
+    {
+        do {
+            $code = str_pad((string) random_int(0, 999999), 6, '0', STR_PAD_LEFT);
+        } while (preg_match('/(\d)\1{2,}/', $code) === 1);
+
+        return $code;
+    }
+
     /**
      * Get the proxied interface.
      */
@@ -58,6 +72,19 @@ protected static function newFactory(): AuthCodeFactory
         return AuthCodeFactory::new();
     }
 
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array{'code':'int', 'expires_at':'datetime'}
+     */
+    protected function casts(): array
+    {
+        return [
+            'code' => 'int',
+            'expires_at' => 'datetime',
+        ];
+    }
+
     /**
      * Get the user for the model.
      */

src/Models/Event.php

@@ -17,15 +17,6 @@ class Event extends Model implements Contract
     use HasFactory;
     use InteractsWithProxy;
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'payload' => 'json',
-    ];
-
     /**
      * The attributes that are mass assignable.
      *
@@ -59,6 +50,18 @@ protected static function newFactory(): EventFactory
         return EventFactory::new();
     }
 
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array{'payload':'json'}
+     */
+    protected function casts(): array
+    {
+        return [
+            'payload' => 'json',
+        ];
+    }
+
     /**
      * Get the event target.
      */

src/Models/Medium.php

@@ -13,6 +13,7 @@
 use Cone\Root\Support\Facades\Conversion;
 use Cone\Root\Traits\Filterable;
 use Cone\Root\Traits\InteractsWithProxy;
+use Illuminate\Database\Eloquent\Attributes\Scope;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
@@ -55,15 +56,6 @@ class Medium extends Model implements Contract
         'properties' => '{"conversions":[]}',
     ];
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'properties' => 'json',
-    ];
-
     /**
      * The attributes that are mass assignable.
      *
@@ -166,6 +158,18 @@ public static function fromPath(string $path, array $attributes = []): static
         ], $attributes));
     }
 
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array{'properties':'json'}
+     */
+    protected function casts(): array
+    {
+        return [
+            'properties' => 'json',
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -313,7 +317,8 @@ public function download(?string $conversion = null): BinaryFileResponse
     /**
      * Scope the query only to the given search term.
      */
-    public function scopeSearch(Builder $query, ?string $value = null): Builder
+    #[Scope]
+    protected function search(Builder $query, string $value): Builder
     {
         if (is_null($value)) {
             return $query;
@@ -325,7 +330,8 @@ public function scopeSearch(Builder $query, ?string $value = null): Builder
     /**
      * Scope the query only to the given type.
      */
-    public function scopeType(Builder $query, string $value): Builder
+    #[Scope]
+    protected function type(Builder $query, string $value): Builder
     {
         return match ($value) {
             'image' => $query->where($query->qualifyColumn('mime_type'), 'like', 'image%'),

src/Models/Meta.php

@@ -17,15 +17,6 @@ class Meta extends Model implements Contract
     use HasFactory;
     use InteractsWithProxy;
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'value' => MetaValue::class,
-    ];
-
     /**
      * The attributes that are mass assignable.
      *
@@ -59,6 +50,18 @@ protected static function newFactory(): MetaFactory
         return MetaFactory::new();
     }
 
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array{'value':'\Cone\Root\Casts\MetaValue'}
+     */
+    protected function casts(): array
+    {
+        return [
+            'value' => MetaValue::class,
+        ];
+    }
+
     /**
      * {@inheritdoc}
      */

src/Models/Translation.php

@@ -17,15 +17,6 @@ class Translation extends Model implements Contract
     use HasFactory;
     use InteractsWithProxy;
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'values' => AsArrayObject::class,
-    ];
-
     /**
      * The attributes that are mass assignable.
      *
@@ -80,6 +71,18 @@ public static function getTranslatableLocale(): string
         return static::$translatableLocale;
     }
 
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array{'values':'\Illuminate\Database\Eloquent\Casts\AsArrayObject'}
+     */
+    protected function casts(): array
+    {
+        return [
+            'values' => AsArrayObject::class,
+        ];
+    }
+
     /**
      * Get the translatable model for the translation.
      */