-
-
Notifications
You must be signed in to change notification settings - Fork 641
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Sylius Recipes Enhancements #1724
Sylius Recipes Enhancements #1724
Conversation
Thanks for the PR 😍 How to test these changes in your application
Diff between recipe versionsIn order to help with the review stage, I'm in charge of computing the diff between the various versions of patched recipes. sylius/invoicing-plugin0.5 vs 1.0diff --git a/sylius/invoicing-plugin/0.5/config/packages/sylius_invoicing.yaml b/sylius/invoicing-plugin/1.0/config/packages/sylius_invoicing.yaml
index 0075ab3b..93b2ba94 100644
--- a/sylius/invoicing-plugin/0.5/config/packages/sylius_invoicing.yaml
+++ b/sylius/invoicing-plugin/1.0/config/packages/sylius_invoicing.yaml
@@ -1,2 +1,2 @@
imports:
- - { resource: "@SyliusInvoicingPlugin/Resources/config/config.yml" }
+ - { resource: "@SyliusInvoicingPlugin/config/config.yaml" }
diff --git a/sylius/invoicing-plugin/0.5/config/routes/sylius_invoicing.yaml b/sylius/invoicing-plugin/1.0/config/routes/sylius_invoicing.yaml
index b8fbd60f..912e9ac3 100644
--- a/sylius/invoicing-plugin/0.5/config/routes/sylius_invoicing.yaml
+++ b/sylius/invoicing-plugin/1.0/config/routes/sylius_invoicing.yaml
@@ -1,9 +1,2 @@
-sylius_invoicing_plugin_admin:
- resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/admin_invoicing.yml"
- prefix: /admin
-
-sylius_invoicing_plugin_shop:
- resource: "@SyliusInvoicingPlugin/Resources/config/app/routing/shop_invoicing.yml"
- prefix: /{_locale}
- requirements:
- _locale: ^[a-z]{2}(?:_[A-Z]{2})?$
+sylius_invoicing:
+ resource: "@SyliusInvoicingPlugin/config/routes.yaml" sylius/paypal-plugin1.7 vs 2.0diff --git a/sylius/paypal-plugin/1.7/config/packages/sylius_paypal.yaml b/sylius/paypal-plugin/2.0/config/packages/sylius_paypal.yaml
index c9d4372e..9a0676b0 100644
--- a/sylius/paypal-plugin/1.7/config/packages/sylius_paypal.yaml
+++ b/sylius/paypal-plugin/2.0/config/packages/sylius_paypal.yaml
@@ -1,2 +1,2 @@
imports:
- - { resource: "@SyliusPayPalPlugin/Resources/config/config.yaml" }
+ - { resource: "@SyliusPayPalPlugin/config/config.yaml" }
diff --git a/sylius/paypal-plugin/1.7/config/routes/sylius_paypal.yaml b/sylius/paypal-plugin/2.0/config/routes/sylius_paypal.yaml
index 91042446..a531c2f6 100644
--- a/sylius/paypal-plugin/1.7/config/routes/sylius_paypal.yaml
+++ b/sylius/paypal-plugin/2.0/config/routes/sylius_paypal.yaml
@@ -1,12 +1,2 @@
-sylius_paypal_admin:
- resource: "@SyliusPayPalPlugin/Resources/config/admin_routing.yml"
- prefix: /%sylius_admin.path_name%
-
-sylius_paypal_shop:
- resource: "@SyliusPayPalPlugin/Resources/config/shop_routing.yaml"
- prefix: /{_locale}
- requirements:
- _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
-
-sylius_paypal_webhook:
- resource: "@SyliusPayPalPlugin/Resources/config/webhook_routing.yaml"
+sylius_paypal:
+ resource: "@SyliusPayPalPlugin/config/routes.yaml"
diff --git a/sylius/paypal-plugin/1.7/manifest.json b/sylius/paypal-plugin/2.0/manifest.json
index a991d882..271c34fd 100644
--- a/sylius/paypal-plugin/1.7/manifest.json
+++ b/sylius/paypal-plugin/2.0/manifest.json
@@ -4,5 +4,14 @@
},
"copy-from-recipe": {
"config/": "%CONFIG_DIR%/"
- }
+ },
+ "add-lines": [
+ {
+ "file": "config/packages/fos_rest.yaml",
+ "position": "after_target",
+ "warn_if_missing": true,
+ "target": "fos_rest:",
+ "content": " ###> sylius/paypal-plugin ###\n exception: true\n view:\n formats:\n json: true\n xml: true\n empty_content: 204\n format_listener:\n rules:\n - { path: '^/api/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }\n - { path: '^/', stop: true }\n ###< sylius/paypal-plugin ###\n"
+ }
+ ]
} |
@Rafikooo please move |
Hey @diimpp, Could you explain why this is important? The reason we proposed combining it into a single file is to prevent potential issues. For example, placing this configuration in a separate file, such as |
3e288ba
to
0266abb
Compare
Sylius PayPal Plugin 1.7
Recipe and Revert Sylius RefundPlugin 0.4
0266abb
to
9162c5c
Compare
Head branch was pushed to by a user without write access
9162c5c
to
b38d6c2
Compare
Merge is blocked due |
Head branch was pushed to by a user without write access
Continuation of: #1723