[L6] Update composer dependencies to support L6

DaneEveritt · DaneEveritt · commit 08bdc9705fa6 · 2019-09-04T21:00:34.000-07:00
Drops all of the eloquence requirements, this is going to break a shit load of code, needs to happen tired of this package always holding us back.

Quite confident in my ability to write custom code to do the basic validation we need.

Searching should be a fun nightmare to deal with later...
diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Allocation extends Model implements CleansAttributes, ValidableContract
+class Allocation extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php
@@ -2,17 +2,10 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class ApiKey extends Model implements CleansAttributes, ValidableContract
+class ApiKey extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * Different API keys that can exist on the system.
      */
diff --git a/app/Models/DaemonKey.php b/app/Models/DaemonKey.php
@@ -2,16 +2,11 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
 use Znck\Eloquent\Traits\BelongsToThrough;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class DaemonKey extends Model implements CleansAttributes, ValidableContract
+class DaemonKey extends Validable
 {
-    use BelongsToThrough, Eloquence, Validable;
+    use BelongsToThrough;
 
     /**
      * @var string
diff --git a/app/Models/Database.php b/app/Models/Database.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Database extends Model implements CleansAttributes, ValidableContract
+class Database extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/DatabaseHost.php b/app/Models/DatabaseHost.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class DatabaseHost extends Model implements CleansAttributes, ValidableContract
+class DatabaseHost extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/Egg.php b/app/Models/Egg.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Egg extends Model implements CleansAttributes, ValidableContract
+class Egg extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/EggVariable.php b/app/Models/EggVariable.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class EggVariable extends Model implements CleansAttributes, ValidableContract
+class EggVariable extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/Location.php b/app/Models/Location.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Location extends Model implements CleansAttributes, ValidableContract
+class Location extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/Nest.php b/app/Models/Nest.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Nest extends Model implements CleansAttributes, ValidableContract
+class Nest extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/Node.php b/app/Models/Node.php
@@ -2,16 +2,11 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class Node extends Model implements CleansAttributes, ValidableContract
+class Node extends Validable
 {
-    use Eloquence, Notifiable, Validable;
+    use Notifiable;
 
     /**
      * The resource name for this model when it is transformed into an
diff --git a/app/Models/Pack.php b/app/Models/Pack.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Pack extends Model implements CleansAttributes, ValidableContract
+class Pack extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Permission extends Model implements CleansAttributes, ValidableContract
+class Permission extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/Schedule.php b/app/Models/Schedule.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Schedule extends Model implements CleansAttributes, ValidableContract
+class Schedule extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The resource name for this model when it is transformed into an
      * API representation using fractal.
diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -3,13 +3,8 @@
 namespace Pterodactyl\Models;
 
 use Schema;
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
 use Znck\Eloquent\Traits\BelongsToThrough;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
 /**
  * @property int $id
@@ -55,9 +50,9 @@
  * @property \Pterodactyl\Models\DaemonKey $key
  * @property \Pterodactyl\Models\DaemonKey[]|\Illuminate\Support\Collection $keys
  */
-class Server extends Model implements CleansAttributes, ValidableContract
+class Server extends Validable
 {
-    use BelongsToThrough, Eloquence, Notifiable, Validable;
+    use BelongsToThrough, Notifiable;
 
     /**
      * The resource name for this model when it is transformed into an
diff --git a/app/Models/Session.php b/app/Models/Session.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Models;
 
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
@@ -2,16 +2,8 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
-
-class Setting extends Model implements CleansAttributes, ValidableContract
+class Setting extends Validable
 {
-    use Eloquence, Validable;
-
     /**
      * The table associated with the model.
      *
diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php
@@ -2,16 +2,11 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class Subuser extends Model implements CleansAttributes, ValidableContract
+class Subuser extends Validable
 {
-    use Eloquence, Notifiable, Validable;
+    use Notifiable;
 
     /**
      * The resource name for this model when it is transformed into an
diff --git a/app/Models/Task.php b/app/Models/Task.php
@@ -2,16 +2,11 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
-use Illuminate\Database\Eloquent\Model;
 use Znck\Eloquent\Traits\BelongsToThrough;
-use Sofa\Eloquence\Contracts\CleansAttributes;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 
-class Task extends Model implements CleansAttributes, ValidableContract
+class Task extends Validable
 {
-    use BelongsToThrough, Eloquence, Validable;
+    use BelongsToThrough;
 
     /**
      * The resource name for this model when it is transformed into an
diff --git a/app/Models/TaskLog.php b/app/Models/TaskLog.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Models;
 
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2,34 +2,25 @@
 
 namespace Pterodactyl\Models;
 
-use Sofa\Eloquence\Eloquence;
-use Sofa\Eloquence\Validable;
 use Pterodactyl\Rules\Username;
 use Illuminate\Support\Collection;
 use Illuminate\Validation\Rules\In;
 use Illuminate\Auth\Authenticatable;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
-use Sofa\Eloquence\Contracts\CleansAttributes;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Pterodactyl\Traits\Helpers\AvailableLanguages;
 use Illuminate\Foundation\Auth\Access\Authorizable;
-use Sofa\Eloquence\Contracts\Validable as ValidableContract;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Pterodactyl\Notifications\SendPasswordReset as ResetPasswordNotification;
 
-class User extends Model implements
+class User extends Validable implements
     AuthenticatableContract,
     AuthorizableContract,
-    CanResetPasswordContract,
-    CleansAttributes,
-    ValidableContract
+    CanResetPasswordContract
 {
-    use Authenticatable, Authorizable, AvailableLanguages, CanResetPassword, Eloquence, Notifiable, Validable {
-        gatherRules as eloquenceGatherRules;
-    }
+    use Authenticatable, Authorizable, AvailableLanguages, CanResetPassword, Notifiable;
 
     const USER_LEVEL_USER = 0;
     const USER_LEVEL_ADMIN = 1;
@@ -171,7 +162,6 @@ class User extends Model implements
      */
     protected static function gatherRules()
     {
-        $rules = self::eloquenceGatherRules();
         $rules['language'][] = new In(array_keys((new self)->getAvailableLanguages()));
         $rules['username'][] = new Username;
 
diff --git a/app/Models/Validable.php b/app/Models/Validable.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
