From eccd04b331735b9d41e9fcfacc04f9fdd8083f88 Mon Sep 17 00:00:00 2001 From: Antoine Le Gonidec Date: Wed, 10 Jul 2024 17:26:43 +0200 Subject: [PATCH] Fix Entities namespace --- Console/Commands/FetchEmails.php | 2 +- ...024_07_10_162710_drop_emails_on_customers_deletion.php | 1 - ...10_162735_add_mailbox_id_column_to_customers_table.php | 2 +- Entities/Customer.php | 8 +------- Entities/Email.php | 4 +--- Entities/Mailbox.php | 3 +-- Http/Controllers/ConversationsController.php | 2 +- Http/Controllers/CrmController.php | 6 +++--- Http/Controllers/CustomersController.php | 2 +- 9 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Console/Commands/FetchEmails.php b/Console/Commands/FetchEmails.php index 11cbc2e..fefc872 100644 --- a/Console/Commands/FetchEmails.php +++ b/Console/Commands/FetchEmails.php @@ -7,7 +7,7 @@ namespace Modules\MMFRestrictedCustomers\Console\Commands; use App\Conversation; -use Modules\MMFRestrictedCustomers\Customer; +use Modules\MMFRestrictedCustomers\Entities\Customer; use App\Events\CustomerCreatedConversation; use App\Events\CustomerReplied; use App\Thread; diff --git a/Database/Migrations/2024_07_10_162710_drop_emails_on_customers_deletion.php b/Database/Migrations/2024_07_10_162710_drop_emails_on_customers_deletion.php index a3482e4..dae0733 100644 --- a/Database/Migrations/2024_07_10_162710_drop_emails_on_customers_deletion.php +++ b/Database/Migrations/2024_07_10_162710_drop_emails_on_customers_deletion.php @@ -7,7 +7,6 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -use Symfony\Component\Console\Output\ConsoleOutput; class DropEmailsOnCustomersDeletion extends Migration { /** diff --git a/Database/Migrations/2024_07_10_162735_add_mailbox_id_column_to_customers_table.php b/Database/Migrations/2024_07_10_162735_add_mailbox_id_column_to_customers_table.php index 404a96f..0493b5f 100644 --- a/Database/Migrations/2024_07_10_162735_add_mailbox_id_column_to_customers_table.php +++ b/Database/Migrations/2024_07_10_162735_add_mailbox_id_column_to_customers_table.php @@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; use Symfony\Component\Console\Output\ConsoleOutput; -use Modules\MMFRestrictedCustomers\Customer; +use Modules\MMFRestrictedCustomers\Entities\Customer; class AddMailboxIdColumnToCustomersTable extends Migration { /** diff --git a/Entities/Customer.php b/Entities/Customer.php index b198280..fcfcedb 100644 --- a/Entities/Customer.php +++ b/Entities/Customer.php @@ -4,14 +4,8 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace Modules\MMFRestrictedCustomers; +namespace Modules\MMFRestrictedCustomers\Entities; -use App\CustomerChannel; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Support\Facades\Hash; -use Illuminate\Support\Facades\Storage; -use Watson\Rememberable\Rememberable; -use Modules\MMFRestrictedCustomers\Mailbox; use App\Customer as BaseCustomer; class Customer extends BaseCustomer { diff --git a/Entities/Email.php b/Entities/Email.php index fe0d5a5..797877e 100644 --- a/Entities/Email.php +++ b/Entities/Email.php @@ -4,10 +4,8 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace Modules\MMFRestrictedCustomers; +namespace Modules\MMFRestrictedCustomers\Entities; -use Illuminate\Database\Eloquent\Model; -use Watson\Rememberable\Rememberable; use App\Email as BaseEmail; class Email extends BaseEmail { diff --git a/Entities/Mailbox.php b/Entities/Mailbox.php index 9d0b352..d76ddec 100644 --- a/Entities/Mailbox.php +++ b/Entities/Mailbox.php @@ -4,9 +4,8 @@ SPDX-FileCopyrightText: © 2024 Millions Missing FRANCE */ -namespace Modules\MMFRestrictedCustomers; +namespace Modules\MMFRestrictedCustomers\Entities; -use Modules\MMFRestrictedCustomers\Customer; use App\Mailbox as BaseMailbox; class Mailbox extends BaseMailbox { diff --git a/Http/Controllers/ConversationsController.php b/Http/Controllers/ConversationsController.php index fb929e5..a089c65 100644 --- a/Http/Controllers/ConversationsController.php +++ b/Http/Controllers/ConversationsController.php @@ -10,7 +10,7 @@ use App\Conversation; use App\User; use Illuminate\Http\Request; use App\Http\Controllers\ConversationsController as BaseConversationsController; -use Modules\MMFRestrictedCustomers\Customer; +use Modules\MMFRestrictedCustomers\Entities\Customer; class ConversationsController extends BaseConversationsController { /** diff --git a/Http/Controllers/CrmController.php b/Http/Controllers/CrmController.php index eac0a8c..e46c190 100644 --- a/Http/Controllers/CrmController.php +++ b/Http/Controllers/CrmController.php @@ -14,9 +14,9 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Routing\Controller; use Modules\Crm\Http\Controllers\CrmController as BaseCrmController; -use Modules\MMFRestrictedCustomers\Customer; -use Modules\MMFRestrictedCustomers\Email; -use Modules\MMFRestrictedCustomers\Mailbox; +use Modules\MMFRestrictedCustomers\Entities\Customer; +use Modules\MMFRestrictedCustomers\Entities\Email; +use Modules\MMFRestrictedCustomers\Entities\Mailbox; class CrmController extends BaseCrmController { public function createCustomer(Request $request) { diff --git a/Http/Controllers/CustomersController.php b/Http/Controllers/CustomersController.php index c2fb742..7d8d051 100644 --- a/Http/Controllers/CustomersController.php +++ b/Http/Controllers/CustomersController.php @@ -11,7 +11,7 @@ use App\Email; use Illuminate\Http\Request; use Validator; use App\Http\Controllers\CustomersController as BaseCustomersController; -use Modules\MMFRestrictedCustomers\Customer; +use Modules\MMFRestrictedCustomers\Entities\Customer; class CustomersController extends BaseCustomersController { /**