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

Remove container from Adress listenet. #198

Browse Source
This commit is contained in:
Manuel Raynaud
2014-01-31 11:28:06 +01:00
parent 3fb0dfe1db
commit bf49aa24dd
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Action/Address.php
View File

@@ -36,7 +36,7 @@ use Thelia\Model\Map\AddressTableMap;
* @package Thelia\Action * @package Thelia\Action
* @author Manuel Raynaud <mraynaud@openstudio.fr> * @author Manuel Raynaud <mraynaud@openstudio.fr>
*/ */
class Address extends BaseAction implements EventSubscriberInterface class Address implements EventSubscriberInterface
{ {
public function create(AddressCreateOrUpdateEvent $event) public function create(AddressCreateOrUpdateEvent $event)
@@ -69,7 +69,7 @@ class Address extends BaseAction implements EventSubscriberInterface
protected function createOrUpdate(AddressModel $addressModel, AddressCreateOrUpdateEvent $event) protected function createOrUpdate(AddressModel $addressModel, AddressCreateOrUpdateEvent $event)
{ {
$addressModel->setDispatcher($this->getDispatcher()); $addressModel->setDispatcher($event->getDispatcher());
$con = Propel::getWriteConnection(AddressTableMap::DATABASE_NAME); $con = Propel::getWriteConnection(AddressTableMap::DATABASE_NAME);
$con->beginTransaction(); $con->beginTransaction();
try { try {

1
core/lib/Thelia/Config/Resources/action.xml
View File

@@ -22,7 +22,6 @@
</service> </service>
<service id="thelia.action.address" class="Thelia\Action\Address"> <service id="thelia.action.address" class="Thelia\Action\Address">
<argument type="service" id="service_container"/>
<tag name="kernel.event_subscriber"/> <tag name="kernel.event_subscriber"/>
</service> </service>

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

@@ -36,7 +36,7 @@ use Thelia\Tests\Action\BaseAction;
* @package Thelia\Tests\Action * @package Thelia\Tests\Action
* @author Manuel Raynaud <mraynaud@openstudio.fr> * @author Manuel Raynaud <mraynaud@openstudio.fr>
*/ */
class AddressTest extends BaseAction class AddressTest extends \PHPUnit_Framework_TestCase
{ {
public function testCreatedAddress() public function testCreatedAddress()
@@ -59,8 +59,9 @@ class AddressTest extends BaseAction
"" ""
); );
$AddressCreateOrUpdateEvent->setCustomer($customer); $AddressCreateOrUpdateEvent->setCustomer($customer);
$AddressCreateOrUpdateEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
$actionAddress = new Address($this->getContainer()); $actionAddress = new Address();
$actionAddress->create($AddressCreateOrUpdateEvent); $actionAddress->create($AddressCreateOrUpdateEvent);
$createdAddress = $AddressCreateOrUpdateEvent->getAddress(); $createdAddress = $AddressCreateOrUpdateEvent->getAddress();
@@ -106,6 +107,7 @@ class AddressTest extends BaseAction
"" ""
); );
$addressEvent->setAddress($address); $addressEvent->setAddress($address);
$addressEvent->setDispatcher($this->getMock("Symfony\Component\EventDispatcher\EventDispatcherInterface"));
$actionAddress = new Address($this->getContainer()); $actionAddress = new Address($this->getContainer());
$actionAddress->update($addressEvent); $actionAddress->update($addressEvent);