diff --git a/core/lib/Thelia/Action/Image.php b/core/lib/Thelia/Action/Image.php index b15b00f0b..d93f39cf0 100755 --- a/core/lib/Thelia/Action/Image.php +++ b/core/lib/Thelia/Action/Image.php @@ -27,10 +27,10 @@ use Propel\Runtime\ActiveRecord\ActiveRecordInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\File\UploadedFile; -use Thelia\Core\Event\ImageCreateOrUpdateEvent; +use Thelia\Core\Event\Image\ImageCreateOrUpdateEvent; use Thelia\Core\Event\ImagesCreateOrUpdateEvent; -use Thelia\Core\Event\ImageDeleteEvent; -use Thelia\Core\Event\ImageEvent; +use Thelia\Core\Event\Image\ImageDeleteEvent; +use Thelia\Core\Event\Image\ImageEvent; use Thelia\Model\CategoryImage; use Thelia\Model\ConfigQuery; use Thelia\Model\ContentImage; @@ -106,7 +106,7 @@ class Image extends BaseCachedFile implements EventSubscriberInterface * * This method updates the cache_file_path and file_url attributes of the event * - * @param ImageEvent $event + * @param \Thelia\Core\Event\Image\ImageEvent $event * @throws \InvalidArgumentException, ImageException */ public function processImage(ImageEvent $event) @@ -255,7 +255,7 @@ class Image extends BaseCachedFile implements EventSubscriberInterface /** * Take care of saving image in the database and file storage * - * @param ImageCreateOrUpdateEvent $event Image event + * @param \Thelia\Core\Event\Image\ImageCreateOrUpdateEvent $event Image event * * @throws \Thelia\Exception\ImageException * @todo refactor make all pictures using propel inheritance and factorise image behaviour into one single clean action diff --git a/core/lib/Thelia/Action/Order.php b/core/lib/Thelia/Action/Order.php index 0353bcbe1..58f2ff1cd 100755 --- a/core/lib/Thelia/Action/Order.php +++ b/core/lib/Thelia/Action/Order.php @@ -26,8 +26,8 @@ namespace Thelia\Action; use Propel\Runtime\ActiveQuery\ModelCriteria; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Thelia\Core\Event\OrderAddressEvent; -use Thelia\Core\Event\OrderEvent; +use Thelia\Core\Event\Order\OrderAddressEvent; +use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Exception\OrderException; use Thelia\Exception\TheliaProcessException; @@ -51,7 +51,7 @@ use Thelia\Tools\I18n; class Order extends BaseAction implements EventSubscriberInterface { /** - * @param \Thelia\Core\Event\OrderEvent $event + * @param \Thelia\Core\Event\Order\OrderEvent $event */ public function setDeliveryAddress(OrderEvent $event) { @@ -63,7 +63,7 @@ class Order extends BaseAction implements EventSubscriberInterface } /** - * @param \Thelia\Core\Event\OrderEvent $event + * @param \Thelia\Core\Event\Order\OrderEvent $event */ public function setDeliveryModule(OrderEvent $event) { @@ -76,7 +76,7 @@ class Order extends BaseAction implements EventSubscriberInterface } /** - * @param \Thelia\Core\Event\OrderEvent $event + * @param \Thelia\Core\Event\Order\OrderEvent $event */ public function setInvoiceAddress(OrderEvent $event) { @@ -88,7 +88,7 @@ class Order extends BaseAction implements EventSubscriberInterface } /** - * @param \Thelia\Core\Event\OrderEvent $event + * @param \Thelia\Core\Event\Order\OrderEvent $event */ public function setPaymentModule(OrderEvent $event) { @@ -100,7 +100,7 @@ class Order extends BaseAction implements EventSubscriberInterface } /** - * @param \Thelia\Core\Event\OrderEvent $event + * @param \Thelia\Core\Event\Order\OrderEvent $event */ public function create(OrderEvent $event) { @@ -281,7 +281,7 @@ class Order extends BaseAction implements EventSubscriberInterface } /** - * @param \Thelia\Core\Event\OrderEvent $event + * @param \Thelia\Core\Event\Order\OrderEvent $event */ public function sendOrderEmail(OrderEvent $event) { diff --git a/core/lib/Thelia/Command/ClearImageCache.php b/core/lib/Thelia/Command/ClearImageCache.php index d2010ead1..8401e47f3 100755 --- a/core/lib/Thelia/Command/ClearImageCache.php +++ b/core/lib/Thelia/Command/ClearImageCache.php @@ -27,7 +27,7 @@ use Thelia\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Thelia\Core\Event\ImageEvent; +use Thelia\Core\Event\Image\ImageEvent; use Thelia\Core\HttpFoundation\Request; use Symfony\Component\Console\Input\InputArgument; use Thelia\Core\Event\TheliaEvents; diff --git a/core/lib/Thelia/Controller/Admin/FileController.php b/core/lib/Thelia/Controller/Admin/FileController.php index df425249c..1ef048486 100755 --- a/core/lib/Thelia/Controller/Admin/FileController.php +++ b/core/lib/Thelia/Controller/Admin/FileController.php @@ -30,8 +30,8 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Router; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; use Thelia\Core\Event\Document\DocumentDeleteEvent; -use Thelia\Core\Event\ImageCreateOrUpdateEvent; -use Thelia\Core\Event\ImageDeleteEvent; +use Thelia\Core\Event\Image\ImageCreateOrUpdateEvent; +use Thelia\Core\Event\Image\ImageDeleteEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Translation\Translator; use Thelia\Form\Exception\FormValidationException; diff --git a/core/lib/Thelia/Controller/Admin/OrderController.php b/core/lib/Thelia/Controller/Admin/OrderController.php index 9331cbe2f..1c6d2711a 100644 --- a/core/lib/Thelia/Controller/Admin/OrderController.php +++ b/core/lib/Thelia/Controller/Admin/OrderController.php @@ -23,8 +23,8 @@ namespace Thelia\Controller\Admin; -use Thelia\Core\Event\OrderAddressEvent; -use Thelia\Core\Event\OrderEvent; +use Thelia\Core\Event\Order\OrderAddressEvent; +use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Translation\Translator; use Thelia\Form\OrderUpdateAddress; diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/core/lib/Thelia/Controller/Front/OrderController.php index 1f2c716ae..767693fce 100755 --- a/core/lib/Thelia/Controller/Front/OrderController.php +++ b/core/lib/Thelia/Controller/Front/OrderController.php @@ -25,7 +25,7 @@ namespace Thelia\Controller\Front; use Propel\Runtime\Exception\PropelException; use Thelia\Exception\TheliaProcessException; use Thelia\Form\Exception\FormValidationException; -use Thelia\Core\Event\OrderEvent; +use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\TheliaEvents; use Symfony\Component\HttpFoundation\Request; use Thelia\Form\OrderDelivery; diff --git a/core/lib/Thelia/Core/Event/ImageCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php similarity index 98% rename from core/lib/Thelia/Core/Event/ImageCreateOrUpdateEvent.php rename to core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php index e7d5f3449..6183e74ab 100755 --- a/core/lib/Thelia/Core/Event/ImageCreateOrUpdateEvent.php +++ b/core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php @@ -21,8 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Image; use Symfony\Component\HttpFoundation\File\UploadedFile; +use Thelia\Core\Event\ActionEvent; /** * Created by JetBrains PhpStorm. diff --git a/core/lib/Thelia/Core/Event/ImageDeleteEvent.php b/core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php similarity index 98% rename from core/lib/Thelia/Core/Event/ImageDeleteEvent.php rename to core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php index 9e890e999..9de9b1475 100755 --- a/core/lib/Thelia/Core/Event/ImageDeleteEvent.php +++ b/core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php @@ -21,8 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Image; +use Thelia\Core\Event\ActionEvent; use Thelia\Model\CategoryImage; use Thelia\Model\ContentImage; use Thelia\Model\FolderImage; diff --git a/core/lib/Thelia/Core/Event/ImageEvent.php b/core/lib/Thelia/Core/Event/Image/ImageEvent.php similarity index 98% rename from core/lib/Thelia/Core/Event/ImageEvent.php rename to core/lib/Thelia/Core/Event/Image/ImageEvent.php index 462fa012d..2fce2466c 100755 --- a/core/lib/Thelia/Core/Event/ImageEvent.php +++ b/core/lib/Thelia/Core/Event/Image/ImageEvent.php @@ -21,7 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Image; + +use Thelia\Core\Event\CachedFileEvent; class ImageEvent extends CachedFileEvent { diff --git a/core/lib/Thelia/Core/Event/OrderAddressEvent.php b/core/lib/Thelia/Core/Event/Order/OrderAddressEvent.php similarity index 98% rename from core/lib/Thelia/Core/Event/OrderAddressEvent.php rename to core/lib/Thelia/Core/Event/Order/OrderAddressEvent.php index c9fb90a0e..92c101dd6 100755 --- a/core/lib/Thelia/Core/Event/OrderAddressEvent.php +++ b/core/lib/Thelia/Core/Event/Order/OrderAddressEvent.php @@ -21,8 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Order; +use Thelia\Core\Event\ActionEvent; use Thelia\Model\Order; use Thelia\Model\OrderAddress; diff --git a/core/lib/Thelia/Core/Event/OrderEvent.php b/core/lib/Thelia/Core/Event/Order/OrderEvent.php similarity index 98% rename from core/lib/Thelia/Core/Event/OrderEvent.php rename to core/lib/Thelia/Core/Event/Order/OrderEvent.php index f941e5e46..7463bd176 100755 --- a/core/lib/Thelia/Core/Event/OrderEvent.php +++ b/core/lib/Thelia/Core/Event/Order/OrderEvent.php @@ -21,8 +21,9 @@ /* */ /*************************************************************************************/ -namespace Thelia\Core\Event; +namespace Thelia\Core\Event\Order; +use Thelia\Core\Event\ActionEvent; use Thelia\Model\Order; class OrderEvent extends ActionEvent diff --git a/core/lib/Thelia/Core/Template/Loop/Image.php b/core/lib/Thelia/Core/Template/Loop/Image.php index a62f23702..e37d0b406 100755 --- a/core/lib/Thelia/Core/Template/Loop/Image.php +++ b/core/lib/Thelia/Core/Template/Loop/Image.php @@ -24,7 +24,7 @@ namespace Thelia\Core\Template\Loop; use Thelia\Core\Template\Element\BaseI18nLoop; use Thelia\Core\Template\Loop\Argument\Argument; -use Thelia\Core\Event\ImageEvent; +use Thelia\Core\Event\Image\ImageEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Type\TypeCollection; diff --git a/core/lib/Thelia/Model/Order.php b/core/lib/Thelia/Model/Order.php index f0102a962..4033e5bfb 100755 --- a/core/lib/Thelia/Model/Order.php +++ b/core/lib/Thelia/Model/Order.php @@ -5,7 +5,7 @@ namespace Thelia\Model; use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Propel; -use Thelia\Core\Event\OrderEvent; +use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Model\Base\Order as BaseOrder; use Thelia\Model\Base\OrderProductTaxQuery; diff --git a/core/lib/Thelia/Model/OrderProduct.php b/core/lib/Thelia/Model/OrderProduct.php index 235eaf259..b73ef9852 100644 --- a/core/lib/Thelia/Model/OrderProduct.php +++ b/core/lib/Thelia/Model/OrderProduct.php @@ -3,7 +3,7 @@ namespace Thelia\Model; use Propel\Runtime\Connection\ConnectionInterface; -use Thelia\Core\Event\OrderEvent; +use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\TheliaEvents; use Thelia\Model\Base\OrderProduct as BaseOrderProduct; diff --git a/core/lib/Thelia/Tests/Action/ImageTest.php b/core/lib/Thelia/Tests/Action/ImageTest.php index f08da25b9..bbd596f1d 100755 --- a/core/lib/Thelia/Tests/Action/ImageTest.php +++ b/core/lib/Thelia/Tests/Action/ImageTest.php @@ -28,7 +28,7 @@ use Thelia\Core\HttpFoundation\Request; use Thelia\Core\HttpFoundation\Session\Session; use Thelia\Action\Image; -use Thelia\Core\Event\ImageEvent; +use Thelia\Core\Event\Image\ImageEvent; use Thelia\Model\ConfigQuery; /** diff --git a/core/lib/Thelia/Tests/Action/OrderTest.php b/core/lib/Thelia/Tests/Action/OrderTest.php index 384f8e172..eb9c8fc0b 100644 --- a/core/lib/Thelia/Tests/Action/OrderTest.php +++ b/core/lib/Thelia/Tests/Action/OrderTest.php @@ -25,8 +25,8 @@ namespace Thelia\Tests\Action; use Propel\Runtime\ActiveQuery\Criteria; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; -use Thelia\Core\Event\OrderAddressEvent; -use Thelia\Core\Event\OrderEvent; +use Thelia\Core\Event\Order\OrderAddressEvent; +use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\HttpFoundation\Request; use Thelia\Core\HttpFoundation\Session\Session; use Thelia\Core\Security\SecurityContext; @@ -66,7 +66,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase protected $orderAction; /** - * @var OrderEvent $orderEvent + * @var \Thelia\Core\Event\Order\OrderEvent $orderEvent */ protected $orderEvent; diff --git a/core/lib/Thelia/Tests/Tools/FileManagerTest.php b/core/lib/Thelia/Tests/Tools/FileManagerTest.php index 40b46a624..0bde45213 100644 --- a/core/lib/Thelia/Tests/Tools/FileManagerTest.php +++ b/core/lib/Thelia/Tests/Tools/FileManagerTest.php @@ -11,7 +11,7 @@ namespace Thelia\Tests\Type; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; -use Thelia\Core\Event\ImageCreateOrUpdateEvent; +use Thelia\Core\Event\Image\ImageCreateOrUpdateEvent; use Thelia\Core\Translation\Translator; use Thelia\Exception\ImageException; use Thelia\Model\Admin; diff --git a/core/lib/Thelia/Tools/FileManager.php b/core/lib/Thelia/Tools/FileManager.php index fe0953f67..c3f5233b3 100644 --- a/core/lib/Thelia/Tools/FileManager.php +++ b/core/lib/Thelia/Tools/FileManager.php @@ -25,7 +25,7 @@ namespace Thelia\Tools; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\File\UploadedFile; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; -use Thelia\Core\Event\ImageCreateOrUpdateEvent; +use Thelia\Core\Event\Image\ImageCreateOrUpdateEvent; use Thelia\Core\HttpFoundation\Request; use Thelia\Core\Translation\Translator; use Thelia\Exception\ImageException;