diff --git a/src/Extension.php b/src/Extension.php index 3c4134e..edf3a1e 100644 --- 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 index dd1cb6b..39054db 100644 --- 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 index 27653eb..c01cc55 100644 --- 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 index d711fc0..784ef11 100644 --- 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 index 1e96643..b01e3d5 100644 --- 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 index 526cd34..98d1991 100644 --- 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 b/src/Http/Requests/CustomerGroupRequest.php similarity index 95% rename from src/Requests/CustomerGroupRequest.php rename to src/Http/Requests/CustomerGroupRequest.php index 648cf72..68a4812 100644 --- a/src/Requests/CustomerGroupRequest.php +++ b/src/Http/Requests/CustomerGroupRequest.php @@ -1,6 +1,6 @@ rules(), 'group_name'); diff --git a/tests/Requests/CustomerTest.php b/tests/Requests/CustomerTest.php index b626846..7fa9734 100644 --- 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 index 48002cc..19a296b 100644 --- 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 index c9bff3b..cd5105e 100644 --- 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 index 2bd6b2b..a7783a5 100644 --- 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'))