More singularization and correct file names.

Author: DaneEveritt

app/Http/Controllers/Server/ServerController.php

@@ -230,13 +230,13 @@ public function getStartup(Request $request, $uuid)
             ->first();
 
         $allocation = $server->allocations->pop();
-        $serverVariables = [
+        $ServerVariable = [
             '{{SERVER_MEMORY}}' => $server->memory,
             '{{SERVER_IP}}' => $allocation->ip,
             '{{SERVER_PORT}}' => $allocation->port,
         ];
 
-        $processed = str_replace(array_keys($serverVariables), array_values($serverVariables), $server->startup);
+        $processed = str_replace(array_keys($ServerVariable), array_values($ServerVariable), $server->startup);
         foreach ($variables as &$variable) {
             $replace = ($variable->user_viewable === 1) ? $variable->a_serverValue : '[hidden]';
             $processed = str_replace('{{' . $variable->env_variable . '}}', $replace, $processed);

app/Models/Server.php

@@ -263,7 +263,7 @@ public function option()
      */
     public function variables()
     {
-        return $this->hasMany(ServerVariables::class);
+        return $this->hasMany(ServerVariable::class);
     }
 
     /**

app/Models/ServerVariables.php app/Models/ServerVariable.phpapp/Models/ServerVariables.php renamed to app/Models/ServerVariable.php

@@ -26,7 +26,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class ServerVariables extends Model
+class ServerVariable extends Model
 {
     /**
      * The table associated with the model.

app/Models/ServiceOptions.php app/Models/ServiceOption.phpapp/Models/ServiceOptions.php renamed to app/Models/ServiceOption.php

@@ -54,8 +54,8 @@ class ServiceVariable extends Model
          'required' => 'integer',
      ];
 
-    public function serverVariables()
+    public function ServerVariable()
     {
-        return $this->hasMany(ServerVariables::class, 'variable_id');
+        return $this->hasMany(ServerVariable::class, 'variable_id');
     }
 }

app/Models/ServiceVariables.php app/Models/ServiceVariable.phpapp/Models/ServiceVariables.php renamed to app/Models/ServiceVariable.php

@@ -288,7 +288,7 @@ public function create(array $data)
             foreach ($variableList as $item) {
                 $environmentVariables[$item['env']] = $item['val'];
 
-                Models\ServerVariables::create([
+                Models\ServerVariable::create([
                     'server_id' => $server->id,
                     'variable_id' => $item['id'],
                     'variable_value' => $item['val'],
@@ -718,7 +718,7 @@ public function updateStartup($id, array $data, $admin = false)
                 $environmentVariables[$item['env']] = $item['val'];
 
                 // Update model or make a new record if it doesn't exist.
-                $model = Models\ServerVariables::firstOrNew([
+                $model = Models\ServerVariable::firstOrNew([
                     'variable_id' => $item['id'],
                     'server_id' => $server->id,
                 ]);
@@ -787,7 +787,7 @@ public function deleteNow($id, $force = false)
             ]);
 
             // Remove Variables
-            Models\ServerVariables::where('server_id', $server->id)->delete();
+            Models\ServerVariable::where('server_id', $server->id)->delete();
 
             // Remove Permissions (Foreign Key requires before Subusers)
             Models\Permission::where('server_id', $server->id)->delete();

app/Repositories/ServerRepository.php

@@ -76,11 +76,11 @@ public function create($id, array $data)
 
     public function delete($id)
     {
-        $variable = Models\ServiceVariable::with('serverVariables')->findOrFail($id);
+        $variable = Models\ServiceVariable::with('ServerVariable')->findOrFail($id);
 
         DB::beginTransaction();
         try {
-            foreach ($variable->serverVariables as $svar) {
+            foreach ($variable->ServerVariable as $svar) {
                 $svar->delete();
             }
             $variable->delete();

app/Repositories/ServiceRepository/Variable.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class AddServerVariables extends Migration
+class AddServerVariable extends Migration
 {
     /**
      * Run the migrations.

database/migrations/2016_01_23_201649_add_server_variables.php

@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class AddForeignServerVariables extends Migration
+class AddForeignServerVariable extends Migration
 {
     /**
      * Run the migrations.