Merge pull request Sylius#2198 from adamelso/variant-generator-specs

[Variation] Reusable Set Builders for generating variants + VariantGenerator spec coverage
pamil · Jan 13, 2015 · 703f43b · 703f43b
2 parents 4617557 + fff08f9
commit 703f43b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Generator/VariantGenerator.php b/Generator/VariantGenerator.php
@@ -12,6 +12,7 @@
 namespace Sylius\Bundle\ProductBundle\Generator;
 
 use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Component\Variation\SetBuilder\SetBuilderInterface;
 use Sylius\Component\Variation\Generator\VariantGenerator as BaseVariantGenerator;
 use Sylius\Component\Variation\Model\VariableInterface;
 use Sylius\Component\Variation\Model\VariantInterface;
@@ -44,12 +45,13 @@ class VariantGenerator extends BaseVariantGenerator
      * Constructor.
      *
      * @param RepositoryInterface      $variantRepository
+     * @param SetBuilderInterface      $setBuilder
      * @param ValidatorInterface       $validator
      * @param EventDispatcherInterface $eventDispatcher
      */
-    public function __construct(RepositoryInterface $variantRepository, ValidatorInterface $validator, EventDispatcherInterface $eventDispatcher)
+    public function __construct(RepositoryInterface $variantRepository, SetBuilderInterface $setBuilder, ValidatorInterface $validator, EventDispatcherInterface $eventDispatcher)
     {
-        parent::__construct($variantRepository);
+        parent::__construct($variantRepository, $setBuilder);
 
         $this->validator = $validator;
         $this->eventDispatcher = $eventDispatcher;

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -20,6 +20,7 @@
         <parameter key="sylius.builder.product.class">Sylius\Component\Product\Builder\ProductBuilder</parameter>
         <parameter key="sylius.builder.product_prototype.class">Sylius\Component\Product\Builder\PrototypeBuilder</parameter>
 
+        <parameter key="sylius.set_builder.cartesian.class">Sylius\Component\Variation\SetBuilder\CartesianSetBuilder</parameter>
         <parameter key="sylius.generator.product_variant.class">Sylius\Bundle\ProductBundle\Generator\VariantGenerator</parameter>
 
         <parameter key="sylius.validator.product.unique.class">Sylius\Bundle\ProductBundle\Validator\ProductUniqueValidator</parameter>
@@ -45,10 +46,12 @@
         </service>
         <service id="sylius.builder.product_prototype" class="%sylius.builder.product_prototype.class%">
             <argument type="service" id="sylius.repository.product_attribute_value" />
-          </service>
+        </service>
 
+        <service id="sylius.set_builder.cartesian" class="%sylius.set_builder.cartesian.class%" />
         <service id="sylius.generator.product_variant" class="%sylius.generator.product_variant.class%">
             <argument type="service" id="sylius.repository.product_variant" />
+            <argument type="service" id="sylius.set_builder.cartesian" />
             <argument type="service" id="validator" />
             <argument type="service" id="event_dispatcher"/>
         </service>