From 9db8366e27078208da5c402eb5b5b983596b1bd5 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Thu, 20 Oct 2016 17:39:53 +0200 Subject: [PATCH] Fix YAML deprecations --- app/config/config_test.yml | 2 +- app/config/security.yml | 2 +- .../Resources/config/grids/channel.yml | 8 +-- .../Resources/config/grids/country.yml | 4 +- .../Resources/config/grids/customer.yml | 4 +- .../Resources/config/grids/locale.yml | 4 +- .../Resources/config/grids/order.yml | 20 ++++---- .../Resources/config/grids/product.yml | 4 +- .../config/grids/product_attribute.yml | 2 +- .../config/grids/product_variant.yml | 6 +-- .../Resources/config/grids/promotion.yml | 6 +-- .../Resources/config/grids/route.yml | 2 +- .../Resources/config/grids/tax_rate.yml | 2 +- .../Resources/config/grids/zone.yml | 2 +- .../config/routing/partial/shipment.yml | 2 +- .../config/routing/partial/taxon.yml | 2 +- .../config/routing/product_variant.yml | 18 +++---- .../Resources/config/routing/promotion.yml | 6 +-- .../config/routing/promotion_coupon.yml | 18 +++---- .../Resources/config/routing/route.yml | 2 +- .../config/routing/static_content.yml | 8 +-- .../Resources/config/routing/taxon.yml | 2 +- .../Resources/translations/flashes.en.yml | 20 ++++---- .../test/app/config/parameters.yml.dist | 2 +- .../Resources/config/routing/account.yml | 6 +-- .../Resources/config/routing/cart.yml | 4 +- .../Resources/config/routing/order.yml | 4 +- .../config/routing/partial/payment.yml | 2 +- .../config/routing/static_content.yml | 2 +- .../ORM/authentication/api_administrator.yml | 8 +-- tests/DataFixtures/ORM/resources/checkout.yml | 50 +++++++++---------- .../DataFixtures/ORM/resources/customers.yml | 2 +- tests/DataFixtures/ORM/resources/product.yml | 18 +++---- tests/DataFixtures/ORM/resources/zones.yml | 2 +- 34 files changed, 123 insertions(+), 123 deletions(-) diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 002df58949..05e3395009 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -31,7 +31,7 @@ payum: gateways: paypal_express_checkout: factory: paypal_express_checkout - payum.http_client: @sylius.payum.http_client + payum.http_client: "@sylius.payum.http_client" username: TEST password: TEST signature: TEST diff --git a/app/config/security.yml b/app/config/security.yml index 913305b3e9..95a1241e66 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -52,7 +52,7 @@ security: use_forward: false use_referer: true remember_me: - secret: %secret% + secret: "%secret%" name: APP_REMEMBER_ME lifetime: 31536000 always_remember_me: true diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/channel.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/channel.yml index 2264f8d746..8709a4ab35 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/channel.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/channel.yml @@ -14,26 +14,26 @@ sylius_grid: path: . sortable: code options: - template: @SyliusAdmin/Channel/Grid/Field/code.html.twig + template: "@SyliusAdmin/Channel/Grid/Field/code.html.twig" nameAndDescription: type: twig label: sylius.ui.name path: . sortable: name options: - template: @SyliusAdmin/Grid/Field/nameAndDescription.html.twig + template: "@SyliusAdmin/Grid/Field/nameAndDescription.html.twig" themeName: type: twig label: sylius.ui.theme sortable: ~ options: - template: @SyliusAdmin/Channel/Grid/Field/themeName.html.twig + template: "@SyliusAdmin/Channel/Grid/Field/themeName.html.twig" enabled: type: twig label: sylius.ui.enabled sortable: ~ options: - template: @SyliusAdmin/Grid/Field/enabled.html.twig + template: "@SyliusAdmin/Grid/Field/enabled.html.twig" filters: search: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/country.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/country.yml index badfeebc01..ba87c09180 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/country.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/country.yml @@ -18,13 +18,13 @@ sylius_grid: path: . sortable: code options: - template: @SyliusAdmin/Country/Grid/Field/name.html.twig + template: "@SyliusAdmin/Country/Grid/Field/name.html.twig" enabled: type: twig label: sylius.ui.enabled sortable: ~ options: - template: @SyliusAdmin/Grid/Field/enabled.html.twig + template: "@SyliusAdmin/Grid/Field/enabled.html.twig" filters: code: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml index 06993e7fc3..b920186e18 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml @@ -31,13 +31,13 @@ sylius_grid: label: sylius.ui.enabled path: . options: - template: @SyliusAdmin/Customer/Grid/Field/enabled.html.twig + template: "@SyliusAdmin/Customer/Grid/Field/enabled.html.twig" verified: type: twig label: sylius.ui.verified path: . options: - template: @SyliusAdmin/Customer/Grid/Field/verified.html.twig + template: "@SyliusAdmin/Customer/Grid/Field/verified.html.twig" filters: search: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/locale.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/locale.yml index be6eeb12b4..26980f8a0e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/locale.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/locale.yml @@ -18,13 +18,13 @@ sylius_grid: path: . sortable: code options: - template: @SyliusAdmin/Locale/Grid/Field/name.html.twig + template: "@SyliusAdmin/Locale/Grid/Field/name.html.twig" enabled: type: twig label: sylius.ui.enabled sortable: ~ options: - template: @SyliusAdmin/Grid/Field/enabled.html.twig + template: "@SyliusAdmin/Grid/Field/enabled.html.twig" filters: code: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/order.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/order.yml index 13701f8294..3efdd16a88 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/order.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/order.yml @@ -15,14 +15,14 @@ sylius_grid: label: sylius.ui.channel sortable: ~ options: - template: @SyliusAdmin/Order/Grid/Field/channel.html.twig + template: "@SyliusAdmin/Order/Grid/Field/channel.html.twig" number: type: twig label: sylius.ui.number path: . sortable: ~ options: - template: @SyliusAdmin/Order/Grid/Field/number.html.twig + template: "@SyliusAdmin/Order/Grid/Field/number.html.twig" date: type: datetime label: sylius.ui.date @@ -35,38 +35,38 @@ sylius_grid: label: sylius.ui.customer sortable: customer.lastName options: - template: @SyliusAdmin/Order/Grid/Field/customer.html.twig + template: "@SyliusAdmin/Order/Grid/Field/customer.html.twig" state: type: twig label: sylius.ui.state sortable: ~ options: - template: @SyliusAdmin/Grid/Field/state.html.twig + template: "@SyliusAdmin/Grid/Field/state.html.twig" vars: - labels: @SyliusAdmin/Order/Label/State + labels: "@SyliusAdmin/Order/Label/State" paymentState: type: twig label: sylius.ui.payment_state sortable: ~ options: - template: @SyliusAdmin/Grid/Field/state.html.twig + template: "@SyliusAdmin/Grid/Field/state.html.twig" vars: - labels: @SyliusAdmin/Order/Label/PaymentState + labels: "@SyliusAdmin/Order/Label/PaymentState" shippingState: type: twig label: sylius.ui.shipping_state sortable: ~ options: - template: @SyliusAdmin/Grid/Field/state.html.twig + template: "@SyliusAdmin/Grid/Field/state.html.twig" vars: - labels: @SyliusAdmin/Order/Label/ShippingState + labels: "@SyliusAdmin/Order/Label/ShippingState" total: type: twig label: sylius.ui.total path: . sortable: total options: - template: @SyliusAdmin/Order/Grid/Field/total.html.twig + template: "@SyliusAdmin/Order/Grid/Field/total.html.twig" filters: number: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml index 31d3da5052..7fad917082 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product.yml @@ -16,7 +16,7 @@ sylius_grid: label: sylius.ui.image path: . options: - template: @SyliusAdmin/Product/Grid/Field/image.html.twig + template: "@SyliusAdmin/Product/Grid/Field/image.html.twig" code: type: string label: sylius.ui.code @@ -29,7 +29,7 @@ sylius_grid: type: twig label: sylius.ui.enabled options: - template: @SyliusAdmin/Grid/Field/enabled.html.twig + template: "@SyliusAdmin/Grid/Field/enabled.html.twig" filters: search: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml index 5aea0a961a..bfa68a062f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_attribute.yml @@ -20,7 +20,7 @@ sylius_grid: label: sylius.ui.type sortable: ~ options: - template: @SyliusAdmin/Grid/Field/label.html.twig + template: "@SyliusAdmin/Grid/Field/label.html.twig" filters: code: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_variant.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_variant.yml index 53c7923c46..6fd612968e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_variant.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/product_variant.yml @@ -15,7 +15,7 @@ sylius_grid: path: . label: sylius.ui.name options: - template: @SyliusAdmin/ProductVariant/Grid/Field/name.html.twig + template: "@SyliusAdmin/ProductVariant/Grid/Field/name.html.twig" code: type: string label: sylius.ui.code @@ -24,13 +24,13 @@ sylius_grid: path: price label: sylius.ui.price options: - template: @SyliusAdmin/Grid/Field/money.html.twig + template: "@SyliusAdmin/Grid/Field/money.html.twig" inventory: type: twig path: . label: sylius.ui.inventory options: - template: @SyliusAdmin/ProductVariant/Grid/Field/inventory.html.twig + template: "@SyliusAdmin/ProductVariant/Grid/Field/inventory.html.twig" filters: code: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml index d6f7ec3e43..8ab344a080 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/promotion.yml @@ -14,18 +14,18 @@ sylius_grid: label: sylius.ui.name path: . options: - template: @SyliusAdmin/Grid/Field/nameAndDescription.html.twig + template: "@SyliusAdmin/Grid/Field/nameAndDescription.html.twig" couponBased: type: twig label: sylius.ui.coupons options: - template: @SyliusAdmin/Grid/Field/yesNo.html.twig + template: "@SyliusAdmin/Grid/Field/yesNo.html.twig" usage: type: twig label: sylius.ui.usage path: . options: - template: @SyliusAdmin/Promotion/Grid/Field/usage.html.twig + template: "@SyliusAdmin/Promotion/Grid/Field/usage.html.twig" filters: search: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/route.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/route.yml index 96f3be9ca4..9dae06729e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/route.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/route.yml @@ -13,7 +13,7 @@ sylius_grid: type: twig label: sylius.ui.content options: - template: @SyliusAdmin/Route/Grid/Field/content.html.twig + template: "@SyliusAdmin/Route/Grid/Field/content.html.twig" actions: main: create: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml index 7250f1c831..cba0f43ef7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/tax_rate.yml @@ -26,7 +26,7 @@ sylius_grid: type: twig label: sylius.ui.amount options: - template: @SyliusAdmin/TaxRate/Grid/Field/amount.html.twig + template: "@SyliusAdmin/TaxRate/Grid/Field/amount.html.twig" filters: name: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/zone.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/zone.yml index 03739a831b..d16f69b407 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/zone.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/zone.yml @@ -16,7 +16,7 @@ sylius_grid: type: twig label: sylius.ui.type options: - template: @SyliusAdmin/Grid/Field/label.html.twig + template: "@SyliusAdmin/Grid/Field/label.html.twig" filters: name: type: string diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/shipment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/shipment.yml index b2da4c4fd8..3fd589cbaa 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/shipment.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/shipment.yml @@ -14,7 +14,7 @@ sylius_admin_partial_shipment_ship: transition: ship redirect: referer section: admin - template: @SyliusAdmin/Shipment/Partial/_ship.html.twig + template: "@SyliusAdmin/Shipment/Partial/_ship.html.twig" form: sylius_shipment_ship vars: route: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/taxon.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/taxon.yml index 70fda553a3..ef67e7d803 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/taxon.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/taxon.yml @@ -4,6 +4,6 @@ sylius_admin_partial_taxon_tree: defaults: _controller: sylius.controller.taxon:indexAction _sylius: - template: @SyliusAdmin/Taxon/Partial/_tree.html.twig + template: "@SyliusAdmin/Taxon/Partial/_tree.html.twig" repository: method: findRootNodes diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml index f740a5f87d..365a603b6c 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml @@ -4,7 +4,7 @@ sylius_admin_product_variant_index: defaults: _controller: sylius.controller.product_variant:indexAction _sylius: - template: @SyliusAdmin/Crud/index.html.twig + template: "@SyliusAdmin/Crud/index.html.twig" grid: sylius_admin_product_variant section: admin permission: true @@ -13,7 +13,7 @@ sylius_admin_product_variant_index: parameters: productId: $productId templates: - breadcrumb: @SyliusAdmin/ProductVariant/Index/_breadcrumb.html.twig + breadcrumb: "@SyliusAdmin/ProductVariant/Index/_breadcrumb.html.twig" icon: cubes subheader: sylius.ui.manage_variants @@ -25,9 +25,9 @@ sylius_admin_product_variant_create: _sylius: factory: method: createForProduct - arguments: + arguments: - expr:service('sylius.repository.product').find($productId) - template: @SyliusAdmin/Crud/create.html.twig + template: "@SyliusAdmin/Crud/create.html.twig" grid: sylius_admin_product_variant section: admin redirect: @@ -39,8 +39,8 @@ sylius_admin_product_variant_create: parameters: productId: $productId templates: - form: @SyliusAdmin/ProductVariant/_form.html.twig - breadcrumb: @SyliusAdmin/ProductVariant/Create/_breadcrumb.html.twig + form: "@SyliusAdmin/ProductVariant/_form.html.twig" + breadcrumb: "@SyliusAdmin/ProductVariant/Create/_breadcrumb.html.twig" sylius_admin_product_variant_update: path: /{id}/edit @@ -48,7 +48,7 @@ sylius_admin_product_variant_update: defaults: _controller: sylius.controller.product_variant:updateAction _sylius: - template: @SyliusAdmin/Crud/update.html.twig + template: "@SyliusAdmin/Crud/update.html.twig" grid: sylius_admin_product_variant section: admin redirect: @@ -61,8 +61,8 @@ sylius_admin_product_variant_update: id: $id productId: $productId templates: - form: @SyliusAdmin/ProductVariant/_form.html.twig - breadcrumb: @SyliusAdmin/ProductVariant/Update/_breadcrumb.html.twig + form: "@SyliusAdmin/ProductVariant/_form.html.twig" + breadcrumb: "@SyliusAdmin/ProductVariant/Update/_breadcrumb.html.twig" permission: true sylius_admin_product_variant_delete: diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml index ceed929a3f..39073c7403 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion.yml @@ -11,11 +11,11 @@ sylius_admin_promotion: all: subheader: sylius.ui.manage_discounts_and_promotional_campaigns templates: - form: @SyliusAdmin/Promotion/_form.html.twig + form: "@SyliusAdmin/Promotion/_form.html.twig" index: icon: in cart update: templates: - form: @SyliusAdmin/Promotion/_form.html.twig - toolbar: @SyliusAdmin/Promotion/Update/_toolbar.html.twig + form: "@SyliusAdmin/Promotion/_form.html.twig" + toolbar: "@SyliusAdmin/Promotion/Update/_toolbar.html.twig" type: sylius.resource diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml index 1afcc25351..bd7e1aa80e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml @@ -4,7 +4,7 @@ sylius_admin_promotion_coupon_index: defaults: _controller: sylius.controller.promotion_coupon:indexAction _sylius: - template: @SyliusAdmin/Crud/index.html.twig + template: "@SyliusAdmin/Crud/index.html.twig" grid: sylius_admin_promotion_coupon section: admin permission: true @@ -13,7 +13,7 @@ sylius_admin_promotion_coupon_index: parameters: promotionId: $promotionId templates: - breadcrumb: @SyliusAdmin/PromotionCoupon/Index/_breadcrumb.html.twig + breadcrumb: "@SyliusAdmin/PromotionCoupon/Index/_breadcrumb.html.twig" icon: tags subheader: sylius.ui.manage_discounts_and_promotional_campaigns @@ -27,7 +27,7 @@ sylius_admin_promotion_coupon_create: method: createForPromotion arguments: - expr:service('sylius.repository.promotion').find($promotionId) - template: @SyliusAdmin/Crud/create.html.twig + template: "@SyliusAdmin/Crud/create.html.twig" grid: sylius_admin_promotion_coupon section: admin redirect: @@ -39,8 +39,8 @@ sylius_admin_promotion_coupon_create: parameters: promotionId: $promotionId templates: - form: @SyliusAdmin/PromotionCoupon/_form.html.twig - breadcrumb: @SyliusAdmin/PromotionCoupon/Create/_breadcrumb.html.twig + form: "@SyliusAdmin/PromotionCoupon/_form.html.twig" + breadcrumb: "@SyliusAdmin/PromotionCoupon/Create/_breadcrumb.html.twig" subheader: sylius.ui.manage_discounts_and_promotional_campaigns sylius_admin_promotion_coupon_update: @@ -49,7 +49,7 @@ sylius_admin_promotion_coupon_update: defaults: _controller: sylius.controller.promotion_coupon:updateAction _sylius: - template: @SyliusAdmin/Crud/update.html.twig + template: "@SyliusAdmin/Crud/update.html.twig" grid: sylius_admin_promotion_coupon section: admin redirect: @@ -62,8 +62,8 @@ sylius_admin_promotion_coupon_update: id: $id promotionId: $promotionId templates: - form: @SyliusAdmin/PromotionCoupon/_form.html.twig - breadcrumb: @SyliusAdmin/PromotionCoupon/Update/_breadcrumb.html.twig + form: "@SyliusAdmin/PromotionCoupon/_form.html.twig" + breadcrumb: "@SyliusAdmin/PromotionCoupon/Update/_breadcrumb.html.twig" subheader: sylius.ui.manage_discounts_and_promotional_campaigns sylius_admin_promotion_coupon_generate: @@ -72,7 +72,7 @@ sylius_admin_promotion_coupon_generate: defaults: _controller: sylius.controller.promotion_coupon:generateAction _sylius: - template: @SyliusAdmin/PromotionCoupon/generate.html.twig + template: "@SyliusAdmin/PromotionCoupon/generate.html.twig" section: admin redirect: route: sylius_admin_promotion_coupon_index diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/route.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/route.yml index 7c48feb621..385f435bac 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/route.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/route.yml @@ -20,7 +20,7 @@ sylius_admin_route_update: template: SyliusAdminBundle:Crud:update.html.twig vars: templates: - breadcrumb: @SyliusAdmin/Route/Update/_breadcrumb.html.twig + breadcrumb: "@SyliusAdmin/Route/Update/_breadcrumb.html.twig" requirements: id: ".+" diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/static_content.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/static_content.yml index 8422dc35c6..30e352b2b5 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/static_content.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/static_content.yml @@ -9,7 +9,7 @@ sylius_admin_static_content: vars: all: templates: - form: @SyliusAdmin/StaticContent/_form.html.twig + form: "@SyliusAdmin/StaticContent/_form.html.twig" type: sylius.resource @@ -20,11 +20,11 @@ sylius_admin_static_content_update: _controller: sylius.controller.static_content:updateAction _sylius: section: admin - template: @SyliusAdmin/Crud/update.html.twig + template: "@SyliusAdmin/Crud/update.html.twig" vars: templates: - form: @SyliusAdmin/StaticContent/_form.html.twig - breadcrumb: @SyliusAdmin/StaticContent/Update/_breadcrumb.html.twig + form: "@SyliusAdmin/StaticContent/_form.html.twig" + breadcrumb: "@SyliusAdmin/StaticContent/Update/_breadcrumb.html.twig" requirements: id: ".+" diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml index 55f2326954..54e464c46f 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/taxon.yml @@ -10,7 +10,7 @@ sylius_admin_taxon: all: subheader: sylius.ui.manage_categorization_of_your_products templates: - form: @SyliusAdmin/Taxon/_form.html.twig + form: "@SyliusAdmin/Taxon/_form.html.twig" type: sylius.resource sylius_admin_taxon_index: diff --git a/src/Sylius/Bundle/ResourceBundle/Resources/translations/flashes.en.yml b/src/Sylius/Bundle/ResourceBundle/Resources/translations/flashes.en.yml index 990b7d3480..d6d284d1df 100644 --- a/src/Sylius/Bundle/ResourceBundle/Resources/translations/flashes.en.yml +++ b/src/Sylius/Bundle/ResourceBundle/Resources/translations/flashes.en.yml @@ -3,13 +3,13 @@ sylius: resource: - create: %resource% has been successfully created. - update: %resource% has been successfully updated. - delete: %resource% has been successfully deleted. - move: %resource% has been successfully moved. - generate: %resource%s have been successfully generated. - revert: %resource% has been successfully reverted. - restore_deleted: %resource% has been successfully restored. - enable: %resource% has been successfully enabled. - disable: %resource% has been successfully disabled. - delete_error: Cannot delete, the %resource% is in use. + create: "%resource% has been successfully created." + update: "%resource% has been successfully updated." + delete: "%resource% has been successfully deleted." + move: "%resource% has been successfully moved." + generate: "%resource%s have been successfully generated." + revert: "%resource% has been successfully reverted." + restore_deleted: "%resource% has been successfully restored." + enable: "%resource% has been successfully enabled." + disable: "%resource% has been successfully disabled." + delete_error: "Cannot delete, the %resource% is in use." diff --git a/src/Sylius/Bundle/ResourceBundle/test/app/config/parameters.yml.dist b/src/Sylius/Bundle/ResourceBundle/test/app/config/parameters.yml.dist index 60c6d25514..04ec07be49 100644 --- a/src/Sylius/Bundle/ResourceBundle/test/app/config/parameters.yml.dist +++ b/src/Sylius/Bundle/ResourceBundle/test/app/config/parameters.yml.dist @@ -1,6 +1,6 @@ parameters: database_driver: pdo_sqlite - database_path: %kernel.root_dir%/db.sql + database_path: "%kernel.root_dir%/db.sql" locale: en_US secret: "Three can keep a secret, if two of them are dead." diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/account.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/account.yml index 5fcf2ddca7..cfd0b0eda8 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/account.yml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/account.yml @@ -18,7 +18,7 @@ sylius_shop_account_dashboard: defaults: _controller: sylius.controller.customer:showAction _sylius: - template: @SyliusShop/Account/dashboard.html.twig + template: "@SyliusShop/Account/dashboard.html.twig" repository: method: find arguments: [expr:service('sylius.context.customer').getCustomer()] @@ -29,7 +29,7 @@ sylius_shop_account_profile_update: defaults: _controller: sylius.controller.customer:updateAction _sylius: - template: @SyliusShop/Account/profileUpdate.html.twig + template: "@SyliusShop/Account/profileUpdate.html.twig" form: sylius_customer_profile repository: method: find @@ -44,5 +44,5 @@ sylius_shop_account_change_password: defaults: _controller: sylius.controller.shop_user:changePasswordAction _sylius: - template: @SyliusShop/Account/changePassword.html.twig + template: "@SyliusShop/Account/changePassword.html.twig" redirect: sylius_shop_account_dashboard diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/cart.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/cart.yml index 71909c0914..53c1242e20 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/cart.yml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/cart.yml @@ -7,7 +7,7 @@ sylius_shop_cart_summary: defaults: _controller: sylius.controller.order:summaryAction _sylius: - template: @SyliusShop/Cart/summary.html.twig + template: "@SyliusShop/Cart/summary.html.twig" sylius_shop_cart_save: path: / @@ -15,7 +15,7 @@ sylius_shop_cart_save: defaults: _controller: sylius.controller.order:saveAction _sylius: - template: @SyliusShop/Cart/summary.html.twig + template: "@SyliusShop/Cart/summary.html.twig" redirect: sylius_shop_cart_summary flash: sylius.cart.cart_save_completed diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml index d207673cc0..f4c652aa9a 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/order.yml @@ -22,7 +22,7 @@ sylius_shop_order_thank_you: defaults: _controller: sylius.controller.order:thankYouAction _sylius: - template: @SyliusShop/Order/thankYou.html.twig + template: "@SyliusShop/Order/thankYou.html.twig" sylius_shop_order_show: path: /{tokenValue} @@ -30,7 +30,7 @@ sylius_shop_order_show: defaults: _controller: sylius.controller.order:showAction _sylius: - template: @SyliusShop/Order/show.html.twig + template: "@SyliusShop/Order/show.html.twig" repository: method: findOneBy arguments: [tokenValue: $tokenValue] diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/payment.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/payment.yml index 55fa69f7ff..e7b93af8f7 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/payment.yml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/payment.yml @@ -4,7 +4,7 @@ sylius_shop_partial_payment_change_method: defaults: _controller: sylius.controller.payment:updateAction _sylius: - template: @SyliusShop/Payment/Partial/_changeMethod.html.twig + template: "@SyliusShop/Payment/Partial/_changeMethod.html.twig" form: sylius_checkout_payment redirect: route: sylius_shop_order_pay diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/static_content.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/static_content.yml index 35d0c43e7c..1af7f1b452 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/static_content.yml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/static_content.yml @@ -7,7 +7,7 @@ sylius_shop_static_content_show: defaults: _controller: sylius.controller.static_content:showAction _sylius: - template: @SyliusShop/StaticContent/show.html.twig + template: "@SyliusShop/StaticContent/show.html.twig" repository: method: findPublishedOneByName arguments: [$name] diff --git a/tests/DataFixtures/ORM/authentication/api_administrator.yml b/tests/DataFixtures/ORM/authentication/api_administrator.yml index 4dba4db855..796f6b5b86 100644 --- a/tests/DataFixtures/ORM/authentication/api_administrator.yml +++ b/tests/DataFixtures/ORM/authentication/api_administrator.yml @@ -6,14 +6,14 @@ Sylius\Bundle\ApiBundle\Model\Client: Sylius\Bundle\ApiBundle\Model\AccessToken: oauth_access_token: - client: @oauth - user: @admin + client: "@oauth" + user: "@admin" token: SampleTokenNjZkNjY2MDEwMTAzMDkxMGE0OTlhYzU3NzYyMTE0ZGQ3ODcyMDAwM2EwMDZjNDI5NDlhMDdlMQ Sylius\Bundle\ApiBundle\Model\RefreshToken: oauth_refresh_token: - client: @oauth - user: @admin + client: "@oauth" + user: "@admin" token: SampleRefreshTokenODllODY4ZTQyOThlNWIyMjA1ZDhmZjE1ZDYyMGMwOTUxOWM2NGFmNGRjNjQ2NDBhMDVlNGZjMmQ0YzgyNDM2Ng Sylius\Component\Core\Model\AdminUser: diff --git a/tests/DataFixtures/ORM/resources/checkout.yml b/tests/DataFixtures/ORM/resources/checkout.yml index f99776cb82..3f5523e85f 100644 --- a/tests/DataFixtures/ORM/resources/checkout.yml +++ b/tests/DataFixtures/ORM/resources/checkout.yml @@ -1,20 +1,20 @@ Sylius\Component\Core\Model\Order: order1: - channel: @channel + channel: "@channel" currencyCode: "EUR" - addItem: [@orderItem1] + addItem: ["@orderItem1"] localeCode: "en_US" Sylius\Component\Core\Model\OrderItem: orderItem1: quantity: 1 unitPrice: 2000 - addUnit: [@orderItemUnit1] - variant: @productVariant1 + addUnit: ["@orderItemUnit1"] + variant: "@productVariant1" Sylius\Component\Core\Model\OrderItemUnit: orderItemUnit1: - __construct: [@orderItem1] + __construct: ["@orderItem1"] Sylius\Component\Core\Model\Channel: channel: @@ -22,27 +22,27 @@ Sylius\Component\Core\Model\Channel: name: "Channel" hostname: "localhost" description: "Lorem ipsum" - defaultCurrency: @currency - defaultLocale: @locale + defaultCurrency: "@currency" + defaultLocale: "@locale" color: "black" enabled: true taxCalculationStrategy: "order_items_based" - currencies: [@currency] - shippingMethods: [@ups, @dhl] - paymentMethods: [@cash_on_delivery, @pay_by_check] + currencies: ["@currency"] + shippingMethods: ["@ups", "@dhl"] + paymentMethods: ["@cash_on_delivery", "@pay_by_check"] Sylius\Component\Core\Model\Product: product1: updatedAt: 2015-10-10 currentLocale: en_US - currentTranslation: @productTranslation1 - variants: [@productVariant1] + currentTranslation: "@productTranslation1" + variants: ["@productVariant1"] code: MUG_SW product2: updatedAt: 2015-10-04 currentLocale: en_US - currentTranslation: @productTranslation2 - variants: [@productVariant2] + currentTranslation: "@productTranslation2" + variants: ["@productVariant2"] code: MUG_LOTR Sylius\Component\Core\Model\ProductTranslation: @@ -51,13 +51,13 @@ Sylius\Component\Core\Model\ProductTranslation: locale: en_US name: 'Star wars mug' description: - translatable: @product1 + translatable: "@product1" productTranslation2: slug: mug-lotr locale: en_US name: 'Lotr mug' description: - translatable: @product2 + translatable: "@product2" Sylius\Component\Core\Model\ProductVariant: productVariant1: @@ -74,26 +74,26 @@ Sylius\Component\Core\Model\ShippingMethod: calculator: 'flat_rate' configuration: amount: 10 - zone: @zone_eu + zone: "@zone_eu" currentLocale: en_US - currentTranslation: @upsTranslation1 + currentTranslation: "@upsTranslation1" dhl: code: DHL enabled: true calculator: 'flat_rate' configuration: amount: 20 - zone: @zone_eu + zone: "@zone_eu" Sylius\Component\Shipping\Model\ShippingMethodTranslation: upsTranslation1: name: 'UPS' locale: 'en_US' - translatable: @ups + translatable: "@ups" dhlTranslation1: name: 'DHL' locale: 'en_US' - translatable: @dhl + translatable: "@dhl" Sylius\Component\Payment\Model\PaymentMethod: cash_on_delivery: @@ -101,7 +101,7 @@ Sylius\Component\Payment\Model\PaymentMethod: enabled: true gateway: 'offline' currentLocale: en_US - currentTranslation: @cash_on_delivery_translation1 + currentTranslation: "@cash_on_delivery_translation1" pay_by_check: code: pbc enabled: true @@ -111,11 +111,11 @@ Sylius\Component\Payment\Model\PaymentMethodTranslation: cash_on_delivery_translation1: name: 'Cach on delivery' locale: 'en_US' - translatable: @cash_on_delivery + translatable: "@cash_on_delivery" pay_by_check_translation1: name: 'Pay by check' locale: 'en_US' - translatable: @pay_by_check + translatable: "@pay_by_check" Sylius\Component\Currency\Model\Currency: currency: @@ -133,7 +133,7 @@ Sylius\Component\Addressing\Model\Zone: code: EU name: European Union type: country - members: [@member_NL, @member_BE] + members: ["@member_NL", "@member_BE"] Sylius\Component\Addressing\Model\ZoneMember: member_{NL, BE}: diff --git a/tests/DataFixtures/ORM/resources/customers.yml b/tests/DataFixtures/ORM/resources/customers.yml index a22c82366b..ae2befcc6f 100644 --- a/tests/DataFixtures/ORM/resources/customers.yml +++ b/tests/DataFixtures/ORM/resources/customers.yml @@ -3,7 +3,7 @@ Sylius\Component\Core\Model\ShopUser: plainPassword: '123pa$$word' roles: [ROLE_USER] enabled: true - customer: @customer_ + customer: "@customer_" username: @doe.com usernameCanonical: @doe.com diff --git a/tests/DataFixtures/ORM/resources/product.yml b/tests/DataFixtures/ORM/resources/product.yml index ca7768a652..c29133d397 100644 --- a/tests/DataFixtures/ORM/resources/product.yml +++ b/tests/DataFixtures/ORM/resources/product.yml @@ -13,20 +13,20 @@ Sylius\Component\Core\Model\Product: product1: updatedAt: 2015-10-10 currentLocale: en_US - currentTranslation: @productTranslation1 - variants: [@productVariant1] + currentTranslation: "@productTranslation1" + variants: ["@productVariant1"] code: MUG_SW product2: updatedAt: 2015-10-04 currentLocale: en_US - currentTranslation: @productTranslation2 - variants: [@productVariant2] + currentTranslation: "@productTranslation2" + variants: ["@productVariant2"] code: MUG_LOTR product3: updatedAt: 2015-10-05 currentLocale: en_US - currentTranslation: @productTranslation3 - variants: [@productVariant3] + currentTranslation: "@productTranslation3" + variants: ["@productVariant3"] code: MUG_BB Sylius\Component\Core\Model\ProductTranslation: @@ -35,16 +35,16 @@ Sylius\Component\Core\Model\ProductTranslation: locale: en_US name: 'Star wars mug' description: - translatable: @product1 + translatable: "@product1" productTranslation2: slug: mug-lotr locale: en_US name: 'Lotr mug' description: - translatable: @product2 + translatable: "@product2" productTranslation3: slug: mug-breaking-bad locale: en_US name: 'Breaking bad mug' description: - translatable: @product3 + translatable: "@product3" diff --git a/tests/DataFixtures/ORM/resources/zones.yml b/tests/DataFixtures/ORM/resources/zones.yml index e5e801994a..6e82ced09a 100644 --- a/tests/DataFixtures/ORM/resources/zones.yml +++ b/tests/DataFixtures/ORM/resources/zones.yml @@ -7,4 +7,4 @@ Sylius\Component\Addressing\Model\Zone: code: EU name: European Union type: country - members: [@member_NL, @member_BE] + members: ["@member_NL", "@member_BE"]