kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #3932 from gperdomor/feature/extract-cart-user-dependency

Browse source 
[User][Cart][Dependency] Extract Cart dependencies from UserBundle
This commit is contained in:
Paweł Jędrzejewski 2016-01-20 14:59:13 +01:00
commit 64ae3f435e
6 changed files with 102 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/Sylius/Bundle/CoreBundle/EventListener/CustomerAwareListener.php Normal file
View file

@ -0,0 +1,43 @@
<?php
/*
* This file is part of the Sylius package.
*
* (c) Paweł Jędrzejewski
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Sylius\Bundle\CoreBundle\EventListener;
use Sylius\Bundle\UserBundle\EventListener\CustomerAwareListener as BaseCustomerAwareListener;
use Sylius\Component\Cart\Event\CartEvent;
use Sylius\Component\Resource\Exception\UnexpectedTypeException;
use Sylius\Component\User\Model\CustomerAwareInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
class CustomerAwareListener extends BaseCustomerAwareListener
{
/**
* @param GenericEvent $event
*/
public function setCustomer(GenericEvent $event)
{
if ($event instanceof CartEvent) {
$resource = $event->getCart();
} else {
$resource = $event->getSubject();
}
if (!$resource instanceof CustomerAwareInterface) {
throw new UnexpectedTypeException($resource, CustomerAwareInterface::class);
}
if (null === $customer = $this->customerContext->getCustomer()) {
return;
}
$resource->setCustomer($customer);
}
}

1
src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
View file

@ -56,6 +56,7 @@
<parameter key="sylius.listener.insufficient_stock_exception.class">Sylius\Bundle\CoreBundle\EventListener\InsufficientStockExceptionListener</parameter>
<parameter key="sylius.listener.image_upload.class">Sylius\Bundle\CoreBundle\EventListener\ImageUploadListener</parameter>
<parameter key="sylius.listener.channel.class">Sylius\Bundle\CoreBundle\EventListener\ChannelDeletionListener</parameter>
<parameter key="sylius.listener.customer_aware.class">Sylius\Bundle\CoreBundle\EventListener\CustomerAwareListener</parameter>
<parameter key="sylius.promotion_processor.class">Sylius\Bundle\CoreBundle\OrderProcessing\PromotionProcessor</parameter>
<parameter key="sylius.promotion_rule_checker.nth_order.class">Sylius\Component\Core\Promotion\Checker\NthOrderRuleChecker</parameter>

55
src/Sylius/Bundle/CoreBundle/spec/EventListener/CustomerAwareListenerSpec.php Normal file
View file

@ -0,0 +1,55 @@
<?php
/*
* This file is part of the Sylius package.
*
* (c) Paweł Jędrzejewski
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace spec\Sylius\Bundle\CoreBundle\EventListener;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\CoreBundle\EventListener\CustomerAwareListener;
use Sylius\Bundle\UserBundle\EventListener\CustomerAwareListener as BaseCustomerAwareListener;
use Sylius\Component\Cart\Event\CartEvent;
use Sylius\Component\User\Context\CustomerContextInterface;
use Sylius\Component\User\Model\CustomerAwareInterface;
use Sylius\Component\User\Model\CustomerInterface;
/**
* @author Michał Marcinkowski <michal.marcinkowski@lakion.com>
*/
class CustomerAwareListenerSpec extends ObjectBehavior
{
function it_is_initializable()
{
$this->shouldHaveType(CustomerAwareListener::class);
}
function it_extends_user_customer_aware_interface()
{
$this->shouldHaveType(BaseCustomerAwareListener::class);
}
function let(CustomerContextInterface $customerContext)
{
$this->beConstructedWith($customerContext);
}
function it_sets_customer_on_a_cart(
$customerContext,
CartEvent $event,
CustomerAwareInterface $cart,
CustomerInterface $customer
) {
$event->getCart()->willReturn($cart);
$customerContext->getCustomer()->willReturn($customer);
$cart->setCustomer($customer)->shouldBeCalled();
$this->setCustomer($event);
}
}

7
src/Sylius/Bundle/UserBundle/EventListener/CustomerAwareListener.php
View file

@ -11,7 +11,6 @@
namespace Sylius\Bundle\UserBundle\EventListener;
use Sylius\Component\Cart\Event\CartEvent;
use Sylius\Component\Resource\Exception\UnexpectedTypeException;
use Sylius\Component\User\Context\CustomerContextInterface;
use Sylius\Component\User\Model\CustomerAwareInterface;
@ -37,11 +36,7 @@ class CustomerAwareListener
*/
public function setCustomer(GenericEvent $event)
{
if ($event instanceof CartEvent) {
$resource = $event->getCart();
} else {
$resource = $event->getSubject();
}
$resource = $event->getSubject();
if (!$resource instanceof CustomerAwareInterface) {
throw new UnexpectedTypeException($resource, CustomerAwareInterface::class);

1
src/Sylius/Bundle/UserBundle/composer.json
View file

@ -35,7 +35,6 @@
"php": "^5.5.9|^7.0",
"sylius/user": "0.17.*",
"sylius/cart": "0.17.*",
"sylius/resource-bundle": "0.17.*",
"sylius/mailer-bundle": "0.17.*",
"symfony/framework-bundle": "^2.7.5",

18
src/Sylius/Bundle/UserBundle/spec/EventListener/CustomerAwareListenerSpec.php
View file

@ -13,7 +13,7 @@ namespace spec\Sylius\Bundle\UserBundle\EventListener;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Component\Cart\Event\CartEvent;
use Sylius\Bundle\UserBundle\EventListener\CustomerAwareListener;
use Sylius\Component\User\Context\CustomerContextInterface;
use Sylius\Component\User\Model\CustomerAwareInterface;
use Sylius\Component\User\Model\CustomerInterface;
@ -26,7 +26,7 @@ class CustomerAwareListenerSpec extends ObjectBehavior
{
function it_is_initializable()
{
$this->shouldHaveType('Sylius\Bundle\UserBundle\EventListener\CustomerAwareListener');
$this->shouldHaveType(CustomerAwareListener::class);
}
function let(CustomerContextInterface $customerContext)
@ -70,18 +70,4 @@ class CustomerAwareListenerSpec extends ObjectBehavior
$this->setCustomer($event);
}
function it_sets_customer_on_a_cart(
$customerContext,
CartEvent $event,
CustomerAwareInterface $cart,
CustomerInterface $customer
) {
$event->getCart()->willReturn($cart);
$customerContext->getCustomer()->willReturn($customer);
$cart->setCustomer($customer)->shouldBeCalled();
$this->setCustomer($event);
}
}