Add new exception, translation flashes and refactor

Sylius · Zales0123 · Apr 1, 2019 · Mar 18, 2019 · Mar 19, 2019 · Mar 19, 2019
commit 3228f93c218425e83029c9b9da284a607b90ae8c
diff --git a/...ts/preventing_the_generation_of_products_variants_from_options_without_any_values.feature b/...ts/preventing_the_generation_of_products_variants_from_options_without_any_values.feature
@@ -2,7 +2,7 @@
 Feature: Preventing the generation of product variants from options without any values
     In order to prevented from invalid variant generation
     As an Administrator
-    I want to not be able to generate variants without any option values
+    I want to be prevented from generating of product variants from options without any values
 
     Background:
         Given the store operates on a single channel in "United States"
@@ -12,6 +12,6 @@ Feature: Preventing the generation of product variants from options without any
 
     @ui
     Scenario: Trying to generate a product variant for a product without options values
-        When I want to generate new variants for this product
-        Then It has been impossible to generate
+        When I try to generate new variants for this product
+        Then I should be notified that variants cannot be generated from options without any values
         And I should not be able to generate any variants
diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsContext.php
@@ -378,14 +378,6 @@ public function iShouldBeNotifiedThatPricesInAllChannelsMustBeDefined()
         );
     }
 
-    /**
-     * @Then It has been impossible to generate
-     */
-    public function itHasBeenImpossibleToGenerate(): void
-    {
-        $this->notificationChecker->checkNotification('Cannot generate variants for a product without options values', NotificationType::failure());
-    }
-
     /**
      * @When I save my changes
      * @When I try to save my changes
@@ -415,14 +407,6 @@ public function thisProductVariantShouldBeTracked(ProductVariantInterface $produ
         Assert::true($this->updatePage->isTracked());
     }
 
-    /**
-     * @When /^I want to generate new variants for (this product)$/
-     */
-    public function iWantToGenerateNewVariantsForThisProduct(ProductInterface $product)
-    {
-        $this->generatePage->open(['productId' => $product->getId()]);
-    }
-
     /**
      * @When I generate it
      * @When I try to generate it
@@ -474,9 +458,9 @@ public function iShouldBeNotifiedThatItHasBeenSuccessfullyGenerated()
     }
 
     /**
-     * @Then /^I should not be able to generate any variants$/
+     * @Then I should not be able to generate any variants
      */
-    public function iShouldNotBeAbleToGenerateAnyVariantsToThisProduct()
+    public function iShouldNotBeAbleToGenerateAnyVariants(): void
     {
         Assert::false($this->generatePage->isGenerationPossible());
     }
@@ -526,6 +510,23 @@ public function iShouldBeNotifiedThatOnHandQuantityMustBeGreaterThanTheNumberOfO
         );
     }
 
+    /**
+     * @Then I should be notified that variants cannot be generated from options without any values
+     */
+    public function iShouldBeNotifiedThatVariantsCannotBeGeneratedFromOptionsWithoutAnyValues(): void
+    {
+        $this->notificationChecker->checkNotification('Cannot generate variants for a product without options values', NotificationType::failure());
+    }
+
+    /**
+     * @When /^I want to generate new variants for (this product)$/
+     * @When /^I try to generate new variants for (this product)$/
+     */
+    public function iTryToGenerateNewVariantsForThisProduct(ProductInterface $product): void
+    {
+        $this->generatePage->open(['productId' => $product->getId()]);
+    }
+
     /**
      * @param string $element
      * @param string $message

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/flashes.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/flashes.en.yml
@@ -0,0 +1,6 @@
+# This file is part of the Sylius package.
+# (c) Paweł Jędrzejewski
+
+sylius:
+    product_variant:
+        cannot_generate_variants: 'Cannot generate variants for a product without options values.'
diff --git a/src/Sylius/Bundle/ProductBundle/Form/EventSubscriber/GenerateProductVariantsSubscriber.php b/src/Sylius/Bundle/ProductBundle/Form/EventSubscriber/GenerateProductVariantsSubscriber.php
@@ -53,7 +53,7 @@ public function preSetData(FormEvent $event): void
 
         Assert::isInstanceOf($product, ProductInterface::class);
 
-        try{
+        try {
             $this->generator->generate($product);
         } catch (VariantWithNoOptionsValuesException $exception) {
             $this->session->getFlashBag()->add('error', $exception->getMessage());

diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml
@@ -205,7 +205,7 @@
 
         <service id="sylius.form.event_subscriber.product_variant_generator" class="Sylius\Bundle\ProductBundle\Form\EventSubscriber\GenerateProductVariantsSubscriber">
             <argument type="service" id="sylius.generator.product_variant" />
-            <argument type="service" id="session"/>
+            <argument type="service" id="session" />
         </service>
 
         <service id="sylius.form.type.data_transformer.products_to_product_associations" class="Sylius\Bundle\ProductBundle\Form\DataTransformer\ProductsToProductAssociationsTransformer">

diff --git a/src/Sylius/Component/Resource/Exception/VariantWithNoOptionsValuesException.php b/src/Sylius/Component/Resource/Exception/VariantWithNoOptionsValuesException.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Resource\Exception;
+
+final class VariantWithNoOptionsValuesException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct('sylius.product_variant.cannot_generate_variants');
+    }
+}