hardcode api/v1 + test fix

Sylius · Jan 21, 2021 · b018e29 · b018e29
1 parent c71d11f
commit b018e29
Show file tree

Hide file tree

Showing 23 changed files with 4 additions and 39 deletions.
diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Country.yml b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Country.yml
@@ -25,4 +25,3 @@ Sylius\Component\Addressing\Model\Country:
                 route: sylius_admin_api_country_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Province.yml
@@ -34,14 +34,12 @@ Sylius\Component\Addressing\Model\Province:
                 parameters:
                     countryCode: expr(object.getCountry().getCode())
                     code: expr(object.getCode())
-                    version: 1
             exclusion:
                 groups: [Default, Detailed]
         -   rel: country
             href:
                 route: sylius_admin_api_country_show
                 parameters:
                     code: expr(object.getCountry().getCode())
-                    version: 1
             exclusion:
                 groups: [Detailed]
diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml b/src/Sylius/Bundle/AddressingBundle/Resources/config/serializer/Model.Zone.yml
@@ -41,4 +41,3 @@ Sylius\Component\Addressing\Model\Zone:
                 route: sylius_admin_api_zone_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/routing.yml
@@ -6,4 +6,4 @@ fos_oauth_server_token:
 
 sylius_admin_api:
     resource: "@SyliusAdminApiBundle/Resources/config/routing/main.yml"
-    prefix: /v{version}
+    prefix: /v1
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Channel.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Channel.yml
@@ -15,6 +15,5 @@ Sylius\Component\Core\Model\Channel:
                 route: sylius_admin_api_channel_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
             exclusion:
                 groups: [Default, Detailed, DetailedCart]
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Customer.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Customer.yml
@@ -11,6 +11,5 @@ Sylius\Component\Core\Model\Customer:
                 route: sylius_admin_api_customer_show
                 parameters:
                     id: expr(object.getId())
-                    version: 1
             exclusion:
                 groups: [Default, Detailed, DetailedCart]
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.OrderItem.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.OrderItem.yml
@@ -11,15 +11,13 @@ Sylius\Component\Core\Model\OrderItem:
                 route: sylius_admin_api_order_show
                 parameters:
                     id: expr(object.getOrder().getId())
-                    version: 1
             exclusion:
                 groups: [Default, Detailed, DetailedCart]
         -   rel: product
             href:
                 route: sylius_admin_api_product_show
                 parameters:
                     code: expr(object.getVariant().getProduct().getCode())
-                    version: 1
             exclusion:
                 exclude_if: expr(!object.getVariant())
                 groups: [Default, Detailed, DetailedCart]
@@ -29,7 +27,6 @@ Sylius\Component\Core\Model\OrderItem:
                 parameters:
                     code: expr(object.getVariant().getCode())
                     productCode: expr(object.getVariant().getProduct().getCode())
-                    version: 1
             exclusion:
                 exclude_if: expr(!object.getVariant())
                 groups: [Default, Detailed, DetailedCart]
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Payment.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Payment.yml
@@ -9,20 +9,17 @@ Sylius\Component\Core\Model\Payment:
                 route: sylius_admin_api_order_show
                 parameters:
                     id: expr(object.getOrder().getId())
-                    version: 1
         -   rel: self
             exclusion:
                 exclude_if: expr(!object.getId())
             href:
                 route: sylius_admin_api_payment_show
                 parameters:
                     id: expr(object.getId())
-                    version: 1
         -   rel: payment-method
             exclusion:
                 exclude_if: expr(!object.getMethod())
             href:
                 route: sylius_admin_api_payment_method_show
                 parameters:
                     code: expr(object.getMethod().getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.PaymentMethod.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.PaymentMethod.yml
@@ -11,4 +11,3 @@ Sylius\Component\Core\Model\PaymentMethod:
                 route: sylius_admin_api_payment_method_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Product.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Product.yml
@@ -34,12 +34,10 @@ Sylius\Component\Core\Model\Product:
                 route: sylius_admin_api_product_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
         -   rel: variants
             href:
                 route: sylius_admin_api_product_variant_index
                 parameters:
                     productCode: expr(object.getCode())
-                    version: 1
             exclusion:
                 groups: [Detailed]
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.ProductVariant.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.ProductVariant.yml
@@ -51,12 +51,10 @@ Sylius\Component\Core\Model\ProductVariant:
                 parameters:
                     code: expr(object.getCode())
                     productCode: expr(object.getProduct().getCode())
-                    version: 1
         -   rel: product
             href:
                 route: sylius_admin_api_product_show
                 parameters:
                     code: expr(object.getProduct().getCode())
-                    version: 1
             exclusion:
                 groups: [Detailed]
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Promotion.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Promotion.yml
@@ -12,12 +12,10 @@ Sylius\Component\Core\Model\Promotion:
                 route: sylius_admin_api_promotion_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
         -   rel: coupons
             href:
                 route: sylius_admin_api_promotion_coupon_index
                 parameters:
                     promotionCode: expr(object.getCode())
-                    version: 1
             exclusion:
                 exclude_if: expr(!object.isCouponBased() || !object.getCode())
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.PromotionCoupon.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.PromotionCoupon.yml
@@ -13,12 +13,10 @@ Sylius\Component\Core\Model\PromotionCoupon:
                 parameters:
                     promotionCode: expr(object.getPromotion().getCode())
                     code: expr(object.getCode())
-                    version: 1
         -   rel: promotion
             href:
                 route: sylius_admin_api_promotion_show
                 parameters:
                     code: expr(object.getPromotion().getCode())
-                    version: 1
             exclusion:
                 groups: [Detailed]
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Shipment.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Shipment.yml
@@ -9,20 +9,17 @@ Sylius\Component\Core\Model\Shipment:
                 route: sylius_admin_api_order_show
                 parameters:
                     id: expr(object.getOrder().getId())
-                    version: 1
         -   rel: self
             exclusion:
                 exclude_if: expr(!object.getId())
             href:
                 route: sylius_admin_api_shipment_show
                 parameters:
                     id: expr(object.getId())
-                    version: 1
         -   rel: shipping-method
             exclusion:
                 exclude_if: expr(!object.getMethod())
             href:
                 route: sylius_admin_api_shipping_method_show
                 parameters:
                     code: expr(object.getMethod().getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.ShippingMethod.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.ShippingMethod.yml
@@ -7,12 +7,10 @@ Sylius\Component\Core\Model\ShippingMethod:
                 route: sylius_admin_api_zone_show
                 parameters:
                     code: expr(object.getZone().getCode())
-                    version: 1
                 exclusion:
                     groups: [Detailed]
         -   rel: self
             href:
                 route: sylius_admin_api_shipping_method_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.TaxRate.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.TaxRate.yml
@@ -10,16 +10,13 @@ Sylius\Component\Core\Model\TaxRate:
                 route: sylius_admin_api_tax_rate_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
         -   rel: zone
             href:
                 route: sylius_admin_api_zone_show
                 parameters:
                     code: expr(object.getZone().getCode())
-                    version: 1
         -   rel: category
             href:
                 route: sylius_admin_api_tax_category_show
                 parameters:
                     code: expr(object.getCategory().getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Taxon.yml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/serializer/Model.Taxon.yml
@@ -12,4 +12,3 @@ Sylius\Component\Core\Model\Taxon:
                 route: sylius_admin_api_taxon_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.Currency.yml b/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.Currency.yml
@@ -25,4 +25,3 @@ Sylius\Component\Currency\Model\Currency:
                 route: sylius_admin_api_currency_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.ExchangeRate.yml b/src/Sylius/Bundle/CurrencyBundle/Resources/config/serializer/Model.ExchangeRate.yml
@@ -26,6 +26,5 @@ Sylius\Component\Currency\Model\ExchangeRate:
                 parameters:
                     sourceCurrencyCode: expr(object.getSourceCurrency().getCode())
                     targetCurrencyCode: expr(object.getTargetCurrency().getCode())
-                    version: 1
                 exclusion:
                     groups: [Default, Detailed]
diff --git a/src/Sylius/Bundle/LocaleBundle/Resources/config/serializer/Model.Locale.yml b/src/Sylius/Bundle/LocaleBundle/Resources/config/serializer/Model.Locale.yml
@@ -25,4 +25,3 @@ Sylius\Component\Locale\Model\Locale:
                 route: sylius_admin_api_locale_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAssociationType.yml b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAssociationType.yml
@@ -29,4 +29,3 @@ Sylius\Component\Product\Model\ProductAssociationType:
                 route: sylius_admin_api_product_association_type_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAttribute.yml b/src/Sylius/Bundle/ProductBundle/Resources/config/serializer/Model.ProductAttribute.yml
@@ -13,4 +13,3 @@ Sylius\Component\Product\Model\ProductAttribute:
                 route: sylius_admin_api_product_attribute_show
                 parameters:
                     code: expr(object.getCode())
-                    version: 1
diff --git a/tests/Controller/ProductVariantApiTest.php b/tests/Controller/ProductVariantApiTest.php
@@ -346,8 +346,8 @@ public function it_allows_create_product_variant_with_product_option()
 <<<EOT
         {
             "code": "MONSTER_MUG",
-            "optionValues": { 
-                "MUG_TYPE": "MUG_TYPE_MEDIUM" 
+            "optionValues": {
+                "MUG_TYPE": "MUG_TYPE_MEDIUM"
             }
         }
 EOT;
@@ -423,7 +423,7 @@ public function it_allows_updating_information_about_product_variant()
 <<<EOT
         {
             "code": "NEW_MUG_CODE",
-            "version": $version
+            "version": "$version"
         }
 EOT;
         $this->client->request('PUT', $this->getVariantUrl($product, $productVariant), [], [], static::$authorizedHeaderWithContentType, $data);