create Core ChannelFactory

.travis.yml

@@ -76,7 +76,7 @@ before_install:
     - etc/travis/run-suite before_install "${SYLIUS_SUITE}"
 
 install:
-    - etc/travis/run-suite install "${SYLIUS_SUITE}"
+    - travis_wait etc/travis/run-suite install "${SYLIUS_SUITE}"
 
 before_script:
     - etc/travis/run-suite before_script "${SYLIUS_SUITE}"

src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php

@@ -16,7 +16,7 @@
 use Sylius\Bundle\CoreBundle\Fixture\OptionsResolver\LazyOption;
 use Sylius\Component\Addressing\Model\Scope as AddressingScope;
 use Sylius\Component\Addressing\Model\ZoneInterface;
-use Sylius\Component\Channel\Factory\ChannelFactoryInterface;
+use Sylius\Component\Core\Factory\ChannelFactoryInterface;
 use Sylius\Component\Core\Formatter\StringInflector;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\Scope;

src/Sylius/Bundle/CoreBundle/Resources/config/services.xml

@@ -119,6 +119,11 @@
             <argument type="service" id="sylius.custom_factory.address.inner" />
         </service>
 
+        <service id="sylius.custom_factory.channel" class="Sylius\Component\Core\Factory\ChannelFactory" decorates="sylius.factory.channel" decoration-priority="256" public="false">
+            <argument type="service" id="sylius.custom_factory.channel.inner" />
+            <argument>order_items_based</argument>
+        </service>
+
         <service id="sylius.factory.customer_after_checkout" class="Sylius\Component\Core\Factory\CustomerAfterCheckoutFactory">
             <argument type="service" id="sylius.factory.customer" />
         </service>

src/Sylius/Component/Core/Factory/ChannelFactory.php

@@ -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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Core\Factory;
+
+use Sylius\Component\Core\Model\ChannelInterface;
+use Sylius\Component\Resource\Factory\FactoryInterface;
+
+class ChannelFactory implements ChannelFactoryInterface
+{
+    /** @var FactoryInterface */
+    private $decoratedFactory;
+
+    /** @var string */
+    private $defaultCalculationStrategy;
+
+    public function __construct(FactoryInterface $decoratedFactory, string $defaultCalculationStrategy)
+    {
+        $this->decoratedFactory = $decoratedFactory;
+        $this->defaultCalculationStrategy = $defaultCalculationStrategy;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createNew(): ChannelInterface
+    {
+        /** @var ChannelInterface $channel */
+        $channel = $this->decoratedFactory->createNew();
+        $channel->setTaxCalculationStrategy($this->defaultCalculationStrategy);
+
+        return $channel;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createNamed(string $name): ChannelInterface
+    {
+        $channel = $this->createNew();
+        $channel->setName($name);
+
+        return $channel;
+    }
+}

src/Sylius/Component/Core/Factory/ChannelFactoryInterface.php

@@ -0,0 +1,22 @@
+<?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.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Core\Factory;
+
+use Sylius\Component\Core\Model\ChannelInterface;
+use Sylius\Component\Resource\Factory\FactoryInterface;
+
+interface ChannelFactoryInterface extends FactoryInterface
+{
+    public function createNamed(string $name): ChannelInterface;
+}

src/Sylius/Component/Core/Model/Channel.php

@@ -33,7 +33,7 @@ class Channel extends BaseChannel implements ChannelInterface
     protected $defaultTaxZone;
 
     /** @var string */
-    protected $taxCalculationStrategy = 'order_items_based';
+    protected $taxCalculationStrategy;
 
     /**
      * @var Collection|CurrencyInterface[]

src/Sylius/Component/Core/Test/Services/DefaultChannelFactory.php

@@ -13,7 +13,7 @@
 
 namespace Sylius\Component\Core\Test\Services;
 
-use Sylius\Component\Channel\Factory\ChannelFactoryInterface;
+use Sylius\Component\Core\Factory\ChannelFactoryInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Currency\Model\CurrencyInterface;
 use Sylius\Component\Locale\Model\LocaleInterface;

src/Sylius/Component/Core/Test/Services/DefaultUnitedStatesChannelFactory.php

@@ -16,7 +16,7 @@
 use Sylius\Component\Addressing\Factory\ZoneFactoryInterface;
 use Sylius\Component\Addressing\Model\CountryInterface;
 use Sylius\Component\Addressing\Model\ZoneInterface;
-use Sylius\Component\Channel\Factory\ChannelFactoryInterface;
+use Sylius\Component\Core\Factory\ChannelFactoryInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Currency\Model\CurrencyInterface;
 use Sylius\Component\Locale\Model\LocaleInterface;

src/Sylius/Component/Core/spec/Factory/ChannelFactorySpec.php

@@ -0,0 +1,46 @@
+<?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.
+ */
+
+declare(strict_types=1);
+
+namespace spec\Sylius\Component\Core\Factory;
+
+use PhpSpec\ObjectBehavior;
+use Sylius\Component\Core\Factory\ChannelFactoryInterface;
+use Sylius\Component\Core\Model\ChannelInterface;
+use Sylius\Component\Resource\Factory\FactoryInterface;
+
+final class ChannelFactorySpec extends ObjectBehavior
+{
+    function let(FactoryInterface $decoratedFactory): void
+    {
+        $this->beConstructedWith($decoratedFactory, 'order_items_based');
+    }
+
+    function it_implements_channel_factory_interface(): void
+    {
+        $this->shouldImplement(ChannelFactoryInterface::class);
+    }
+
+    function it_is_a_resource_factory(): void
+    {
+        $this->shouldImplement(FactoryInterface::class);
+    }
+
+    function it_creates_a_new_channel(FactoryInterface $decoratedFactory, ChannelInterface $channel): void
+    {
+        $decoratedFactory->createNew()->willReturn($channel);
+
+        $channel->setTaxCalculationStrategy('order_items_based')->shouldBeCalled();
+
+        $this->createNew()->shouldReturn($channel);
+    }
+}

src/Sylius/Component/Core/spec/Model/ChannelSpec.php

@@ -67,9 +67,9 @@ function its_default_tax_zone_is_mutable(ZoneInterface $defaultTaxZone): void
         $this->getDefaultTaxZone()->shouldReturn($defaultTaxZone);
     }
 
-    function it_has_a_tax_calculation_strategy_by_default(): void
+    function it_has_no_tax_calculation_strategy_by_default(): void
     {
-        $this->getTaxCalculationStrategy()->shouldReturn('order_items_based');
+        $this->getTaxCalculationStrategy()->shouldReturn(null);
     }
 
     function its_tax_calculation_strategy_is_mutable(): void

src/Sylius/Component/Core/spec/Test/Services/DefaultChannelFactorySpec.php

@@ -14,7 +14,7 @@
 namespace spec\Sylius\Component\Core\Test\Services;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Channel\Factory\ChannelFactoryInterface;
+use Sylius\Component\Core\Factory\ChannelFactoryInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Test\Services\DefaultChannelFactoryInterface;
 use Sylius\Component\Currency\Model\CurrencyInterface;

src/Sylius/Component/Core/spec/Test/Services/DefaultUnitedStatesChannelFactorySpec.php

@@ -17,7 +17,7 @@
 use Sylius\Component\Addressing\Factory\ZoneFactoryInterface;
 use Sylius\Component\Addressing\Model\CountryInterface;
 use Sylius\Component\Addressing\Model\ZoneInterface;
-use Sylius\Component\Channel\Factory\ChannelFactoryInterface;
+use Sylius\Component\Core\Factory\ChannelFactoryInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Test\Services\DefaultChannelFactoryInterface;
 use Sylius\Component\Currency\Model\CurrencyInterface;