TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor order and image events

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-30 10:34:08 +02:00
parent 6d5f34767d
commit 43b5a129f7
18 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Action/Image.php
View File

@@ -27,10 +27,10 @@ use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\File\UploadedFile; 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\ImagesCreateOrUpdateEvent;
use Thelia\Core\Event\ImageDeleteEvent; use Thelia\Core\Event\Image\ImageDeleteEvent;
use Thelia\Core\Event\ImageEvent; use Thelia\Core\Event\Image\ImageEvent;
use Thelia\Model\CategoryImage; use Thelia\Model\CategoryImage;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
use Thelia\Model\ContentImage; 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 * 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 * @throws \InvalidArgumentException, ImageException
*/ */
public function processImage(ImageEvent $event) 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 * 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 * @throws \Thelia\Exception\ImageException
* @todo refactor make all pictures using propel inheritance and factorise image behaviour into one single clean action * @todo refactor make all pictures using propel inheritance and factorise image behaviour into one single clean action

16
core/lib/Thelia/Action/Order.php
View File

@@ -26,8 +26,8 @@ namespace Thelia\Action;
use Propel\Runtime\ActiveQuery\ModelCriteria; use Propel\Runtime\ActiveQuery\ModelCriteria;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Core\Event\OrderAddressEvent; use Thelia\Core\Event\Order\OrderAddressEvent;
use Thelia\Core\Event\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Exception\OrderException; use Thelia\Exception\OrderException;
use Thelia\Exception\TheliaProcessException; use Thelia\Exception\TheliaProcessException;
@@ -51,7 +51,7 @@ use Thelia\Tools\I18n;
class Order extends BaseAction implements EventSubscriberInterface class Order extends BaseAction implements EventSubscriberInterface
{ {
/** /**
* @param \Thelia\Core\Event\OrderEvent $event * @param \Thelia\Core\Event\Order\OrderEvent $event
*/ */
public function setDeliveryAddress(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) 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) 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) 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) 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) public function sendOrderEmail(OrderEvent $event)
{ {

2
core/lib/Thelia/Command/ClearImageCache.php
View File

@@ -27,7 +27,7 @@ use Thelia\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Thelia\Core\Event\ImageEvent; use Thelia\Core\Event\Image\ImageEvent;
use Thelia\Core\HttpFoundation\Request; use Thelia\Core\HttpFoundation\Request;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;

4
core/lib/Thelia/Controller/Admin/FileController.php
View File

@@ -30,8 +30,8 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Router; use Symfony\Component\Routing\Router;
use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent;
use Thelia\Core\Event\Document\DocumentDeleteEvent; use Thelia\Core\Event\Document\DocumentDeleteEvent;
use Thelia\Core\Event\ImageCreateOrUpdateEvent; use Thelia\Core\Event\Image\ImageCreateOrUpdateEvent;
use Thelia\Core\Event\ImageDeleteEvent; use Thelia\Core\Event\Image\ImageDeleteEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Form\Exception\FormValidationException; use Thelia\Form\Exception\FormValidationException;

4
core/lib/Thelia/Controller/Admin/OrderController.php
View File

@@ -23,8 +23,8 @@
namespace Thelia\Controller\Admin; namespace Thelia\Controller\Admin;
use Thelia\Core\Event\OrderAddressEvent; use Thelia\Core\Event\Order\OrderAddressEvent;
use Thelia\Core\Event\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Form\OrderUpdateAddress; use Thelia\Form\OrderUpdateAddress;

2
core/lib/Thelia/Controller/Front/OrderController.php
View File

@@ -25,7 +25,7 @@ namespace Thelia\Controller\Front;
use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Exception\PropelException;
use Thelia\Exception\TheliaProcessException; use Thelia\Exception\TheliaProcessException;
use Thelia\Form\Exception\FormValidationException; use Thelia\Form\Exception\FormValidationException;
use Thelia\Core\Event\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Thelia\Form\OrderDelivery; use Thelia\Form\OrderDelivery;

3
core/lib/Thelia/Core/Event/ImageCreateOrUpdateEvent.php → core/lib/Thelia/Core/Event/Image/ImageCreateOrUpdateEvent.php
View File

@@ -21,8 +21,9 @@
/* */ /* */
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Core\Event; namespace Thelia\Core\Event\Image;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
use Thelia\Core\Event\ActionEvent;
/** /**
* Created by JetBrains PhpStorm. * Created by JetBrains PhpStorm.

3
core/lib/Thelia/Core/Event/ImageDeleteEvent.php → core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php
View File

@@ -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\CategoryImage;
use Thelia\Model\ContentImage; use Thelia\Model\ContentImage;
use Thelia\Model\FolderImage; use Thelia\Model\FolderImage;

4
core/lib/Thelia/Core/Event/ImageEvent.php → core/lib/Thelia/Core/Event/Image/ImageEvent.php
View File

@@ -21,7 +21,9 @@
/* */ /* */
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\Core\Event; namespace Thelia\Core\Event\Image;
use Thelia\Core\Event\CachedFileEvent;
class ImageEvent extends CachedFileEvent class ImageEvent extends CachedFileEvent
{ {

3
core/lib/Thelia/Core/Event/OrderAddressEvent.php → core/lib/Thelia/Core/Event/Order/OrderAddressEvent.php
View File

@@ -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\Order;
use Thelia\Model\OrderAddress; use Thelia\Model\OrderAddress;

3
core/lib/Thelia/Core/Event/OrderEvent.php → core/lib/Thelia/Core/Event/Order/OrderEvent.php
View File

@@ -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\Order;
class OrderEvent extends ActionEvent class OrderEvent extends ActionEvent

2
core/lib/Thelia/Core/Template/Loop/Image.php
View File

@@ -24,7 +24,7 @@
namespace Thelia\Core\Template\Loop; namespace Thelia\Core\Template\Loop;
use Thelia\Core\Template\Element\BaseI18nLoop; use Thelia\Core\Template\Element\BaseI18nLoop;
use Thelia\Core\Template\Loop\Argument\Argument; 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\Event\TheliaEvents;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Type\TypeCollection; use Thelia\Type\TypeCollection;

2
core/lib/Thelia/Model/Order.php
View File

@@ -5,7 +5,7 @@ namespace Thelia\Model;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Propel; use Propel\Runtime\Propel;
use Thelia\Core\Event\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Base\Order as BaseOrder; use Thelia\Model\Base\Order as BaseOrder;
use Thelia\Model\Base\OrderProductTaxQuery; use Thelia\Model\Base\OrderProductTaxQuery;

2
core/lib/Thelia/Model/OrderProduct.php
View File

@@ -3,7 +3,7 @@
namespace Thelia\Model; namespace Thelia\Model;
use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Core\Event\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Base\OrderProduct as BaseOrderProduct; use Thelia\Model\Base\OrderProduct as BaseOrderProduct;

2
core/lib/Thelia/Tests/Action/ImageTest.php
View File

@@ -28,7 +28,7 @@ use Thelia\Core\HttpFoundation\Request;
use Thelia\Core\HttpFoundation\Session\Session; use Thelia\Core\HttpFoundation\Session\Session;
use Thelia\Action\Image; use Thelia\Action\Image;
use Thelia\Core\Event\ImageEvent; use Thelia\Core\Event\Image\ImageEvent;
use Thelia\Model\ConfigQuery; use Thelia\Model\ConfigQuery;
/** /**

6
core/lib/Thelia/Tests/Action/OrderTest.php
View File

@@ -25,8 +25,8 @@ namespace Thelia\Tests\Action;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Thelia\Core\Event\OrderAddressEvent; use Thelia\Core\Event\Order\OrderAddressEvent;
use Thelia\Core\Event\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\HttpFoundation\Request; use Thelia\Core\HttpFoundation\Request;
use Thelia\Core\HttpFoundation\Session\Session; use Thelia\Core\HttpFoundation\Session\Session;
use Thelia\Core\Security\SecurityContext; use Thelia\Core\Security\SecurityContext;
@@ -66,7 +66,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
protected $orderAction; protected $orderAction;
/** /**
* @var OrderEvent $orderEvent * @var \Thelia\Core\Event\Order\OrderEvent $orderEvent
*/ */
protected $orderEvent; protected $orderEvent;

2
core/lib/Thelia/Tests/Tools/FileManagerTest.php
View File

@@ -11,7 +11,7 @@ namespace Thelia\Tests\Type;
use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent;
use Thelia\Core\Event\ImageCreateOrUpdateEvent; use Thelia\Core\Event\Image\ImageCreateOrUpdateEvent;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Exception\ImageException; use Thelia\Exception\ImageException;
use Thelia\Model\Admin; use Thelia\Model\Admin;

2
core/lib/Thelia/Tools/FileManager.php
View File

@@ -25,7 +25,7 @@ namespace Thelia\Tools;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
use Thelia\Core\Event\Document\DocumentCreateOrUpdateEvent; 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\HttpFoundation\Request;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Exception\ImageException; use Thelia\Exception\ImageException;