[API] Minor fixes according to filtering product variants by option values

GSadee · GSadee · commit 9073bad36ca4 · 2021-03-05T11:10:21.000+01:00
diff --git a/src/Sylius/Behat/Context/Api/Shop/CartContext.php b/src/Sylius/Behat/Context/Api/Shop/CartContext.php
@@ -187,34 +187,6 @@ public function iAddThisProductWithToTheCart(
         $this->cartsClient->executeCustomRequest($request);
     }
 
-    /**
-     * @Given /^(this product) should have ([^"]+) "([^"]+)"$/
-     */
-    public function thisItemShouldHaveOptionValue(ProductInterface $product, string $optionName, string $optionValue): void
-    {
-        $item = $this->sharedStorage->get('item');
-
-        $variantData = json_decode($this->cartsClient->showByIri(urldecode($item['variant']))->getContent(), true, 512, \JSON_THROW_ON_ERROR);
-
-        foreach ($variantData['optionValues'] as $valueIri) {
-            $optionValueData = json_decode($this->cartsClient->showByIri($valueIri)->getContent(), true, 512, \JSON_THROW_ON_ERROR);
-
-            if ($optionValueData['value'] !== $optionValue) {
-                continue;
-            }
-
-            $optionData = json_decode($this->cartsClient->showByIri($optionValueData['option'])->getContent(), true, 512, \JSON_THROW_ON_ERROR);
-
-            if ($optionData['name'] !== $optionName) {
-                continue;
-            }
-
-            return;
-        }
-
-        throw new \DomainException(sprintf('Could not find item with option "%s" set to "%s"', $optionName, $optionValue));
-    }
-
     /**
      * @When /^I change (product "[^"]+") quantity to (\d+) in my (cart)$/
      * @When /^the (?:visitor|customer) change (product "[^"]+") quantity to (\d+) in his (cart)$/
@@ -532,6 +504,34 @@ public function iShouldHaveEmptyCart(string $tokenValue): void
         Assert::same(count($items), 0, 'There should be an empty cart');
     }
 
+    /**
+     * @Then /^(this product) should have ([^"]+) "([^"]+)"$/
+     */
+    public function thisItemShouldHaveOptionValue(ProductInterface $product, string $optionName, string $optionValue): void
+    {
+        $item = $this->sharedStorage->get('item');
+
+        $variantData = json_decode($this->cartsClient->showByIri(urldecode($item['variant']))->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+
+        foreach ($variantData['optionValues'] as $valueIri) {
+            $optionValueData = json_decode($this->cartsClient->showByIri($valueIri)->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+
+            if ($optionValueData['value'] !== $optionValue) {
+                continue;
+            }
+
+            $optionData = json_decode($this->cartsClient->showByIri($optionValueData['option'])->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+
+            if ($optionData['name'] !== $optionName) {
+                continue;
+            }
+
+            return;
+        }
+
+        throw new \DomainException(sprintf('Could not find item with option "%s" set to "%s"', $optionName, $optionValue));
+    }
+
     private function pickupCart(?string $localeCode = null): string
     {
         $this->cartsClient->buildCreateRequest();
diff --git a/src/Sylius/Bundle/ApiBundle/DataProvider/ChannelAwareItemDataProvider.php b/src/Sylius/Bundle/ApiBundle/DataProvider/ChannelAwareItemDataProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\DataProvider;
@@ -12,14 +21,10 @@
 /** @experimental */
 final class ChannelAwareItemDataProvider implements ItemDataProviderInterface
 {
-    /**
-     * @var ItemDataProviderInterface
-     */
+    /** @var ItemDataProviderInterface */
     private $itemDataProvider;
 
-    /**
-     * @var ChannelContextInterface
-     */
+    /** @var ChannelContextInterface */
     private $channelContext;
 
     public function __construct(ItemDataProviderInterface $itemDataProvider, ChannelContextInterface $channelContext)
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/Filter/ProductVariantOptionValueFilter.php b/src/Sylius/Bundle/ApiBundle/Doctrine/Filter/ProductVariantOptionValueFilter.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Sylius\Bundle\ApiBundle\Doctrine\Filter;
@@ -15,15 +24,20 @@
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 use Webmozart\Assert\Assert;
 
+/** @experimental */
 final class ProductVariantOptionValueFilter extends AbstractContextAwareFilter
 {
-    /**
-     * @var IriConverterInterface
-     */
+    /** @var IriConverterInterface */
     private IriConverterInterface $iriConverter;
 
-    public function __construct(IriConverterInterface $iriConverter, ManagerRegistry $managerRegistry, ?RequestStack $requestStack = null, LoggerInterface $logger = null, array $properties = null, NameConverterInterface $nameConverter = null)
-    {
+    public function __construct(
+        IriConverterInterface $iriConverter,
+        ManagerRegistry $managerRegistry,
+        ?RequestStack $requestStack = null,
+        LoggerInterface $logger = null,
+        array $properties = null,
+        NameConverterInterface $nameConverter = null
+    ) {
         parent::__construct($managerRegistry, $requestStack, $logger, $properties, $nameConverter);
 
         $this->iriConverter = $iriConverter;
@@ -49,7 +63,8 @@ protected function filterProperty(
             $parameterName = $queryNameGenerator->generateParameterName($property);
             $queryBuilder
                 ->andWhere(sprintf(':%s MEMBER OF o.optionValues', $parameterName))
-                ->setParameter($parameterName, $optionValue);
+                ->setParameter($parameterName, $optionValue)
+            ;
         }
     }
 
