From 3ed76d237a66b729bbbd705283cef6e77c7c3577 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 30 Sep 2013 10:10:44 +0200 Subject: [PATCH] refactor config events --- core/lib/Thelia/Action/Config.php | 14 +++++++------- .../Thelia/Controller/Admin/ConfigController.php | 6 +++--- .../Core/Event/{ => Config}/ConfigCreateEvent.php | 4 +++- .../Core/Event/{ => Config}/ConfigDeleteEvent.php | 4 +++- .../Thelia/Core/Event/{ => Config}/ConfigEvent.php | 3 ++- .../Core/Event/{ => Config}/ConfigUpdateEvent.php | 4 +++- core/lib/Thelia/Model/Config.php | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) rename core/lib/Thelia/Core/Event/{ => Config}/ConfigCreateEvent.php (97%) rename core/lib/Thelia/Core/Event/{ => Config}/ConfigDeleteEvent.php (96%) rename core/lib/Thelia/Core/Event/{ => Config}/ConfigEvent.php (97%) rename core/lib/Thelia/Core/Event/{ => Config}/ConfigUpdateEvent.php (97%) diff --git a/core/lib/Thelia/Action/Config.php b/core/lib/Thelia/Action/Config.php index f8a7c027c..e925811d3 100644 --- a/core/lib/Thelia/Action/Config.php +++ b/core/lib/Thelia/Action/Config.php @@ -29,16 +29,16 @@ use Thelia\Model\Config as ConfigModel; use Thelia\Core\Event\TheliaEvents; -use Thelia\Core\Event\ConfigUpdateEvent; -use Thelia\Core\Event\ConfigCreateEvent; -use Thelia\Core\Event\ConfigDeleteEvent; +use Thelia\Core\Event\Config\ConfigUpdateEvent; +use Thelia\Core\Event\Config\ConfigCreateEvent; +use Thelia\Core\Event\Config\ConfigDeleteEvent; class Config extends BaseAction implements EventSubscriberInterface { /** * Create a new configuration entry * - * @param ConfigCreateEvent $event + * @param \Thelia\Core\Event\Config\ConfigCreateEvent $event */ public function create(ConfigCreateEvent $event) { @@ -54,7 +54,7 @@ class Config extends BaseAction implements EventSubscriberInterface /** * Change a configuration entry value * - * @param ConfigUpdateEvent $event + * @param \Thelia\Core\Event\Config\ConfigUpdateEvent $event */ public function setValue(ConfigUpdateEvent $event) { @@ -74,7 +74,7 @@ class Config extends BaseAction implements EventSubscriberInterface /** * Change a configuration entry * - * @param ConfigUpdateEvent $event + * @param \Thelia\Core\Event\Config\ConfigUpdateEvent $event */ public function modify(ConfigUpdateEvent $event) { @@ -94,7 +94,7 @@ class Config extends BaseAction implements EventSubscriberInterface /** * Delete a configuration entry * - * @param ConfigDeleteEvent $event + * @param \Thelia\Core\Event\Config\ConfigDeleteEvent $event */ public function delete(ConfigDeleteEvent $event) { diff --git a/core/lib/Thelia/Controller/Admin/ConfigController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php index 8701710b0..c1d360ff4 100644 --- a/core/lib/Thelia/Controller/Admin/ConfigController.php +++ b/core/lib/Thelia/Controller/Admin/ConfigController.php @@ -23,10 +23,10 @@ namespace Thelia\Controller\Admin; -use Thelia\Core\Event\ConfigDeleteEvent; +use Thelia\Core\Event\Config\ConfigDeleteEvent; use Thelia\Core\Event\TheliaEvents; -use Thelia\Core\Event\ConfigUpdateEvent; -use Thelia\Core\Event\ConfigCreateEvent; +use Thelia\Core\Event\Config\ConfigUpdateEvent; +use Thelia\Core\Event\Config\ConfigCreateEvent; use Thelia\Model\ConfigQuery; use Thelia\Form\ConfigModificationForm; use Thelia\Form\ConfigCreationForm; diff --git a/core/lib/Thelia/Core/Event/ConfigCreateEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php similarity index 97% rename from core/lib/Thelia/Core/Event/ConfigCreateEvent.php rename to core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php index 986eb31b7..86cd5c84f 100644 --- a/core/lib/Thelia/Core/Event/ConfigCreateEvent.php +++ b/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php @@ -21,7 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Config; + +use Thelia\Core\Event\Config\ConfigEvent; class ConfigCreateEvent extends ConfigEvent { diff --git a/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php similarity index 96% rename from core/lib/Thelia/Core/Event/ConfigDeleteEvent.php rename to core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php index 87ae50c38..f225e49b5 100644 --- a/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php @@ -21,7 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Config; + +use Thelia\Core\Event\Config\ConfigEvent; class ConfigDeleteEvent extends ConfigEvent { diff --git a/core/lib/Thelia/Core/Event/ConfigEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigEvent.php similarity index 97% rename from core/lib/Thelia/Core/Event/ConfigEvent.php rename to core/lib/Thelia/Core/Event/Config/ConfigEvent.php index 646b43856..d2dab3f87 100644 --- a/core/lib/Thelia/Core/Event/ConfigEvent.php +++ b/core/lib/Thelia/Core/Event/Config/ConfigEvent.php @@ -21,7 +21,8 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Config; +use Thelia\Core\Event\ActionEvent; use Thelia\Model\Config; class ConfigEvent extends ActionEvent diff --git a/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php similarity index 97% rename from core/lib/Thelia/Core/Event/ConfigUpdateEvent.php rename to core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php index b3d5955c4..f37f6ab55 100644 --- a/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php @@ -21,7 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Config; + +use Thelia\Core\Event\Config\ConfigCreateEvent; class ConfigUpdateEvent extends ConfigCreateEvent { diff --git a/core/lib/Thelia/Model/Config.php b/core/lib/Thelia/Model/Config.php index cc44e5053..9b44f1981 100755 --- a/core/lib/Thelia/Model/Config.php +++ b/core/lib/Thelia/Model/Config.php @@ -26,7 +26,7 @@ namespace Thelia\Model; use Thelia\Model\Base\Config as BaseConfig; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Event\TheliaEvents; -use Thelia\Core\Event\ConfigEvent; +use Thelia\Core\Event\Config\ConfigEvent; class Config extends BaseConfig {