[API][Order] Fix coding standards

Sylius · Nov 2, 2023 · 828cc9d · 828cc9d
1 parent 70a3e91
commit 828cc9d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 26 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingOrdersContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingOrdersContext.php
@@ -355,31 +355,31 @@ public function theFirstOrderShouldHaveNumber(string $number)
     /**
      * @When I specify filter date from as :dateTime
      */
-    public function iSpecifyFilterDateFromAs($dateTime)
+    public function iSpecifyFilterDateFromAs(string $dateTime): void
     {
         $this->client->addFilter('checkoutCompletedAt[after]', $dateTime);
     }
 
     /**
      * @When I specify filter date to as :dateTime
      */
-    public function iSpecifyFilterDateToAs($dateTime)
+    public function iSpecifyFilterDateToAs(string $dateTime): void
     {
         $this->client->addFilter('checkoutCompletedAt[before]', $dateTime);
     }
 
     /**
      * @When I filter
      */
-    public function iFilter()
+    public function iFilter(): void
     {
         $this->client->filter();
     }
 
     /**
      * @Then I should see :count orders in the list
      */
-    public function itShouldHaveAmountOfItemsInTheList($count)
+    public function itShouldHaveAmountOfItemsInTheList(int $count): void
     {
         $numberOfItems = $this->responseChecker->getValue($this->client->getLastResponse(), 'hydra:totalItems');
         Assert::eq($numberOfItems, $count);
@@ -388,15 +388,15 @@ public function itShouldHaveAmountOfItemsInTheList($count)
     /**
      * @Then I should not see an order with :number number
      */
-    public function iShouldNotSeeAnOrderWithNumber($number)
+    public function iShouldNotSeeAnOrderWithNumber(string $number): void
     {
         Assert::false($this->responseChecker->hasItemWithValue($this->client->getLastResponse(), 'number', $number));
     }
 
     /**
      * @When I choose :channel as a channel filter
      */
-    public function iChooseChannelAsAChannelFilter(ChannelInterface $channel)
+    public function iChooseChannelAsAChannelFilter(ChannelInterface $channel): void
     {
         $this->client->addFilter('channel.code', $channel->getCode());
     }
@@ -427,7 +427,7 @@ public function iFilterByProducts(array $products): void
     /**
      * @When I choose :shippingMethod as a shipping method filter
      */
-    public function iChooseMethodAsAShippingMethodFilter(ShippingMethodInterface $shippingMethod)
+    public function iChooseMethodAsAShippingMethodFilter(ShippingMethodInterface $shippingMethod): void
     {
         $this->client->addFilter('shipments.method.code', $shippingMethod->getCode());
     }
@@ -436,33 +436,33 @@ public function iChooseMethodAsAShippingMethodFilter(ShippingMethodInterface $sh
     /**
      * @When I choose :currency as the filter currency
      */
-    public function iChooseAsTheFilterCurrency(CurrencyInterface $currency)
+    public function iChooseAsTheFilterCurrency(CurrencyInterface $currency): void
     {
         $this->client->addFilter('currencyCode', $currency->getCode());
     }
 
     /**
      * @Then I should not see any orders with currency :currency
      */
-    public function iShouldNotSeeAnyOrdersWithCurrency(CurrencyInterface $currency)
+    public function iShouldNotSeeAnyOrdersWithCurrency(CurrencyInterface $currency): void
     {
         Assert::false($this->responseChecker->hasItemWithValue($this->client->getLastResponse(), 'currencyCode', $currency->getCode()));
     }
 
     /**
      * @When I specify filter total being greater than :total
      */
-    public function iSpecifyFilterTotalBeingGreaterThan($total)
+    public function iSpecifyFilterTotalBeingGreaterThan(float $total): void
     {
-        $this->client->addFilter('total[gt]', $total* 100);
+        $this->client->addFilter('total[gt]', (int) ($total * 100));
     }
 
     /**
      * @When I specify filter total being less than :total
      */
-    public function iSpecifyFilterTotalBeingLessThan($total)
+    public function iSpecifyFilterTotalBeingLessThan(float $total): void
     {
-        $this->client->addFilter('total[lt]', $total* 100);
+        $this->client->addFilter('total[lt]', (int) ($total * 100));
     }
 
     /**
@@ -476,7 +476,7 @@ public function iFilterByVariant(ProductVariantInterface $variant): void
 
     /**
      * @When /^I filter by (variants "([^"]+)" and "([^"]+)")$/
-     * @param ProductVariantInterface $variants
+     * @param ProductVariantInterface[] $variants
      */
     public function iFilterByVariants(array $variants): void
     {

diff --git a/src/Sylius/Bundle/ApiBundle/Filter/InclusiveDateRangeFilter.php b/src/Sylius/Bundle/ApiBundle/Filter/InclusiveDateRangeFilter.php
@@ -26,14 +26,12 @@
 final class InclusiveDateRangeFilter implements ContextAwareFilterInterface
 {
     /**
-     * @param ContextAwareFilterInterface $dateFilter
      * @param string[] $properties
      */
     public function __construct(private ContextAwareFilterInterface $dateFilter, private array $properties)
     {
     }
 
-
     /**
      * @param class-string $resourceClass
      * @return array<string, mixed>
@@ -44,12 +42,8 @@ public function getDescription(string $resourceClass): array
     }
 
     /**
-     * @param QueryBuilder $queryBuilder
-     * @param QueryNameGeneratorInterface $queryNameGenerator
-     * @param string $resourceClass
-     * @param string|null $operationName
+     * @param class-string $resourceClass
      * @param array<string, mixed> $context
-     * @return void
      *
      * @throws \Exception
      */
@@ -74,7 +68,7 @@ protected function makeDateInclusive(string $value): string
 
     private function isExclusive(mixed $value): bool
     {
-        if(!$value || !is_string($value)) {
+        if (!$value || !is_string($value)) {
             return false;
         }
 

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml
@@ -23,14 +23,14 @@
                 <attribute name="method">GET</attribute>
                 <attribute name="path">/admin/orders</attribute>
                 <attribute name="filters">
-                    <attribute>sylius.api.order_number_filter</attribute>
-                    <attribute>sylius.api.order_customer_filter</attribute>
+                    <attribute>sylius.api.order_channel_filter</attribute>
                     <attribute>sylius.api.order_channel_order_filter</attribute>
                     <attribute>sylius.api.order_checkout_completed_at_filter</attribute>
-                    <attribute>sylius.api.order_channel_filter</attribute>
+                    <attribute>sylius.api.order_currency_code_filter</attribute>
+                    <attribute>sylius.api.order_customer_filter</attribute>
+                    <attribute>sylius.api.order_number_filter</attribute>
                     <attribute>sylius.api.order_products_filter</attribute>
                     <attribute>sylius.api.order_shipping_method_filter</attribute>
-                    <attribute>sylius.api.order_currency_code_filter</attribute>
                     <attribute>sylius.api.order_total_filter</attribute>
                     <attribute>sylius.api.order_variants_filter</attribute>
                 </attribute>