Move Requests into Http\Requests

Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · May 29, 2024 · e4368ae · e4368ae
1 parent c53b8b2
commit e4368ae
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 18 deletions.
diff --git a/src/Extension.php b/src/Extension.php
@@ -158,7 +158,7 @@ public function registerSystemSettings()
                     'permission' => ['Site.Settings'],
                     'url' => admin_url('settings/edit/user'),
                     'form' => 'igniter.user::/models/usersettings',
-                    'request' => \Igniter\User\Requests\UserSettingsRequest::class,
+                    'request' => \Igniter\User\Http\Requests\UserSettingsRequest::class,
                 ],
             ]);
         });

diff --git a/src/Http/Controllers/CustomerGroups.php b/src/Http/Controllers/CustomerGroups.php
@@ -26,7 +26,7 @@ class CustomerGroups extends \Igniter\Admin\Classes\AdminController
     public array $formConfig = [
         'name' => 'lang:igniter.user::default.customer_groups.text_form_name',
         'model' => \Igniter\User\Models\CustomerGroup::class,
-        'request' => \Igniter\User\Requests\CustomerGroupRequest::class,
+        'request' => \Igniter\User\Http\Requests\CustomerGroupRequest::class,
         'create' => [
             'title' => 'lang:admin::lang.form.create_title',
             'redirect' => 'customer_groups/edit/{customer_group_id}',

diff --git a/src/Http/Controllers/Customers.php b/src/Http/Controllers/Customers.php
@@ -6,7 +6,6 @@
 use Igniter\Admin\Facades\Template;
 use Igniter\Flame\Exception\FlashException;
 use Igniter\User\Facades\Auth;
-
 use function flash;
 use function lang;
 use function post;
@@ -31,7 +30,7 @@ class Customers extends \Igniter\Admin\Classes\AdminController
     public array $formConfig = [
         'name' => 'lang:igniter.user::default.customers.text_form_name',
         'model' => \Igniter\User\Models\Customer::class,
-        'request' => \Igniter\User\Requests\CustomerRequest::class,
+        'request' => \Igniter\User\Http\Requests\CustomerRequest::class,
         'create' => [
             'title' => 'lang:igniter::admin.form.create_title',
             'redirect' => 'customers/edit/{customer_id}',

diff --git a/src/Http/Controllers/UserGroups.php b/src/Http/Controllers/UserGroups.php
@@ -26,7 +26,7 @@ class UserGroups extends \Igniter\Admin\Classes\AdminController
     public array $formConfig = [
         'name' => 'lang:igniter.user::default.user_groups.text_form_name',
         'model' => \Igniter\User\Models\UserGroup::class,
-        'request' => \Igniter\User\Requests\UserGroupRequest::class,
+        'request' => \Igniter\User\Http\Requests\UserGroupRequest::class,
         'create' => [
             'title' => 'lang:igniter::admin.form.create_title',
             'redirect' => 'user_groups/edit/{user_group_id}',

diff --git a/src/Http/Controllers/UserRoles.php b/src/Http/Controllers/UserRoles.php
@@ -25,7 +25,7 @@ class UserRoles extends \Igniter\Admin\Classes\AdminController
     public array $formConfig = [
         'name' => 'lang:igniter.user::default.user_roles.text_form_name',
         'model' => \Igniter\User\Models\UserRole::class,
-        'request' => \Igniter\User\Requests\UserRoleRequest::class,
+        'request' => \Igniter\User\Http\Requests\UserRoleRequest::class,
         'create' => [
             'title' => 'lang:igniter::admin.form.create_title',
             'redirect' => 'user_roles/edit/{user_role_id}',

diff --git a/src/Http/Controllers/Users.php b/src/Http/Controllers/Users.php
@@ -27,7 +27,7 @@ class Users extends \Igniter\Admin\Classes\AdminController
     public array $formConfig = [
         'name' => 'lang:igniter.user::default.staff.text_form_name',
         'model' => \Igniter\User\Models\User::class,
-        'request' => \Igniter\User\Requests\UserRequest::class,
+        'request' => \Igniter\User\Http\Requests\UserRequest::class,
         'create' => [
             'title' => 'lang:igniter::admin.form.create_title',
             'redirect' => 'users/edit/{user_id}',

diff --git a/src/Requests/CustomerGroupRequest.php → src/Http/Requests/CustomerGroupRequest.php b/src/Requests/CustomerGroupRequest.php → src/Http/Requests/CustomerGroupRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\User\Requests;
+namespace Igniter\User\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 use Illuminate\Validation\Rule;

diff --git a/src/Requests/CustomerRequest.php → src/Http/Requests/CustomerRequest.php b/src/Requests/CustomerRequest.php → src/Http/Requests/CustomerRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\User\Requests;
+namespace Igniter\User\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 use Illuminate\Validation\Rule;

diff --git a/src/Requests/UserGroupRequest.php → src/Http/Requests/UserGroupRequest.php b/src/Requests/UserGroupRequest.php → src/Http/Requests/UserGroupRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\User\Requests;
+namespace Igniter\User\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 use Illuminate\Validation\Rule;

diff --git a/src/Requests/UserRequest.php → src/Http/Requests/UserRequest.php b/src/Requests/UserRequest.php → src/Http/Requests/UserRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\User\Requests;
+namespace Igniter\User\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 use Igniter\User\Facades\AdminAuth;

diff --git a/src/Requests/UserRoleRequest.php → src/Http/Requests/UserRoleRequest.php b/src/Requests/UserRoleRequest.php → src/Http/Requests/UserRoleRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\User\Requests;
+namespace Igniter\User\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 use Illuminate\Validation\Rule;

diff --git a/src/Requests/UserSettingsRequest.php → src/Http/Requests/UserSettingsRequest.php b/src/Requests/UserSettingsRequest.php → src/Http/Requests/UserSettingsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Igniter\User\Requests;
+namespace Igniter\User\Http\Requests;
 
 use Igniter\System\Classes\FormRequest;
 

diff --git a/tests/Requests/CustomerGroupTest.php b/tests/Requests/CustomerGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Requests;
 
-use Igniter\User\Requests\CustomerGroupRequest;
+use Igniter\User\Http\Requests\CustomerGroupRequest;
 
 it('has rules for group_name field', function() {
     $rules = array_get((new CustomerGroupRequest)->rules(), 'group_name');

diff --git a/tests/Requests/CustomerTest.php b/tests/Requests/CustomerTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Requests;
 
-use Igniter\User\Requests\CustomerRequest;
+use Igniter\User\Http\Requests\CustomerRequest;
 
 it('has rules for first_name field', function() {
     $rules = array_get((new CustomerRequest)->rules(), 'first_name');

diff --git a/tests/Requests/UserGroupTest.php b/tests/Requests/UserGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Requests;
 
-use Igniter\User\Requests\UserGroupRequest;
+use Igniter\User\Http\Requests\UserGroupRequest;
 
 it('has required rule for inputs', function() {
     expect('required')->toBeIn(array_get((new UserGroupRequest)->rules(), 'user_group_name'))

diff --git a/tests/Requests/UserRoleTest.php b/tests/Requests/UserRoleTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Requests;
 
-use Igniter\User\Requests\UserRoleRequest;
+use Igniter\User\Http\Requests\UserRoleRequest;
 
 it('has required rule for inputs', function() {
     expect('required')->toBeIn(array_get((new UserRoleRequest)->rules(), 'name'))

diff --git a/tests/Requests/UserTest.php b/tests/Requests/UserTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Requests;
 
-use Igniter\User\Requests\UserRequest;
+use Igniter\User\Http\Requests\UserRequest;
 
 it('has required rule for inputs', function() {
     expect('required')->toBeIn(array_get((new UserRequest)->rules(), 'name'))