[Product] Merge VariationBundle to ProductBundle

docs/book/products.rst

@@ -160,5 +160,3 @@ Learn more:
 
 * :doc:`Product - Bundle Documentation </bundles/SyliusProductBundle/index>`
 * :doc:`Product - Component Documentation </components/Product/index>`
-* :doc:`Variation- Bundle Documentation </bundles/SyliusVariationBundle/index>`
-* :doc:`Variation - Component Documentation </components/Variation/index>`

docs/bundles/SyliusProductBundle/index.rst

@@ -4,10 +4,6 @@ SyliusProductBundle
 The Sylius product catalog is made available as set of 2 standalone bundles. This component contains the most basic product model with properties (attributes) support.
 It also includes the product prototyping system, which serves as a template for creating similar products.
 
-If you need product options support, please see :doc:`SyliusVariationBundle </bundles/SyliusVariationBundle/index>` which allows to manage
-product variations with a very flexible architecture.
-
-
 .. toctree::
    :maxdepth: 1
    :numbered:

docs/bundles/SyliusProductBundle/installation.rst

@@ -41,7 +41,6 @@ Don't worry, everything was automatically installed via Composer.
             new Sylius\Bundle\ProductBundle\SyliusProductBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
             new Sylius\Bundle\AttributeBundle\SyliusAttributeBundle(),
-            new Sylius\Bundle\VariationBundle\SyliusVariationBundle(),
 
             // Other bundles...
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),

phpspec.yml.dist

@@ -63,7 +63,6 @@ suites:
     ThemeBundle: { namespace: Sylius\Bundle\ThemeBundle, psr4_prefix: Sylius\Bundle\ThemeBundle , spec_path: src/Sylius/Bundle/ThemeBundle, src_path: src/Sylius/Bundle/ThemeBundle }
     UiBundle: { namespace: Sylius\Bundle\UiBundle, psr4_prefix: Sylius\Bundle\UiBundle, spec_path: src/Sylius/Bundle/UiBundle, src_path: src/Sylius/Bundle/UiBundle }
     UserBundle: { namespace: Sylius\Bundle\UserBundle, psr4_prefix: Sylius\Bundle\UserBundle, spec_path: src/Sylius/Bundle/UserBundle, src_path: src/Sylius/Bundle/UserBundle }
-    VariationBundle: { namespace: Sylius\Bundle\VariationBundle, psr4_prefix: Sylius\Bundle\VariationBundle, spec_path: src/Sylius/Bundle/VariationBundle, src_path: src/Sylius/Bundle/VariationBundle }
 
     Behat: { namespace: Sylius\Behat, psr4_prefix: Sylius\Behat, spec_path: src/Sylius/Behat, src_path: src/Sylius/Behat }
 

src/Sylius/Bundle/CoreBundle/Application/Kernel.php

@@ -41,7 +41,6 @@ class Kernel extends HttpKernel
             new \Sylius\Bundle\LocaleBundle\SyliusLocaleBundle(),
             new \Sylius\Bundle\ProductBundle\SyliusProductBundle(),
             new \Sylius\Bundle\ChannelBundle\SyliusChannelBundle(),
-            new \Sylius\Bundle\VariationBundle\SyliusVariationBundle(),
             new \Sylius\Bundle\AttributeBundle\SyliusAttributeBundle(),
             new \Sylius\Bundle\TaxationBundle\SyliusTaxationBundle(),
             new \Sylius\Bundle\ShippingBundle\SyliusShippingBundle(),

src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml

@@ -18,7 +18,6 @@ imports:
     - { resource: "@SyliusTaxationBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusTaxonomyBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusUserBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusVariationBundle/Resources/config/app/config.yml" }
 
     - { resource: "parameters.yml" }
     - { resource: "sylius.yml" }

src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius.yml

@@ -142,6 +142,13 @@ sylius_product:
                     model: Sylius\Component\Core\Model\ProductTranslation
                     form:
                         default: Sylius\Bundle\CoreBundle\Form\Type\ProductTranslationType
+        product_variant:
+            classes:
+                model: Sylius\Component\Core\Model\ProductVariant
+                interface: Sylius\Component\Core\Model\ProductVariantInterface
+                repository: Sylius\Bundle\CoreBundle\Doctrine\ORM\ProductVariantRepository
+                form:
+                    default: Sylius\Bundle\CoreBundle\Form\Type\ProductVariantType
 
 sylius_promotion:
     resources:
@@ -249,13 +256,3 @@ sylius_customer:
                 repository: Sylius\Bundle\CoreBundle\Doctrine\ORM\CustomerRepository
                 form:
                     default: Sylius\Bundle\CoreBundle\Form\Type\CustomerType
-
-sylius_variation:
-    resources:
-        product:
-            variant:
-                classes:
-                    model: Sylius\Component\Core\Model\ProductVariant
-                    repository: Sylius\Bundle\CoreBundle\Doctrine\ORM\ProductVariantRepository
-                    form:
-                        default: Sylius\Bundle\CoreBundle\Form\Type\ProductVariantType

src/Sylius/Bundle/CoreBundle/spec/Form/Type/ProductVariantTypeSpec.php

@@ -12,7 +12,7 @@
 namespace spec\Sylius\Bundle\CoreBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\VariationBundle\Form\Type\VariantType;
+use Sylius\Bundle\ProductBundle\Form\Type\VariantType;
 use Symfony\Component\Form\FormTypeInterface;
 
 final class ProductVariantTypeSpec extends ObjectBehavior

src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php

@@ -15,15 +15,32 @@ use Sylius\Bundle\CoreBundle\Form\Type\LegacyProductType;
 use Sylius\Bundle\ProductBundle\Form\Type\ProductTranslationType;
 use Sylius\Bundle\ProductBundle\Form\Type\ProductType;
 use Sylius\Bundle\ProductBundle\Form\Type\ProductVariantGenerationType;
+use Sylius\Bundle\ProductBundle\Form\Type\VariantType;
 use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
 use Sylius\Bundle\ResourceBundle\Form\Type\ResourceChoiceType;
+use Sylius\Bundle\ResourceBundle\Form\Type\ResourceFromIdentifierType;
 use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
+use Sylius\Bundle\ProductBundle\Form\Type\OptionTranslationType;
+use Sylius\Bundle\ProductBundle\Form\Type\OptionType;
+use Sylius\Bundle\ProductBundle\Form\Type\OptionValueTranslationType;
+use Sylius\Bundle\ProductBundle\Form\Type\OptionValueType;
 use Sylius\Component\Product\Factory\ProductFactory;
+use Sylius\Component\Product\Model\Option;
+use Sylius\Component\Product\Model\OptionInterface;
+use Sylius\Component\Product\Model\OptionTranslation;
+use Sylius\Component\Product\Model\OptionTranslationInterface;
+use Sylius\Component\Product\Model\OptionValue;
+use Sylius\Component\Product\Model\OptionValueInterface;
+use Sylius\Component\Product\Model\OptionValueTranslation;
+use Sylius\Component\Product\Model\OptionValueTranslationInterface;
 use Sylius\Component\Product\Model\Product;
 use Sylius\Component\Product\Model\ProductInterface;
 use Sylius\Component\Product\Model\ProductTranslation;
 use Sylius\Component\Product\Model\ProductTranslationInterface;
+use Sylius\Component\Product\Model\Variant;
+use Sylius\Component\Product\Model\VariantInterface;
 use Sylius\Component\Resource\Factory\Factory;
+use Sylius\Component\Resource\Factory\TranslatableFactory;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -135,6 +152,171 @@ class Configuration implements ConfigurationInterface
                                 ->end()
                             ->end()
                         ->end()
+                        ->arrayNode('product_variant')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->variableNode('options')->end()
+                                ->arrayNode('classes')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->scalarNode('model')->defaultValue(Variant::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('interface')->defaultValue(VariantInterface::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('repository')->cannotBeEmpty()->end()
+                                        ->scalarNode('factory')->defaultValue(Factory::class)->end()
+                                        ->arrayNode('form')
+                                            ->addDefaultsIfNotSet()
+                                            ->children()
+                                                ->scalarNode('default')->defaultValue(VariantType::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('from_identifier')->defaultValue(ResourceFromIdentifierType::class)->cannotBeEmpty()->end()
+                                            ->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                                ->arrayNode('validation_groups')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->arrayNode('default')
+                                            ->prototype('scalar')->end()
+                                            ->defaultValue(['sylius'])
+                                            ->cannotBeEmpty()
+                                        ->end()
+                                        ->arrayNode('from_identifier')
+                                            ->prototype('scalar')->end()
+                                            ->defaultValue(['sylius'])
+                                            ->cannotBeEmpty()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('product_option')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->variableNode('options')->end()
+                                ->arrayNode('classes')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->scalarNode('model')->defaultValue(Option::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('interface')->defaultValue(OptionInterface::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('repository')->cannotBeEmpty()->end()
+                                        ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
+                                        ->arrayNode('form')
+                                            ->addDefaultsIfNotSet()
+                                            ->children()
+                                                ->scalarNode('default')->defaultValue(OptionType::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('choice')->defaultValue(ResourceChoiceType::class)->cannotBeEmpty()->end()
+                                            ->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                                ->arrayNode('validation_groups')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->arrayNode('default')
+                                            ->prototype('scalar')->end()
+                                            ->defaultValue(['sylius'])
+                                            ->cannotBeEmpty()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                                ->arrayNode('translation')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->variableNode('options')->end()
+                                        ->arrayNode('classes')
+                                            ->addDefaultsIfNotSet()
+                                            ->children()
+                                                ->scalarNode('model')->defaultValue(OptionTranslation::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('interface')->defaultValue(OptionTranslationInterface::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('repository')->cannotBeEmpty()->end()
+                                                ->scalarNode('factory')->defaultValue(Factory::class)->end()
+                                                ->arrayNode('form')
+                                                    ->addDefaultsIfNotSet()
+                                                    ->children()
+                                                        ->scalarNode('default')->defaultValue(OptionTranslationType::class)->cannotBeEmpty()->end()
+                                                    ->end()
+                                                ->end()
+                                            ->end()
+                                        ->end()
+                                        ->arrayNode('validation_groups')
+                                            ->addDefaultsIfNotSet()
+                                            ->children()
+                                                ->arrayNode('default')
+                                                    ->prototype('scalar')->end()
+                                                    ->defaultValue(['sylius'])
+                                                ->end()
+                                            ->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
+                        ->arrayNode('product_option_value')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->variableNode('options')->end()
+                                ->arrayNode('classes')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->scalarNode('model')->defaultValue(OptionValue::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('interface')->defaultValue(OptionValueInterface::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                        ->scalarNode('repository')->cannotBeEmpty()->cannotBeEmpty()->end()
+                                        ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end()
+                                        ->arrayNode('form')
+                                            ->addDefaultsIfNotSet()
+                                            ->children()
+                                                ->scalarNode('default')->defaultValue(OptionValueType::class)->cannotBeEmpty()->end()
+                                            ->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                                ->arrayNode('validation_groups')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->arrayNode('default')
+                                            ->prototype('scalar')->end()
+                                            ->defaultValue(['sylius'])
+                                        ->end()
+                                    ->end()
+                                ->end()
+                                ->arrayNode('translation')
+                                    ->addDefaultsIfNotSet()
+                                    ->children()
+                                        ->variableNode('option_value')->end()
+                                        ->arrayNode('classes')
+                                            ->isRequired()
+                                            ->addDefaultsIfNotSet()
+                                            ->children()
+                                                ->scalarNode('model')->defaultValue(OptionValueTranslation::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('interface')->defaultValue(OptionValueTranslationInterface::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
+                                                ->scalarNode('repository')->cannotBeEmpty()->end()
+                                                ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
+                                                ->arrayNode('form')
+                                                    ->addDefaultsIfNotSet()
+                                                    ->children()
+                                                        ->scalarNode('default')->defaultValue(OptionValueTranslationType::class)->cannotBeEmpty()->end()
+                                                    ->end()
+                                                ->end()
+                                            ->end()
+                                        ->end()
+                                        ->arrayNode('validation_groups')
+                                            ->addDefaultsIfNotSet()
+                                            ->children()
+                                                ->arrayNode('default')
+                                                    ->prototype('scalar')->end()
+                                                    ->defaultValue(['sylius'])
+                                                ->end()
+                                            ->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
                     ->end()
                 ->end()
             ->end()

src/Sylius/Bundle/ProductBundle/Doctrine/ORM/OptionRepository.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Doctrine\ORM;
+namespace Sylius\Bundle\ProductBundle\Doctrine\ORM;
 
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Product\Repository\OptionRepositoryInterface;

src/Sylius/Bundle/ProductBundle/EventListener/LoadMetadataSubscriber.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\EventListener;
+namespace Sylius\Bundle\ProductBundle\EventListener;
 
 use Doctrine\Common\EventSubscriber;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;

src/Sylius/Bundle/ProductBundle/Form/DataTransformer/VariantToCombinationTransformer.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\DataTransformer;
+namespace Sylius\Bundle\ProductBundle\Form\DataTransformer;
 
 use Sylius\Component\Product\Model\OptionValueInterface;
 use Sylius\Component\Product\Model\ProductInterface;
@@ -18,25 +18,21 @@ use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 /**
- * Option values combination to variant transformer.
- *
  * @author Paweł Jędrzejewski <pawel@sylius.org>
  */
 class VariantToCombinationTransformer implements DataTransformerInterface
 {
     /**
-     * Currently matching variable.
-     *
      * @var ProductInterface
      */
-    protected $variable;
+    protected $product;
 
     /**
-     * @param ProductInterface $variable
+     * @param ProductInterface $product
      */
-    public function __construct(ProductInterface $variable)
+    public function __construct(ProductInterface $product)
     {
-        $this->variable = $variable;
+        $this->product = $product;
     }
 
     /**
@@ -78,16 +74,14 @@ class VariantToCombinationTransformer implements DataTransformerInterface
      */
     private function matches($value)
     {
-        foreach ($this->variable->getVariants() as $variant) {
+        foreach ($this->product->getVariants() as $variant) {
             foreach ($value as $option) {
-                if (null === $option || !$variant->hasOption($option)) {
+                if (null !== $option && $variant->hasOption($option)) {
-                    continue 2;
+                    return $variant;
                 }
             }
-
-            return $variant;
         }
 
-        return;
+        return null;
     }
 }

src/Sylius/Bundle/ProductBundle/Form/EventListener/BuildVariantFormSubscriber.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\EventListener;
+namespace Sylius\Bundle\ProductBundle\Form\EventListener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
@@ -23,23 +23,16 @@ use Symfony\Component\Form\FormFactoryInterface;
  */
 class BuildVariantFormSubscriber implements EventSubscriberInterface
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
     /**
      * @var FormFactoryInterface
      */
     private $factory;
 
     /**
-     * @param string               $variableName
      * @param FormFactoryInterface $factory
      */
-    public function __construct($variableName, FormFactoryInterface $factory)
+    public function __construct(FormFactoryInterface $factory)
     {
-        $this->variableName = $variableName;
         $this->factory = $factory;
     }
 
@@ -70,7 +63,7 @@ class BuildVariantFormSubscriber implements EventSubscriberInterface
 
         // If the object has options, lets add this configuration field.
         if ($variable->hasOptions()) {
-            $form->add($this->factory->createNamed('options', sprintf('sylius_%s_option_value_collection', $this->variableName), $variant->getOptions(), [
+            $form->add($this->factory->createNamed('options', 'sylius_product_option_value_collection', $variant->getOptions(), [
                 'options' => $variable->getOptions(),
                 'auto_initialize' => false,
             ]));

src/Sylius/Bundle/ProductBundle/Form/Type/OptionTranslationType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -19,23 +19,6 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class OptionTranslationType extends AbstractResourceType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $dataClass
-     * @param array  $validationGroups
-     * @param string $variableName
-     */
-    public function __construct($dataClass, array $validationGroups, $variableName)
-    {
-        parent::__construct($dataClass, $validationGroups);
-
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -53,6 +36,6 @@ class OptionTranslationType extends AbstractResourceType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_option_translation', $this->variableName);
+        return 'sylius_product_option_translation';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/OptionType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
 use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
@@ -21,23 +21,6 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class OptionType extends AbstractResourceType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $dataClass
-     * @param array  $validationGroups
-     * @param string $variableName
-     */
-    public function __construct($dataClass, array $validationGroups, $variableName)
-    {
-        parent::__construct($dataClass, $validationGroups);
-
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -45,11 +28,11 @@ class OptionType extends AbstractResourceType
     {
         $builder
             ->add('translations', 'sylius_translations', [
-                'type' => sprintf('sylius_%s_option_translation', $this->variableName),
+                'type' => 'sylius_product_option_translation',
                 'label' => 'sylius.form.option.name',
             ])
             ->add('values', 'collection', [
-                'type' => sprintf('sylius_%s_option_value', $this->variableName),
+                'type' => 'sylius_product_option_value',
                 'allow_add' => true,
                 'allow_delete' => true,
                 'by_reference' => false,
@@ -65,6 +48,6 @@ class OptionType extends AbstractResourceType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_option', $this->variableName);
+        return 'sylius_product_option';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/OptionValueChoiceType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
 use Sylius\Component\Product\Model\OptionInterface;
 use Symfony\Component\Form\AbstractType;
@@ -23,19 +23,6 @@ use Symfony\Component\PropertyAccess\PropertyAccess;
  */
 class OptionValueChoiceType extends AbstractType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $variableName
-     */
-    public function __construct($variableName)
-    {
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -79,6 +66,6 @@ class OptionValueChoiceType extends AbstractType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_option_value_choice', $this->variableName);
+        return 'sylius_product_option_value_choice';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/OptionValueCollectionType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
 use Sylius\Component\Product\Model\OptionInterface;
 use Symfony\Component\Form\AbstractType;
@@ -27,39 +27,17 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 class OptionValueCollectionType extends AbstractType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $variableName
-     */
-    public function __construct($variableName)
-    {
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        if (!isset($options['options']) ||
-            !is_array($options['options']) &&
-            !($options['options'] instanceof \Traversable && $options['options'] instanceof \ArrayAccess)
-        ) {
-            throw new InvalidConfigurationException(
-                'array or (\Traversable and \ArrayAccess) of "Sylius\Component\Product\Model\OptionInterface" must be passed to collection'
-            );
-        }
-
         foreach ($options['options'] as $i => $option) {
             if (!$option instanceof OptionInterface) {
                 throw new InvalidConfigurationException('Each object passed as option list must implement "Sylius\Component\Product\Model\OptionInterface"');
             }
 
-            $builder->add((string) $option->getId(), sprintf('sylius_%s_option_value_choice', $this->variableName), [
+            $builder->add((string) $option->getId(), 'sylius_product_option_value_choice', [
                 'label' => $option->getName() ?: $option->getCode(),
                 'option' => $option,
                 'property_path' => '['.$i.']',
@@ -73,9 +51,8 @@ class OptionValueCollectionType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefaults([
+            ->setRequired('options')
-                'options' => null,
+            ->setAllowedTypes('options', 'array')
-            ])
         ;
     }
 
@@ -84,6 +61,6 @@ class OptionValueCollectionType extends AbstractType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_option_value_collection', $this->variableName);
+        return 'sylius_product_option_value_collection';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/OptionValueTranslationType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -19,22 +19,6 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class OptionValueTranslationType extends AbstractResourceType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $dataClass
-     * @param array $validationGroups
-     * @param string $variableName
-     */
-    public function __construct($dataClass, array $validationGroups, $variableName)
-    {
-        parent::__construct($dataClass, $validationGroups);
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -52,6 +36,6 @@ class OptionValueTranslationType extends AbstractResourceType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_option_value_translation', $this->variableName);
+        return 'sylius_product_option_value_translation';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/OptionValueType.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
 use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
@@ -20,23 +20,6 @@ use Symfony\Component\Form\FormBuilderInterface;
  */
 class OptionValueType extends AbstractResourceType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $dataClass
-     * @param array  $validationGroups
-     * @param string $variableName
-     */
-    public function __construct($dataClass, array $validationGroups, $variableName)
-    {
-        parent::__construct($dataClass, $validationGroups);
-
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -44,7 +27,7 @@ class OptionValueType extends AbstractResourceType
     {
         $builder
             ->add('translations', 'sylius_translations', [
-                'type' => sprintf('sylius_%s_option_value_translation', $this->variableName),
+                'type' => 'sylius_product_option_value_translation',
                 'label' => 'sylius.form.option.name',
             ])
             ->addEventSubscriber(new AddCodeFormSubscriber())
@@ -56,6 +39,6 @@ class OptionValueType extends AbstractResourceType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_option_value', $this->variableName);
+        return 'sylius_product_option_value';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/VariantChoiceType.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
-use Sylius\Bundle\VariationBundle\Form\ChoiceList\VariantChoiceList;
 use Sylius\Component\Product\Model\ProductInterface;
 use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -24,19 +24,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 class VariantChoiceType extends AbstractType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $variableName
-     */
-    public function __construct($variableName)
-    {
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -53,7 +40,7 @@ class VariantChoiceType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $choiceList = function (Options $options) {
-            return new VariantChoiceList($options['variable']);
+            return new ObjectChoiceList($options['product']->getVariants(), 'name', [], null, 'id');
         };
 
         $resolver
@@ -64,9 +51,9 @@ class VariantChoiceType extends AbstractType
                 'choice_list' => $choiceList,
             ])
             ->setRequired([
-                'variable',
+                'product',
             ])
-            ->setAllowedTypes('variable', ProductInterface::class)
+            ->setAllowedTypes('product', ProductInterface::class)
         ;
     }
 
@@ -83,6 +70,6 @@ class VariantChoiceType extends AbstractType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_variant_choice', $this->variableName);
+        return 'sylius_product_variant_choice';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/VariantMatchType.php

@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Form\Type;
+namespace Sylius\Bundle\ProductBundle\Form\Type;
 
 use Gedmo\Sluggable\Util\Urlizer;
-use Sylius\Bundle\VariationBundle\Form\DataTransformer\VariantToCombinationTransformer;
+use Sylius\Bundle\ProductBundle\Form\DataTransformer\VariantToCombinationTransformer;
 use Sylius\Component\Product\Model\ProductInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -23,33 +23,20 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
  */
 class VariantMatchType extends AbstractType
 {
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $variableName
-     */
-    public function __construct($variableName)
-    {
-        $this->variableName = $variableName;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        foreach ($options['variable']->getOptions() as $i => $option) {
+        foreach ($options['product']->getOptions() as $i => $option) {
-            $builder->add($option->getCode(), sprintf('sylius_%s_option_value_choice', $this->variableName), [
+            $builder->add($option->getCode(), 'sylius_product_option_value_choice', [
                 'label' => $option->getName(),
                 'option' => $option,
                 'property_path' => '['.$i.']',
             ]);
         }
 
-        $builder->addModelTransformer(new VariantToCombinationTransformer($options['variable']));
+        $builder->addModelTransformer(new VariantToCombinationTransformer($options['product']));
     }
 
     /**
@@ -58,10 +45,8 @@ class VariantMatchType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setRequired([
+            ->setRequired('product')
-                'variable',
+            ->setAllowedTypes('product', ProductInterface::class)
-            ])
-            ->setAllowedTypes('variable', ProductInterface::class)
         ;
     }
 
@@ -70,6 +55,6 @@ class VariantMatchType extends AbstractType
      */
     public function getName()
     {
-        return sprintf('sylius_%s_variant_match', $this->variableName);
+        return 'sylius_product_variant_match';
     }
 }

src/Sylius/Bundle/ProductBundle/Form/Type/VariantType.php

@@ -11,24 +11,27 @@
 
 namespace Sylius\Bundle\ProductBundle\Form\Type;
 
-use Sylius\Bundle\VariationBundle\Form\Type\VariantType as BaseVariantType;
+use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
+use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
+use Sylius\Bundle\ProductBundle\Form\EventListener\BuildVariantFormSubscriber;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Product variant form type.
- *
  * @author Paweł Jędrzejewski <pawel@sylius.org>
  */
-class VariantType extends BaseVariantType
+class VariantType extends AbstractResourceType
 {
     /**
      * {@inheritdoc}
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        parent::buildForm($builder, $options);
-
         $builder
+            ->add('name', 'text', [
+                'required' => false,
+                'label' => 'sylius.form.variant.name',
+            ])
             ->add('availableOn', 'datetime', [
                 'required' => false,
                 'date_widget' => 'single_text',
@@ -41,6 +44,17 @@ class VariantType extends BaseVariantType
                 'time_widget' => 'single_text',
                 'label' => 'sylius.form.product_variant.available_until',
             ])
+            ->addEventSubscriber(new AddCodeFormSubscriber())
         ;
+
+        $builder->addEventSubscriber(new BuildVariantFormSubscriber($builder->getFormFactory()));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'sylius_product_variant';
     }
 }

src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/Option.orm.xml

@@ -11,8 +11,25 @@
 
 -->
 
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping">
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
+                  xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping"
+>
 
-    <mapped-superclass name="Sylius\Component\Product\Model\Option" table="sylius_product_option" />
+    <mapped-superclass name="Sylius\Component\Product\Model\Option" table="sylius_product_option">
+        <id name="id" column="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="code" column="code" type="string" unique="true" />
+        <field name="createdAt" column="created_at" type="datetime">
+            <gedmo:timestampable on="create"/>
+        </field>
+        <field name="updatedAt" column="updated_at" type="datetime" nullable="true">
+            <gedmo:timestampable on="update"/>
+        </field>
+    </mapped-superclass>
 
 </doctrine-mapping>

src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/OptionTranslation.orm.xml

@@ -13,6 +13,12 @@
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping">
 
-    <mapped-superclass name="Sylius\Component\Product\Model\OptionTranslation" table="sylius_product_option_translation" />
+    <mapped-superclass name="Sylius\Component\Product\Model\OptionTranslation" table="sylius_product_option_translation">
+        <id name="id" column="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="name" column="name" type="string" />
+    </mapped-superclass>
 
 </doctrine-mapping>

src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/OptionValue.orm.xml

@@ -14,6 +14,11 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping">
 
     <mapped-superclass name="Sylius\Component\Product\Model\OptionValue" table="sylius_product_option_value">
+        <id name="id" column="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="code" column="code" type="string" unique="true" />
     </mapped-superclass>
 
 </doctrine-mapping>

src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/OptionValueTranslation.orm.xml

@@ -13,6 +13,12 @@
 
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping">
 
-    <mapped-superclass name="Sylius\Component\Product\Model\OptionValueTranslation" table="sylius_product_option_value_translation" />
+    <mapped-superclass name="Sylius\Component\Product\Model\OptionValueTranslation" table="sylius_product_option_value_translation">
+        <id name="id" column="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="value" column="value" type="string" />
+    </mapped-superclass>
 
 </doctrine-mapping>

src/Sylius/Bundle/ProductBundle/Resources/config/doctrine/model/Variant.orm.xml

@@ -14,9 +14,26 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                                      http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+                                      http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
+                  xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping"
+>
 
     <mapped-superclass name="Sylius\Component\Product\Model\Variant" table="sylius_product_variant">
+        <id name="id" column="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+
+        <field name="code" column="code" type="string" unique="true"  nullable="false"/>
+
+        <field name="name" column="name" type="string" nullable="true" />
+
+        <field name="createdAt" column="created_at" type="datetime">
+            <gedmo:timestampable on="create"/>
+        </field>
+        <field name="updatedAt" column="updated_at" type="datetime" nullable="true">
+            <gedmo:timestampable on="update"/>
+        </field>
+
         <field name="availableOn" column="available_on" type="datetime" nullable="true" />
         <field name="availableUntil" column="available_until" type="datetime" nullable="true" />
     </mapped-superclass>

src/Sylius/Bundle/ProductBundle/Resources/config/driver/doctrine/orm.xml

@@ -18,7 +18,7 @@
 
     <parameters>
         <parameter key="sylius.repository.product_attribute.class">Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeRepository</parameter>
-        <parameter key="sylius.repository.product_option.class">Sylius\Bundle\VariationBundle\Doctrine\ORM\OptionRepository</parameter>
+        <parameter key="sylius.repository.product_option.class">Sylius\Bundle\ProductBundle\Doctrine\ORM\OptionRepository</parameter>
     </parameters>
 
 </container>

src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.Option.yml

@@ -1,3 +1,10 @@
 Sylius\Component\Product\Model\Option:
     exclusion_policy: ALL
     xml_root_name: option
+    properties:
+        code:
+            exopse: true
+            type: string
+        name:
+            expose: true
+            type: string

src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.OptionValue.yml

@@ -1,3 +1,13 @@
 Sylius\Component\Product\Model\OptionValue:
     exclusion_policy: ALL
     xml_root_name: option-value
+    properties:
+        code:
+            expose: true
+            type: string
+        value:
+            expose: true
+            type: string
+    virtual_properties:
+        getName:
+            serialized_name: name

src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.Variant.yml

@@ -1,3 +1,13 @@
 Sylius\Component\Product\Model\Variant:
     exclusion_policy: ALL
     xml_root_name: variant
+    properties:
+        id:
+            expose: true
+            type: integer
+            xml_attribute: true
+        presentation:
+            expose: true
+            type: string
+        options:
+            expose: true

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

@@ -22,6 +22,15 @@
         <parameter key="sylius.validator.product.unique.class">Sylius\Bundle\ProductBundle\Validator\ProductUniqueValidator</parameter>
 
         <parameter key="sylius.form.listener.product_variant_generator.class">Sylius\Bundle\ProductBundle\Form\EventSubscriber\GenerateProductVariantsSubscriber</parameter>
+
+        <parameter key="sylius.event_subscriber.variation.load_metadata.class">Sylius\Bundle\ProductBundle\EventListener\LoadMetadataSubscriber</parameter>
+
+        <parameter key="sylius.validator.variant.unique.class">Sylius\Bundle\ProductBundle\Validator\VariantUniqueValidator</parameter>
+        <parameter key="sylius.validator.variant.combination.class">Sylius\Bundle\ProductBundle\Validator\VariantCombinationValidator</parameter>
+
+        <parameter key="sylius.generator.variant.class">Sylius\Component\Product\Generator\VariantGenerator</parameter>
+
+        <parameter key="sylius.variant_resolver.default.class">Sylius\Component\Product\Resolver\DefaultVariantResolver</parameter>
     </parameters>
 
     <services>
@@ -35,6 +44,28 @@
         <service id="sylius.form.listener.product_variant_generator" class="%sylius.form.listener.product_variant_generator.class%">
             <argument type="service" id="sylius.generator.variant" />
         </service>
+
+        <service id="sylius.event_subscriber.variation.load_metadata" class="%sylius.event_subscriber.variation.load_metadata.class%">
+            <tag name="doctrine.event_subscriber" />
+            <argument>%sylius.variation.variables%</argument>
+        </service>
+
+        <service id="sylius.validator.variant.unique" class="%sylius.validator.variant.unique.class%">
+            <argument type="service" id="sylius.repository.variant" />
+            <tag name="validator.constraint_validator" alias="sylius.validator.variant.unique" />
+        </service>
+        <service id="sylius.validator.variant.combination" class="%sylius.validator.variant.combination.class%">
+            <tag name="validator.constraint_validator" alias="sylius.validator.variant.combination" />
+        </service>
+
+        <service id="sylius.generator.variant" class="%sylius.generator.variant.class%">
+            <argument type="service" id="sylius.factory.product_variant" />
+            <argument type="service" id="sylius.set_builder.cartesian" />
+        </service>
+
+        <service id="sylius.variant_resolver.default" class="%sylius.variant_resolver.default.class%">
+            <tag name="sylius.variant_resolver.default" type="default" />
+        </service>
     </services>
 
 </container>

src/Sylius/Bundle/ProductBundle/Resources/config/validation.xml

@@ -57,4 +57,83 @@
         </property>
     </class>
 
+    <class name="Sylius\Component\Product\Model\Variant">
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">sylius.option.code.not_blank</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <constraint name="Sylius\Bundle\ProductBundle\Validator\Constraint\VariantCombination">
+            <option name="groups">sylius</option>
+        </constraint>
+    </class>
+
+    <class name="Sylius\Component\Product\Model\Option">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">code</option>
+            <option name="message">sylius.option.code.unique</option>
+            <option name="groups">sylius</option>
+        </constraint>
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">sylius.option.code.not_blank</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="values">
+            <constraint name="Valid" />
+            <constraint name="Count">
+                <option name="min">2</option>
+                <option name="minMessage">sylius.option.values.min_count</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="translations">
+            <constraint name="Valid" />
+        </property>
+    </class>
+
+    <class name="Sylius\Component\Product\Model\OptionTranslation">
+        <property name="name">
+            <constraint name="NotBlank">
+                <option name="message">sylius.option.name.not_blank</option>
+                <option name="groups">sylius</option>
+            </constraint>
+            <constraint name="Length">
+                <option name="min">2</option>
+                <option name="minMessage">sylius.option.name.min_length</option>
+                <option name="max">255</option>
+                <option name="maxMessage">sylius.option.name.max_length</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+    </class>
+
+    <class name="Sylius\Component\Product\Model\OptionValue">
+        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
+            <option name="fields">code</option>
+            <option name="message">sylius.option_value.code.unique</option>
+            <option name="groups">sylius</option>
+        </constraint>
+        <property name="code">
+            <constraint name="NotBlank">
+                <option name="message">sylius.option_value.code.not_blank</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+        <property name="translations">
+            <constraint name="Valid" />
+        </property>
+    </class>
+
+    <class name="Sylius\Component\Product\Model\OptionValueTranslation">
+        <property name="value">
+            <constraint name="NotBlank">
+                <option name="message">sylius.option_value.value.not_blank</option>
+                <option name="groups">sylius</option>
+            </constraint>
+        </property>
+    </class>
+
 </constraint-mapping>

src/Sylius/Bundle/ProductBundle/Resources/translations/messages.en.yml

@@ -16,3 +16,11 @@ sylius:
         association:
             type: Association Type
             product: Associated Product
+        variant:
+            name: Name
+        option:
+            name: Name
+            values: Possible values
+        option_value:
+            add_value: Add value
+            value: Value

src/Sylius/Bundle/ProductBundle/Resources/translations/validators.en.yml

@@ -14,3 +14,20 @@ sylius:
         sku:
             not_blank: Please enter variant SKU.
             unique: Variant SKU must be unique.
+        combination: Variant with this option set already exists.
+    option:
+        code:
+           not_blank: Please enter option code.
+           unique: The option with given code already exists.
+        name:
+            not_blank: Please enter option name.
+            min_length: Option name must be at least 1 character long.|Option name must be at least {{ limit }} characters long.
+            max_length: Option name must not be longer than 1 character.|Option name must not be longer than {{ limit }} characters.
+        values:
+            min_count: Please add at least {{ limit }} option value.|Please add at least {{ limit }} option values.
+    option_value:
+        code:
+            not_blank: Please enter option value code.
+            unique: The option value with given code already exists.
+        value:
+            not_blank: Please enter option value.

src/Sylius/Bundle/ProductBundle/Validator/Constraint/VariantCombination.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Validator\Constraint;
+namespace Sylius\Bundle\ProductBundle\Validator\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 

src/Sylius/Bundle/ProductBundle/Validator/Constraint/VariantUnique.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Validator\Constraint;
+namespace Sylius\Bundle\ProductBundle\Validator\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 

src/Sylius/Bundle/ProductBundle/Validator/VariantCombinationValidator.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Validator;
+namespace Sylius\Bundle\ProductBundle\Validator;
 
 use Sylius\Component\Product\Model\ProductInterface;
 use Sylius\Component\Product\Model\VariantInterface;

src/Sylius/Bundle/ProductBundle/Validator/VariantUniqueValidator.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Bundle\VariationBundle\Validator;
+namespace Sylius\Bundle\ProductBundle\Validator;
 
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\Component\Product\Model\VariantInterface;

src/Sylius/Bundle/ProductBundle/spec/EventListener/LoadMetadataSubscriberSpec.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\VariationBundle\EventListener;
+namespace spec\Sylius\Bundle\ProductBundle\EventListener;
 
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
@@ -48,7 +48,7 @@ final class LoadMetadataSubscriberSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\VariationBundle\EventListener\LoadMetadataSubscriber');
+        $this->shouldHaveType('Sylius\Bundle\ProductBundle\EventListener\LoadMetadataSubscriber');
     }
 
     function it_is_a_Doctrine_event_subscriber()

src/Sylius/Bundle/ProductBundle/spec/Form/DataTransformer/VariantToCombinationTransformerSpec.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\VariationBundle\Form\DataTransformer;
+namespace spec\Sylius\Bundle\ProductBundle\Form\DataTransformer;
 
 use Doctrine\Common\Collections\Collection;
 use PhpSpec\ObjectBehavior;
@@ -28,7 +28,7 @@ final class VariantToCombinationTransformerSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\VariationBundle\Form\DataTransformer\VariantToCombinationTransformer');
+        $this->shouldHaveType('Sylius\Bundle\ProductBundle\Form\DataTransformer\VariantToCombinationTransformer');
     }
 
     function it_is_a_form_data_transformer()

src/Sylius/Bundle/ProductBundle/spec/Form/EventListener/BuildVariantFormSubscriberSpec.php

@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\VariationBundle\Form\EventListener;
+namespace spec\Sylius\Bundle\ProductBundle\Form\EventListener;
 
 use PhpSpec\ObjectBehavior;
+use Sylius\Bundle\ProductBundle\Form\EventListener\BuildVariantFormSubscriber;
 use Sylius\Component\Product\Model\OptionInterface;
 use Sylius\Component\Product\Model\OptionValueInterface;
 use Sylius\Component\Product\Model\ProductInterface;
@@ -21,27 +22,30 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 
+/**
+ * @mixin BuildVariantFormSubscriber
+ */
 final class BuildVariantFormSubscriberSpec extends ObjectBehavior
 {
     function let(FormFactoryInterface $factory)
     {
-        $this->beConstructedWith('variable_name', $factory);
+        $this->beConstructedWith($factory);
     }
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\VariationBundle\Form\EventListener\BuildVariantFormSubscriber');
+        $this->shouldHaveType(BuildVariantFormSubscriber::class);
     }
 
     function it_subscribes_to_event()
     {
-        $this::getSubscribedEvents()->shouldReturn(
+        static::getSubscribedEvents()->shouldReturn(
             [FormEvents::PRE_SET_DATA => 'preSetData']
         );
     }
 
     function it_adds_options_on_pre_set_data_event(
-        $factory,
+        FormFactoryInterface $factory,
         FormEvent $event,
         FormInterface $form,
         FormInterface $optionsForm,
@@ -60,7 +64,7 @@ final class BuildVariantFormSubscriberSpec extends ObjectBehavior
 
         $factory->createNamed(
             'options',
-            'sylius_variable_name_option_value_collection',
+            'sylius_product_option_value_collection',
             [$optionValue],
             [
                 'options' => [$options],

src/Sylius/Bundle/ProductBundle/spec/Validator/Constraint/VariantCombinationSpec.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\VariationBundle\Validator\Constraint;
+namespace spec\Sylius\Bundle\ProductBundle\Validator\Constraint;
 
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\Validator\Constraint;
@@ -21,7 +21,7 @@ final class VariantCombinationSpec extends ObjectBehavior
 {
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\VariationBundle\Validator\Constraint\VariantCombination');
+        $this->shouldHaveType('Sylius\Bundle\ProductBundle\Validator\Constraint\VariantCombination');
     }
 
     function it_is_a_validation_constraint()

src/Sylius/Bundle/ProductBundle/spec/Validator/Constraint/VariantUniqueSpec.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\VariationBundle\Validator\Constraint;
+namespace spec\Sylius\Bundle\ProductBundle\Validator\Constraint;
 
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\Validator\Constraint;
@@ -26,7 +26,7 @@ final class VariantUniqueSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\VariationBundle\Validator\Constraint\VariantUnique');
+        $this->shouldHaveType('Sylius\Bundle\ProductBundle\Validator\Constraint\VariantUnique');
     }
 
     function it_is_a_validation_constraint()

src/Sylius/Bundle/ProductBundle/spec/Validator/VariantCombinationValidatorSpec.php

@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\VariationBundle\Validator;
+namespace spec\Sylius\Bundle\ProductBundle\Validator;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\VariationBundle\Validator\Constraint\VariantCombination;
+use Sylius\Bundle\ProductBundle\Validator\Constraint\VariantCombination;
 use Sylius\Component\Product\Model\OptionValueInterface;
 use Sylius\Component\Product\Model\ProductInterface;
 use Sylius\Component\Product\Model\VariantInterface;
@@ -30,7 +30,7 @@ final class VariantCombinationValidatorSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\VariationBundle\Validator\VariantCombinationValidator');
+        $this->shouldHaveType('Sylius\Bundle\ProductBundle\Validator\VariantCombinationValidator');
     }
 
     function it_is_a_constraint_validator()

src/Sylius/Bundle/ProductBundle/spec/Validator/VariantUniqueValidatorSpec.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\VariationBundle\Validator;
+namespace spec\Sylius\Bundle\ProductBundle\Validator;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\VariationBundle\Validator\Constraint\VariantUnique;
+use Sylius\Bundle\ProductBundle\Validator\Constraint\VariantUnique;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\Component\Product\Model\VariantInterface;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -34,7 +34,7 @@ final class VariantUniqueValidatorSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\VariationBundle\Validator\VariantUniqueValidator');
+        $this->shouldHaveType('Sylius\Bundle\ProductBundle\Validator\VariantUniqueValidator');
     }
 
     function it_is_a_constraint_validator()

src/Sylius/Bundle/VariationBundle/.gitignore

@@ -1,5 +0,0 @@
-vendor/
-bin/
-
-composer.phar
-composer.lock

src/Sylius/Bundle/VariationBundle/CHANGELOG.md

@@ -1,6 +0,0 @@
-CHANGELOG
-=========
-
-### v0.10.0
-
-* Initial dev release.

src/Sylius/Bundle/VariationBundle/DependencyInjection/Configuration.php

@@ -1,252 +0,0 @@
-<?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\VariationBundle\DependencyInjection;
-
-use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
-use Sylius\Bundle\ResourceBundle\Form\Type\ResourceChoiceType;
-use Sylius\Bundle\ResourceBundle\Form\Type\ResourceFromIdentifierType;
-use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
-use Sylius\Bundle\VariationBundle\Form\Type\OptionTranslationType;
-use Sylius\Bundle\VariationBundle\Form\Type\OptionType;
-use Sylius\Bundle\VariationBundle\Form\Type\OptionValueTranslationType;
-use Sylius\Bundle\VariationBundle\Form\Type\OptionValueType;
-use Sylius\Bundle\VariationBundle\Form\Type\VariantType;
-use Sylius\Component\Product\Model\OptionValueTranslation;
-use Sylius\Component\Product\Model\OptionValueTranslationInterface;
-use Sylius\Component\Resource\Factory\Factory;
-use Sylius\Component\Resource\Factory\TranslatableFactory;
-use Sylius\Component\Product\Model\OptionTranslation;
-use Sylius\Component\Product\Model\OptionTranslationInterface;
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-/**
- * This class contains the configuration information for the bundle.
- *
- * This information is solely responsible for how the different configuration
- * sections are normalized, and merged.
- *
- * @author Paweł Jędrzejewski <pawel@sylius.org>
- */
-class Configuration implements ConfigurationInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('sylius_variation');
-
-        $rootNode
-            ->addDefaultsIfNotSet()
-            ->children()
-                ->scalarNode('driver')->defaultValue(SyliusResourceBundle::DRIVER_DOCTRINE_ORM)->end()
-            ->end()
-        ;
-
-        $this->addClassesSection($rootNode);
-
-        return $treeBuilder;
-    }
-
-    /**
-     * @param ArrayNodeDefinition $node
-     */
-    private function addClassesSection(ArrayNodeDefinition $node)
-    {
-        $node
-            ->children()
-                ->arrayNode('resources')
-                    ->useAttributeAsKey('name')
-                    ->prototype('array')
-                        ->children()
-                            ->scalarNode('variable')->isRequired()->cannotBeEmpty()->end()
-                            ->arrayNode('variant')
-                                ->isRequired()
-                                ->addDefaultsIfNotSet()
-                                ->children()
-                                    ->variableNode('options')->end()
-                                    ->arrayNode('classes')
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->scalarNode('model')->isRequired()->cannotBeEmpty()->end()
-                                            ->scalarNode('interface')->isRequired()->cannotBeEmpty()->end()
-                                            ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
-                                            ->scalarNode('repository')->cannotBeEmpty()->end()
-                                            ->scalarNode('factory')->defaultValue(Factory::class)->end()
-                                            ->arrayNode('form')
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->scalarNode('default')->defaultValue(VariantType::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('from_identifier')->defaultValue(ResourceFromIdentifierType::class)->cannotBeEmpty()->end()
-                                                ->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                    ->arrayNode('validation_groups')
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->arrayNode('default')
-                                                ->prototype('scalar')->end()
-                                                ->defaultValue(['sylius'])
-                                                ->cannotBeEmpty()
-                                            ->end()
-                                            ->arrayNode('from_identifier')
-                                                ->prototype('scalar')->end()
-                                                ->defaultValue(['sylius'])
-                                                ->cannotBeEmpty()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                            ->arrayNode('option')
-                                ->isRequired()
-                                ->addDefaultsIfNotSet()
-                                ->children()
-                                    ->variableNode('options')->end()
-                                    ->arrayNode('classes')
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->scalarNode('model')->isRequired()->cannotBeEmpty()->end()
-                                            ->scalarNode('interface')->isRequired()->cannotBeEmpty()->end()
-                                            ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
-                                            ->scalarNode('repository')->cannotBeEmpty()->end()
-                                            ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
-                                            ->arrayNode('form')
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->scalarNode('default')->defaultValue(OptionType::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('choice')->defaultValue(ResourceChoiceType::class)->cannotBeEmpty()->end()
-                                                ->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                    ->arrayNode('validation_groups')
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->arrayNode('default')
-                                                ->prototype('scalar')->end()
-                                                ->defaultValue(['sylius'])
-                                                ->cannotBeEmpty()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                    ->arrayNode('translation')
-                                        ->isRequired()
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->variableNode('options')->end()
-                                            ->arrayNode('classes')
-                                                ->isRequired()
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->scalarNode('model')->defaultValue(OptionTranslation::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('interface')->defaultValue(OptionTranslationInterface::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('repository')->cannotBeEmpty()->end()
-                                                    ->scalarNode('factory')->defaultValue(Factory::class)->end()
-                                                    ->arrayNode('form')
-                                                        ->addDefaultsIfNotSet()
-                                                        ->children()
-                                                            ->scalarNode('default')->defaultValue(OptionTranslationType::class)->cannotBeEmpty()->end()
-                                                        ->end()
-                                                    ->end()
-                                                ->end()
-                                            ->end()
-                                            ->arrayNode('validation_groups')
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->arrayNode('default')
-                                                        ->prototype('scalar')->end()
-                                                        ->defaultValue(['sylius'])
-                                                    ->end()
-                                                ->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                            ->arrayNode('option_value')
-                                ->isRequired()
-                                ->addDefaultsIfNotSet()
-                                ->children()
-                                    ->variableNode('options')->end()
-                                    ->arrayNode('classes')
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->scalarNode('model')->isRequired()->cannotBeEmpty()->end()
-                                            ->scalarNode('interface')->isRequired()->cannotBeEmpty()->end()
-                                            ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
-                                            ->scalarNode('repository')->cannotBeEmpty()->cannotBeEmpty()->end()
-                                            ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end()
-                                            ->arrayNode('form')
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->scalarNode('default')->defaultValue(OptionValueType::class)->cannotBeEmpty()->end()
-                                                ->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                    ->arrayNode('validation_groups')
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->arrayNode('default')
-                                                ->prototype('scalar')->end()
-                                                ->defaultValue(['sylius'])
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                    ->arrayNode('translation')
-                                        ->isRequired()
-                                        ->addDefaultsIfNotSet()
-                                        ->children()
-                                            ->variableNode('option_value')->end()
-                                            ->arrayNode('classes')
-                                                ->isRequired()
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->scalarNode('model')->defaultValue(OptionValueTranslation::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('interface')->defaultValue(OptionValueTranslationInterface::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
-                                                    ->scalarNode('repository')->cannotBeEmpty()->end()
-                                                    ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
-                                                    ->arrayNode('form')
-                                                        ->addDefaultsIfNotSet()
-                                                        ->children()
-                                                            ->scalarNode('default')->defaultValue(OptionValueTranslationType::class)->cannotBeEmpty()->end()
-                                                        ->end()
-                                                    ->end()
-                                                ->end()
-                                            ->end()
-                                            ->arrayNode('validation_groups')
-                                                ->addDefaultsIfNotSet()
-                                                ->children()
-                                                    ->arrayNode('default')
-                                                        ->prototype('scalar')->end()
-                                                        ->defaultValue(['sylius'])
-                                                    ->end()
-                                                ->end()
-                                            ->end()
-                                        ->end()
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-        ;
-    }
-}

src/Sylius/Bundle/VariationBundle/DependencyInjection/SyliusVariationExtension.php

@@ -1,144 +0,0 @@
-<?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\VariationBundle\DependencyInjection;
-
-use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
-use Sylius\Bundle\VariationBundle\Form\Type\OptionValueChoiceType;
-use Sylius\Bundle\VariationBundle\Form\Type\OptionValueCollectionType;
-use Sylius\Bundle\VariationBundle\Form\Type\VariantChoiceType;
-use Sylius\Bundle\VariationBundle\Form\Type\VariantMatchType;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-
-/**
- * Archetype extension.
- *
- * @author Paweł Jędrzejewski <pawel@sylius.org>
- */
-class SyliusVariationExtension extends AbstractResourceExtension
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load(array $config, ContainerBuilder $container)
-    {
-        $config = $this->processConfiguration($this->getConfiguration($config, $container), $config);
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-
-        $this->registerResources('sylius', $config['driver'], $this->resolveResources($config['resources'], $container), $container);
-
-        foreach ($config['resources'] as $variable => $parameters) {
-            $this->createvariableServices($container, $variable);
-        }
-
-        foreach ($config['resources'] as $variableName => $variableConfig) {
-            foreach ($variableConfig as $resourceName => $resourceConfig) {
-                if (!is_array($resourceConfig)) {
-                    continue;
-                }
-
-                $formDefinition = $container->getDefinition('sylius.form.type.'.$variableName.'_'.$resourceName);
-                $formDefinition->addArgument($variableName);
-
-                if (isset($resourceConfig['translation'])) {
-                    $formTranslationDefinition = $container->getDefinition('sylius.form.type.'.$variableName.'_'.$resourceName.'_translation');
-                    $formTranslationDefinition->addArgument($variableName);
-                }
-            }
-        }
-
-        $configFiles = [
-            'services.xml',
-        ];
-
-        foreach ($configFiles as $configFile) {
-            $loader->load($configFile);
-        }
-    }
-
-    /**
-     * Resolve resources for every subject.
-     *
-     * @param array $resources
-     * @param ContainerBuilder $container
-     *
-     * @return array
-     */
-    private function resolveResources(array $resources, ContainerBuilder $container)
-    {
-        $variables = [];
-
-        foreach ($resources as $variable => $parameters) {
-            $variables[$variable] = $parameters;
-        }
-
-        $container->setParameter('sylius.variation.variables', $variables);
-
-        $resolvedResources = [];
-
-        foreach ($resources as $variableName => $variableConfig) {
-            foreach ($variableConfig as $resourceName => $resourceConfig) {
-                if (is_array($resourceConfig)) {
-                    $resolvedResources[$variableName.'_'.$resourceName] = $resourceConfig;
-                }
-            }
-        }
-
-        return $resolvedResources;
-    }
-
-    /**
-     * Create services for every variable object.
-     *
-     * @param ContainerBuilder $container
-     * @param string           $variable
-     */
-    private function createVariableServices(ContainerBuilder $container, $variable)
-    {
-        $variantAlias = $variable.'_variant';
-        $optionValueAlias = $variable.'_option_value';
-
-        $variantChoiceFormType = new Definition(VariantChoiceType::class);
-        $variantChoiceFormType
-            ->setArguments([$variable])
-            ->addTag('form.type', ['alias' => sprintf('sylius_%s_choice', $variantAlias)])
-        ;
-
-        $container->setDefinition('sylius.form.type.'.$variantAlias.'_choice', $variantChoiceFormType);
-
-        $variantMatchFormType = new Definition(VariantMatchType::class);
-        $variantMatchFormType
-            ->setArguments([$variable])
-            ->addTag('form.type', ['alias' => sprintf('sylius_%s_match', $variantAlias)])
-        ;
-
-        $container->setDefinition('sylius.form.type.'.$variantAlias.'_match', $variantMatchFormType);
-
-        $optionValueChoiceFormType = new Definition(OptionValueChoiceType::class);
-        $optionValueChoiceFormType
-            ->setArguments([$variable])
-            ->addTag('form.type', ['alias' => 'sylius_'.$optionValueAlias.'_choice'])
-        ;
-
-        $container->setDefinition('sylius.form.type.'.$optionValueAlias.'_choice', $optionValueChoiceFormType);
-
-        $optionValueCollectionFormType = new Definition(OptionValueCollectionType::class);
-        $optionValueCollectionFormType
-            ->setArguments([$variable])
-            ->addTag('form.type', ['alias' => 'sylius_'.$optionValueAlias.'_collection'])
-        ;
-
-        $container->setDefinition('sylius.form.type.'.$optionValueAlias.'_collection', $optionValueCollectionFormType);
-    }
-}

src/Sylius/Bundle/VariationBundle/Form/ChoiceList/VariantChoiceList.php

@@ -1,29 +0,0 @@
-<?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\VariationBundle\Form\ChoiceList;
-
-use Sylius\Component\Product\Model\ProductInterface;
-use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
-
-/**
- * @author Paweł Jędrzejewski <pawel@sylius.org>
- */
-class VariantChoiceList extends ObjectChoiceList
-{
-    /**
-     * @param ProductInterface $variable
-     */
-    public function __construct(ProductInterface $variable)
-    {
-        parent::__construct($variable->getVariants(), 'name', [], null, 'id');
-    }
-}

src/Sylius/Bundle/VariationBundle/Form/Type/VariantType.php

@@ -1,65 +0,0 @@
-<?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\VariationBundle\Form\Type;
-
-use Sylius\Bundle\ResourceBundle\Form\EventSubscriber\AddCodeFormSubscriber;
-use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
-use Sylius\Bundle\VariationBundle\Form\EventListener\BuildVariantFormSubscriber;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-/**
- * @author Paweł Jędrzejewski <pawel@sylius.org>
- */
-class VariantType extends AbstractResourceType
-{
-    /**
-     * @var string
-     */
-    protected $variableName;
-
-    /**
-     * @param string $dataClass
-     * @param array  $validationGroups
-     * @param string $variableName
-     */
-    public function __construct($dataClass, array $validationGroups, $variableName)
-    {
-        parent::__construct($dataClass, $validationGroups);
-
-        $this->variableName = $variableName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('name', 'text', [
-                'required' => false,
-                'label' => 'sylius.form.variant.name',
-            ])
-            ->addEventSubscriber(new AddCodeFormSubscriber())
-        ;
-
-        $builder->addEventSubscriber(new BuildVariantFormSubscriber($this->variableName, $builder->getFormFactory()));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return sprintf('sylius_%s_variant', $this->variableName);
-    }
-}

src/Sylius/Bundle/VariationBundle/README.md

@@ -1,74 +0,0 @@
-SyliusVariationBundle [![Build status...](https://secure.travis-ci.org/Sylius/SyliusVariationBundle.png?branch=master)](http://travis-ci.org/Sylius/SyliusVariationBundle)
-=====================
-
-...
-
-Sylius
-------
-
-**Sylius** - Modern ecommerce for Symfony2. Visit [Sylius.org](http://sylius.org).
-
-[phpspec](http://phpspec.net) examples
---------------------------------------
-
-```bash
-$ composer install
-$ bin/phpspec run -fpretty
-```
-
-Documentation
--------------
-
-Documentation is available on [**docs.sylius.org**](http://docs.sylius.org/en/latest/bundles/SyliusVariationBundle/index.html).
-
-Contributing
-------------
-
-All informations about contributing to Sylius can be found on [this page](http://docs.sylius.org/en/latest/contributing/index.html).
-
-Mailing lists
--------------
-
-### Users
-
-Questions? Feel free to ask on [users mailing list](http://groups.google.com/group/sylius).
-
-### Developers
-
-To contribute and develop this bundle, use the [developers mailing list](http://groups.google.com/group/sylius-dev).
-
-Sylius twitter account
-----------------------
-
-If you want to keep up with updates, [follow the official Sylius account on twitter](http://twitter.com/Sylius).
-
-Bug tracking
-------------
-
-This bundle uses [GitHub issues](https://github.com/Sylius/Sylius/issues).
-If you have found bug, please create an issue.
-
-Versioning
-----------
-
-Releases will be numbered with the format `major.minor.patch`.
-
-And constructed with the following guidelines.
-
-* Breaking backwards compatibility bumps the major.
-* New additions without breaking backwards compatibility bumps the minor.
-* Bug fixes and misc changes bump the patch.
-
-For more information on SemVer, please visit [semver.org website](http://semver.org/).  
-This versioning method is same for all **Sylius** bundles and applications.
-
-MIT License
------------
-
-License can be found [here](https://github.com/Sylius/SyliusVariationBundle/blob/master/Resources/meta/LICENSE).
-
-Authors
--------
-
-The bundle was originally created by [Paweł Jędrzejewski](http://pjedrzejewski.com).
-See the list of [contributors](https://github.com/Sylius/SyliusVariationBundle/contributors).

src/Sylius/Bundle/VariationBundle/Resources/config/app/config.yml

@@ -1,9 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-jms_serializer:
-    metadata:
-        directories:
-            sylius-variation:
-                namespace_prefix: "Sylius\\Component\\Variation"
-                path: "@SyliusVariationBundle/Resources/config/serializer"

src/Sylius/Bundle/VariationBundle/Resources/config/doctrine/model/Option.orm.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- 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.
-
--->
-
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
-                  xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping">
-
-    <mapped-superclass name="Sylius\Component\Product\Model\Option" table="sylius_option">
-        <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
-        </id>
-
-        <field name="code" column="code" type="string" unique="true" />
-        <field name="createdAt" column="created_at" type="datetime">
-            <gedmo:timestampable on="create"/>
-        </field>
-        <field name="updatedAt" column="updated_at" type="datetime" nullable="true">
-            <gedmo:timestampable on="update"/>
-        </field>
-    </mapped-superclass>
-
-</doctrine-mapping>

src/Sylius/Bundle/VariationBundle/Resources/config/doctrine/model/OptionTranslation.orm.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- 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.
-
--->
-
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-
-    <mapped-superclass name="Sylius\Component\Product\Model\OptionTranslation" table="sylius_option_translation">
-        <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
-        </id>
-
-        <field name="name" column="name" type="string" />
-    </mapped-superclass>
-
-</doctrine-mapping>

src/Sylius/Bundle/VariationBundle/Resources/config/doctrine/model/OptionValue.orm.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-
- 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.
-
--->
-
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
->
-
-    <mapped-superclass name="Sylius\Component\Product\Model\OptionValue" table="sylius_option_value">
-        <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
-        </id>
-
-        <field name="code" column="code" type="string" unique="true" />
-    </mapped-superclass>
-
-</doctrine-mapping>

src/Sylius/Bundle/VariationBundle/Resources/config/doctrine/model/OptionValueTranslation.orm.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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.
--->
-
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-
-    <mapped-superclass name="Sylius\Component\Product\Model\OptionValueTranslation"
-                       table="sylius_option_value_translation">
-        <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
-        </id>
-
-        <field name="value" column="value" type="string" />
-    </mapped-superclass>
-
-</doctrine-mapping>

src/Sylius/Bundle/VariationBundle/Resources/config/doctrine/model/Variant.orm.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-
- 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.
-
--->
-
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
-                                  http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"
-                  xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping"
->
-
-    <mapped-superclass name="Sylius\Component\Product\Model\Variant" table="sylius_variant">
-        <id name="id" column="id" type="integer">
-            <generator strategy="AUTO" />
-        </id>
-
-        <field name="code" column="code" type="string" unique="true"  nullable="false"/>
-
-        <field name="name" column="name" type="string" nullable="true" />
-
-        <field name="createdAt" column="created_at" type="datetime">
-            <gedmo:timestampable on="create"/>
-        </field>
-        <field name="updatedAt" column="updated_at" type="datetime" nullable="true">
-            <gedmo:timestampable on="update"/>
-        </field>
-    </mapped-superclass>
-
-</doctrine-mapping>

src/Sylius/Bundle/VariationBundle/Resources/config/serializer/Model.Option.yml

@@ -1,10 +0,0 @@
-Sylius\Component\Product\Model\Option:
-    exclusion_policy: ALL
-    xml_root_name: option
-    properties:
-        code:
-            exopse: true
-            type: string
-        name:
-            expose: true
-            type: string

src/Sylius/Bundle/VariationBundle/Resources/config/serializer/Model.OptionValue.yml

@@ -1,13 +0,0 @@
-Sylius\Component\Product\Model\OptionValue:
-    exclusion_policy: ALL
-    xml_root_name: option-value
-    properties:
-        code:
-            expose: true
-            type: string
-        value:
-            expose: true
-            type: string
-    virtual_properties:
-        getName:
-            serialized_name: name

src/Sylius/Bundle/VariationBundle/Resources/config/serializer/Model.Variant.yml

@@ -1,13 +0,0 @@
-Sylius\Component\Product\Model\Variant:
-    exclusion_policy: ALL
-    xml_root_name: variant
-    properties:
-        id:
-            expose: true
-            type: integer
-            xml_attribute: true
-        presentation:
-            expose: true
-            type: string
-        options:
-            expose: true

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

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- 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.
-
--->
-
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services
-                               http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <parameters>
-        <parameter key="sylius.event_subscriber.variation.load_metadata.class">Sylius\Bundle\VariationBundle\EventListener\LoadMetadataSubscriber</parameter>
-
-        <parameter key="sylius.validator.variant.unique.class">Sylius\Bundle\VariationBundle\Validator\VariantUniqueValidator</parameter>
-        <parameter key="sylius.validator.variant.combination.class">Sylius\Bundle\VariationBundle\Validator\VariantCombinationValidator</parameter>
-
-        <parameter key="sylius.generator.variant.class">Sylius\Component\Product\Generator\VariantGenerator</parameter>
-
-        <parameter key="sylius.variant_resolver.default.class">Sylius\Component\Product\Resolver\DefaultVariantResolver</parameter>
-    </parameters>
-
-    <services>
-        <service id="sylius.event_subscriber.variation.load_metadata" class="%sylius.event_subscriber.variation.load_metadata.class%">
-            <tag name="doctrine.event_subscriber" />
-            <argument>%sylius.variation.variables%</argument>
-        </service>
-
-        <service id="sylius.validator.variant.unique" class="%sylius.validator.variant.unique.class%">
-            <argument type="service" id="sylius.repository.variant" />
-            <tag name="validator.constraint_validator" alias="sylius.validator.variant.unique" />
-        </service>
-        <service id="sylius.validator.variant.combination" class="%sylius.validator.variant.combination.class%">
-            <tag name="validator.constraint_validator" alias="sylius.validator.variant.combination" />
-        </service>
-
-        <service id="sylius.generator.variant" class="%sylius.generator.variant.class%">
-            <argument type="service" id="sylius.factory.product_variant" />
-            <argument type="service" id="sylius.set_builder.cartesian" />
-        </service>
-
-        <service id="sylius.variant_resolver.default" class="%sylius.variant_resolver.default.class%">
-            <tag name="sylius.variant_resolver.default" type="default" />
-        </service>
-    </services>
-
-</container>

src/Sylius/Bundle/VariationBundle/Resources/config/validation.xml

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- 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.
-
--->
-
-<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
-                                        http://symfony.com/schema/dic/services/constraint-mapping-1.0.xsd">
-
-    <class name="Sylius\Component\Product\Model\Variant">
-        <property name="code">
-            <constraint name="NotBlank">
-                <option name="message">sylius.option.code.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <constraint name="Sylius\Bundle\VariationBundle\Validator\Constraint\VariantCombination">
-            <option name="groups">sylius</option>
-        </constraint>
-    </class>
-
-    <class name="Sylius\Component\Product\Model\Option">
-        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
-            <option name="fields">code</option>
-            <option name="message">sylius.option.code.unique</option>
-            <option name="groups">sylius</option>
-        </constraint>
-        <property name="code">
-            <constraint name="NotBlank">
-                <option name="message">sylius.option.code.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <property name="values">
-            <constraint name="Valid" />
-            <constraint name="Count">
-                <option name="min">2</option>
-                <option name="minMessage">sylius.option.values.min_count</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <property name="translations">
-            <constraint name="Valid" />
-        </property>
-    </class>
-
-    <class name="Sylius\Component\Product\Model\OptionTranslation">
-        <property name="name">
-            <constraint name="NotBlank">
-                <option name="message">sylius.option.name.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-            <constraint name="Length">
-                <option name="min">2</option>
-                <option name="minMessage">sylius.option.name.min_length</option>
-                <option name="max">255</option>
-                <option name="maxMessage">sylius.option.name.max_length</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-    </class>
-
-    <class name="Sylius\Component\Product\Model\OptionValue">
-        <constraint name="Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity">
-            <option name="fields">code</option>
-            <option name="message">sylius.option_value.code.unique</option>
-            <option name="groups">sylius</option>
-        </constraint>
-        <property name="code">
-            <constraint name="NotBlank">
-                <option name="message">sylius.option_value.code.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-        <property name="translations">
-            <constraint name="Valid" />
-        </property>
-    </class>
-
-    <class name="Sylius\Component\Product\Model\OptionValueTranslation">
-        <property name="value">
-            <constraint name="NotBlank">
-                <option name="message">sylius.option_value.value.not_blank</option>
-                <option name="groups">sylius</option>
-            </constraint>
-        </property>
-    </class>
-
-</constraint-mapping>

src/Sylius/Bundle/VariationBundle/Resources/meta/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2011-2016 Paweł Jędrzejewski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.ar.yml

@@ -1,11 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: الاسم
-        option:
-            name: الاسم
-        option_value:
-            value: القيمة

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.be.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Імя
-        option:
-            name: Імя
-            values: Магчымыя значэнні
-        option_value:
-            add_value: Дадаць значэнне
-            value: Значэнне

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.bg.yml

@@ -1,10 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        option:
-            values: Възможни стойности
-        option_value:
-            add_value: Добавяне на стойност
-            value: Стойност

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.ca.yml

@@ -1,9 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nom
-        option:
-            name: Nom

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.cs.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Jméno
-        option:
-            name: Jméno
-            values: Možné hodnoty
-        option_value:
-            add_value: Přidání hodnoty
-            value: Hodnota

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.da.yml

@@ -1,11 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Navn
-        option:
-            name: Navn
-        option_value:
-            add_value: Tilføj værdi

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.de.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Name
-        option:
-            name: Name
-            values: Mögliche Werte
-        option_value:
-            add_value: Wert hinzufügen
-            value: Wert

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.de_CH.yml

@@ -1,9 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Name
-        option:
-            name: Name

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.el.yml

@@ -1,9 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Ονομασία
-        option:
-            name: Ονομασία

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.en.yml

@@ -1,10 +0,0 @@
-sylius:
-    form:
-        variant:
-            name: Name
-        option:
-            name: Name
-            values: Possible values
-        option_value:
-            add_value: Add value
-            value: Value

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.es.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nombre
-        option:
-            name: Nombre
-            values: Valores posibles
-        option_value:
-            add_value: Añadir valor
-            value: Valor

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.fa.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: نام
-        option:
-            name: نام
-            values: مقادیر قابل قبول
-        option_value:
-            add_value: افزودن مقدار
-            value: مقدار

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.fr.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nom
-        option:
-            name: Nom
-            values: Valeurs possibles
-        option_value:
-            add_value: Ajouter une valeur
-            value: Valeur

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.hr.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Naziv grupe
-        option:
-            name: Naziv grupe
-            values: Moguće vrijednosti
-        option_value:
-            add_value: Dodaj vrijednost
-            value: Vrijednost

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.hu.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Név
-        option:
-            name: Név
-            values: Lehetséges értékek
-        option_value:
-            add_value: Adja hozzá az értéket
-            value: Érték

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.id.yml

@@ -1,9 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nama
-        option:
-            name: Nama

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.it.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nome
-        option:
-            name: Nome
-            values: Valori possibili
-        option_value:
-            add_value: Aggiungi valore
-            value: Valore

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.ko.yml

@@ -1,7 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        option:
-            values: 예상값

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.lt.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Pavadinimas
-        option:
-            name: Pavadinimas
-            values: Galimos reikšmės
-        option_value:
-            add_value: Pridėti reikšmę
-            value: Reikšmė

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.mk.yml

@@ -1,10 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        option:
-            values: Можни вредности
-        option_value:
-            add_value: Додај вредност
-            value: Вредност

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.nl.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Naam
-        option:
-            name: Naam
-            values: Mogelijke waarden
-        option_value:
-            add_value: Waarde toevoegen
-            value: Waarde

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.no.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Navn
-        option:
-            name: Navn
-            values: Mulige verdier
-        option_value:
-            add_value: Legg til verdi
-            value: Verdi

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.pl.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nazwa
-        option:
-            name: Nazwa
-            values: Możliwe wartości
-        option_value:
-            add_value: Dodaj wartość
-            value: Wartość

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.pt.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nome
-        option:
-            name: Nome
-            values: Valores possíveis
-        option_value:
-            add_value: Adicionar valor
-            value: Valor

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.pt_BR.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nome
-        option:
-            name: Nome
-            values: Valores possíveis
-        option_value:
-            add_value: Adicionar valor
-            value: Valor

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.ro.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Nume
-        option:
-            name: Nume
-            values: Valori posibile
-        option_value:
-            add_value: Adaugă valoare
-            value: Valoare

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.ru.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Название
-        option:
-            name: Название
-            values: Возможные значения
-        option_value:
-            add_value: Добавить значение
-            value: Значение

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.sk.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Názov
-        option:
-            name: Názov
-            values: Možné hodnoty
-        option_value:
-            add_value: Pridať hodnotu
-            value: Hodnota

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.sl.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Ime
-        option:
-            name: Ime
-            values: Možne vrednosti
-        option_value:
-            add_value: Dodajte vrednost
-            value: Vrednost

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.sq.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Emri
-        option:
-            name: Emri
-            values: Vlera të mundshme
-        option_value:
-            add_value: Shto vlerën
-            value: Vlera

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.sr_CS.yml

@@ -1,9 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Ime
-        option:
-            name: Ime

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.sv.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Namn
-        option:
-            name: Namn
-            values: Möjliga värden
-        option_value:
-            add_value: Lägg till värde
-            value: Värde

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.th.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: ชื่อ
-        option:
-            name: ชื่อ
-            values: ค่าที่เป็นไปได้
-        option_value:
-            add_value: เพิ่มค่า
-            value: ค่า

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.tr.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Ad
-        option:
-            name: Ad
-            values: Olası değerler
-        option_value:
-            add_value: Değer ekle
-            value: Değer

src/Sylius/Bundle/VariationBundle/Resources/translations/messages.uk.yml

@@ -1,13 +0,0 @@
-# This file is part of the Sylius package.
-# (c) Paweł Jędrzejewski
-
-sylius:
-    form:
-        variant:
-            name: Ім’я
-        option:
-            name: Ім’я
-            values: Можливих значень
-        option_value:
-            add_value: Додати значення
-            value: Значення