Singularize model names.

Author: DaneEveritt

app/Http/Controllers/Admin/PackController.php

@@ -49,7 +49,7 @@ public function listAll(Request $request)
     public function listByOption(Request $request, $id)
     {
         return view('admin.services.packs.byoption', [
-            'option' => Models\ServiceOptions::with('service', 'packs')->findOrFail($id),
+            'option' => Models\ServiceOption::with('service', 'packs')->findOrFail($id),
         ]);
     }
 

app/Http/Controllers/Admin/ServersController.php

@@ -152,7 +152,7 @@ public function postNewServerGetIps(Request $request)
      * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Contracts\View\View
      */
-    public function postNewServerServiceOptions(Request $request)
+    public function postNewServerServiceOption(Request $request)
     {
         if (! $request->input('service')) {
             return response()->json([
@@ -162,7 +162,7 @@ public function postNewServerServiceOptions(Request $request)
 
         $service = Models\Service::select('executable', 'startup')->where('id', $request->input('service'))->first();
 
-        return response()->json(Models\ServiceOptions::select('id', 'name', 'docker_image')->where('service_id', $request->input('service'))->orderBy('name', 'asc')->get());
+        return response()->json(Models\ServiceOption::select('id', 'name', 'docker_image')->where('service_id', $request->input('service'))->orderBy('name', 'asc')->get());
     }
 
     /**
@@ -179,7 +179,7 @@ public function postNewServerOptionDetails(Request $request)
             ], 500);
         }
 
-        $option = Models\ServiceOptions::with('variables')->with(['packs' => function ($query) {
+        $option = Models\ServiceOption::with('variables')->with(['packs' => function ($query) {
             $query->where('selectable', true);
         }])->findOrFail($request->input('option'));
 

app/Http/Controllers/Admin/ServiceController.php

@@ -124,7 +124,7 @@ public function deleteService(Request $request, $service)
 
     public function getOption(Request $request, $service, $option)
     {
-        $option = Models\ServiceOptions::with('service', 'variables')->findOrFail($option);
+        $option = Models\ServiceOption::with('service', 'variables')->findOrFail($option);
         $option->setRelation('servers', $option->servers()->with('user')->paginate(25));
 
         return view('admin.services.options.view', ['option' => $option]);
@@ -205,7 +205,7 @@ public function postOptionVariable(Request $request, $service, $option, $variabl
     public function getNewVariable(Request $request, $service, $option)
     {
         return view('admin.services.options.variable', [
-            'option' => Models\ServiceOptions::with('service')->findOrFail($option),
+            'option' => Models\ServiceOption::with('service')->findOrFail($option),
         ]);
     }
 

app/Http/Controllers/Server/ServerController.php

@@ -214,7 +214,7 @@ public function getStartup(Request $request, $uuid)
         }]);
         $this->authorize('view-startup', $server);
 
-        $variables = Models\ServiceVariables::select(
+        $variables = Models\ServiceVariable::select(
                 'service_variables.*',
                 DB::raw('COALESCE(server_variables.variable_value, service_variables.default_value) as a_serverValue')
             )->leftJoin('server_variables', 'server_variables.variable_id', '=', 'service_variables.id')

app/Http/Routes/AdminRoutes.php

@@ -144,7 +144,7 @@ public function map(Router $router)
             ]);
 
             $router->post('/new/service-options', [
-                'uses' => 'Admin\ServersController@postNewServerServiceOptions',
+                'uses' => 'Admin\ServersController@postNewServerServiceOption',
             ]);
 
             $router->post('/new/option-details', [

app/Models/Server.php

@@ -253,7 +253,7 @@ public function service()
      */
     public function option()
     {
-        return $this->belongsTo(ServiceOptions::class);
+        return $this->belongsTo(ServiceOption::class);
     }
 
     /**

app/Models/ServerVariables.php

@@ -59,6 +59,6 @@ class ServerVariables extends Model
       */
      public function variable()
      {
-         return $this->belongsTo(ServiceVariables::class, 'variable_id');
+         return $this->belongsTo(ServiceVariable::class, 'variable_id');
      }
 }

app/Models/Service.php

@@ -49,7 +49,7 @@ class Service extends Model
      */
     public function options()
     {
-        return $this->hasMany(ServiceOptions::class);
+        return $this->hasMany(ServiceOption::class);
     }
 
     /**
@@ -60,7 +60,7 @@ public function options()
     public function packs()
     {
         return $this->hasManyThrough(
-            'Pterodactyl\Models\ServicePack', 'Pterodactyl\Models\ServiceOptions',
+            'Pterodactyl\Models\ServicePack', 'Pterodactyl\Models\ServiceOption',
             'service_id', 'option_id'
         );
     }

app/Models/ServiceOptions.php

@@ -26,7 +26,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class ServiceOptions extends Model
+class ServiceOption extends Model
 {
     /**
      * The table associated with the model.
@@ -100,7 +100,7 @@ public function servers()
       */
      public function variables()
      {
-         return $this->hasMany(ServiceVariables::class, 'option_id');
+         return $this->hasMany(ServiceVariable::class, 'option_id');
      }
 
      /**

app/Models/ServicePack.php

@@ -64,6 +64,6 @@ class ServicePack extends Model
       */
      public function option()
      {
-         return $this->belongsTo(ServiceOptions::class);
+         return $this->belongsTo(ServiceOption::class);
      }
 }