More repository/service/refactor changes

app/Http/Requests/Admin/Service/OptionVariableFormRequest.php

@@ -0,0 +1,62 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Http\Requests\Admin;
+
+use Pterodactyl\Models\ServiceVariable;
+
+class OptionVariableFormRequest extends AdminFormRequest
+{
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|string|min:1|max:255',
+            'description' => 'sometimes|nullable|string',
+            'env_variable' => 'required|regex:/^[\w]{1,255}$/|notIn:' . ServiceVariable::RESERVED_ENV_NAMES,
+            'default_value' => 'string',
+            'options' => 'sometimes|required|array',
+            'rules' => 'bail|required|string',
+        ];
+    }
+
+    /**
+     * Run validation after the rules above have been applied.
+     *
+     * @param \Illuminate\Validation\Validator $validator
+     */
+    public function withValidator($validator)
+    {
+        $rules = $this->input('rules');
+        if ($this->method() === 'PATCH') {
+            $rules = $this->input('rules', $this->route()->parameter('variable')->rules);
+        }
+
+        $validator->sometimes('default_value', $rules, function ($input) {
+            return $input->default_value;
+        });
+    }
+}

app/Http/Requests/Admin/Service/ServiceOptionFormRequest.php

@@ -24,24 +24,16 @@
 
 namespace Pterodactyl\Http\Requests\Admin\Service;
 
+use Pterodactyl\Models\ServiceOption;
 use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
 
-class StoreOptionVariable extends AdminFormRequest
+class ServiceOptionFormRequest extends AdminFormRequest
 {
     /**
-     * Set the rules to be used for data passed to the request.
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function rules()
     {
-        return [
-            'name' => 'required|string|min:1|max:255',
-            'description' => 'nullable|string',
-            'env_variable' => 'required|regex:/^[\w]{1,255}$/',
-            'rules' => 'bail|required|string',
-            'default_value' => explode('|', $this->input('rules')),
-            'options' => 'sometimes|required|array',
-        ];
+        return ServiceOption::getCreateRules();
     }
 }