From efb5a7a54dccc95953b4ab42566cf883e3022f59 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 30 Sep 2013 10:01:06 +0200 Subject: [PATCH] refactor message events --- core/lib/Thelia/Action/Message.php | 12 ++++++------ .../Thelia/Controller/Admin/MessageController.php | 6 +++--- .../Core/Event/{ => Message}/MessageCreateEvent.php | 4 +++- .../Core/Event/{ => Message}/MessageDeleteEvent.php | 4 +++- .../Thelia/Core/Event/{ => Message}/MessageEvent.php | 3 ++- .../Core/Event/{ => Message}/MessageUpdateEvent.php | 4 +++- core/lib/Thelia/Model/Message.php | 2 +- 7 files changed, 21 insertions(+), 14 deletions(-) rename core/lib/Thelia/Core/Event/{ => Message}/MessageCreateEvent.php (97%) rename core/lib/Thelia/Core/Event/{ => Message}/MessageDeleteEvent.php (96%) rename core/lib/Thelia/Core/Event/{ => Message}/MessageEvent.php (97%) rename core/lib/Thelia/Core/Event/{ => Message}/MessageUpdateEvent.php (97%) diff --git a/core/lib/Thelia/Action/Message.php b/core/lib/Thelia/Action/Message.php index 8918913fe..fa9b13db5 100644 --- a/core/lib/Thelia/Action/Message.php +++ b/core/lib/Thelia/Action/Message.php @@ -30,16 +30,16 @@ use Thelia\Model\Message as MessageModel; use Thelia\Core\Event\TheliaEvents; -use Thelia\Core\Event\MessageUpdateEvent; -use Thelia\Core\Event\MessageCreateEvent; -use Thelia\Core\Event\MessageDeleteEvent; +use Thelia\Core\Event\Message\MessageUpdateEvent; +use Thelia\Core\Event\Message\MessageCreateEvent; +use Thelia\Core\Event\Message\MessageDeleteEvent; class Message extends BaseAction implements EventSubscriberInterface { /** * Create a new messageuration entry * - * @param MessageCreateEvent $event + * @param \Thelia\Core\Event\Message\MessageCreateEvent $event */ public function create(MessageCreateEvent $event) { @@ -64,7 +64,7 @@ class Message extends BaseAction implements EventSubscriberInterface /** * Change a message * - * @param MessageUpdateEvent $event + * @param \Thelia\Core\Event\Message\MessageUpdateEvent $event */ public function modify(MessageUpdateEvent $event) { @@ -94,7 +94,7 @@ class Message extends BaseAction implements EventSubscriberInterface /** * Delete a messageuration entry * - * @param MessageDeleteEvent $event + * @param \Thelia\Core\Event\Message\MessageDeleteEvent $event */ public function delete(MessageDeleteEvent $event) { diff --git a/core/lib/Thelia/Controller/Admin/MessageController.php b/core/lib/Thelia/Controller/Admin/MessageController.php index a55c9deca..176fa7de8 100644 --- a/core/lib/Thelia/Controller/Admin/MessageController.php +++ b/core/lib/Thelia/Controller/Admin/MessageController.php @@ -23,9 +23,9 @@ namespace Thelia\Controller\Admin; -use Thelia\Core\Event\MessageDeleteEvent; -use Thelia\Core\Event\TheliaEvents;use Thelia\Core\Event\MessageUpdateEvent; -use Thelia\Core\Event\MessageCreateEvent; +use Thelia\Core\Event\Message\MessageDeleteEvent; +use Thelia\Core\Event\TheliaEvents;use Thelia\Core\Event\Message\MessageUpdateEvent; +use Thelia\Core\Event\Message\MessageCreateEvent; use Thelia\Model\MessageQuery; use Thelia\Form\MessageModificationForm; use Thelia\Form\MessageCreationForm; diff --git a/core/lib/Thelia/Core/Event/MessageCreateEvent.php b/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php similarity index 97% rename from core/lib/Thelia/Core/Event/MessageCreateEvent.php rename to core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php index 172af5f61..fc20c2c81 100644 --- a/core/lib/Thelia/Core/Event/MessageCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php @@ -21,7 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Message; + +use Thelia\Core\Event\Message\MessageEvent; class MessageCreateEvent extends MessageEvent { diff --git a/core/lib/Thelia/Core/Event/MessageDeleteEvent.php b/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php similarity index 96% rename from core/lib/Thelia/Core/Event/MessageDeleteEvent.php rename to core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php index 241c68463..a40b19a27 100644 --- a/core/lib/Thelia/Core/Event/MessageDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php @@ -21,7 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Message; + +use Thelia\Core\Event\Message\MessageEvent; class MessageDeleteEvent extends MessageEvent { diff --git a/core/lib/Thelia/Core/Event/MessageEvent.php b/core/lib/Thelia/Core/Event/Message/MessageEvent.php similarity index 97% rename from core/lib/Thelia/Core/Event/MessageEvent.php rename to core/lib/Thelia/Core/Event/Message/MessageEvent.php index c0efcf39f..82086ed05 100644 --- a/core/lib/Thelia/Core/Event/MessageEvent.php +++ b/core/lib/Thelia/Core/Event/Message/MessageEvent.php @@ -21,7 +21,8 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Message; +use Thelia\Core\Event\ActionEvent; use Thelia\Model\Message; class MessageEvent extends ActionEvent diff --git a/core/lib/Thelia/Core/Event/MessageUpdateEvent.php b/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php similarity index 97% rename from core/lib/Thelia/Core/Event/MessageUpdateEvent.php rename to core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php index 8c9e2e740..858a668b8 100644 --- a/core/lib/Thelia/Core/Event/MessageUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php @@ -21,7 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Message; + +use Thelia\Core\Event\Message\MessageCreateEvent; class MessageUpdateEvent extends MessageCreateEvent { diff --git a/core/lib/Thelia/Model/Message.php b/core/lib/Thelia/Model/Message.php index aa6481ab8..4163e6d6b 100755 --- a/core/lib/Thelia/Model/Message.php +++ b/core/lib/Thelia/Model/Message.php @@ -5,7 +5,7 @@ namespace Thelia\Model; use Thelia\Model\Base\Message as BaseMessage; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; -use Thelia\Core\Event\MessageEvent; +use Thelia\Core\Event\Message\MessageEvent; class Message extends BaseMessage {