From 965af42c8c4047aa16322307bd044088ad8b78f5 Mon Sep 17 00:00:00 2001 From: camilleislasse Date: Tue, 13 May 2025 10:23:04 +0200 Subject: [PATCH 1/3] Upgrade v2 without js --- README.md | 38 ++++++++++++++++++ behat.yml.dist | 47 ----------------------- composer.json | 2 +- src/Resources/config/services.yml | 6 +-- src/Resources/views/base.html.twig | 10 ++--- src/Resources/views/translation.html.twig | 7 ++++ 6 files changed, 52 insertions(+), 58 deletions(-) delete mode 100644 behat.yml.dist create mode 100644 src/Resources/views/translation.html.twig diff --git a/README.md b/README.md index 33e827f..f2a441f 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,44 @@ yaroslavche_sylius_translation_plugin: resource: "@YaroslavcheSyliusTranslationPlugin/Resources/config/admin_routing.yml" ``` +Add twig_hook in v2 : + +```yaml +sylius_twig_hooks: + hooks: + 'sylius_admin.base#stylesheets': + app_styles: + template: 'admin/stylesheets.html.twig' + 'sylius_admin.base#javascripts': + app_javascripts: + template: 'admin/javascripts.html.twig' + + 'sylius_shop.base#stylesheets': + app_styles: + template: 'shop/stylesheets.html.twig' + 'sylius_shop.base#javascripts': + app_javascripts: + template: 'shop/javascripts.html.twig' + + 'sylius_admin.translation.index': + sidebar: + template: '@SyliusAdmin/shared/crud/common/sidebar.html.twig' + priority: 200 + navbar: + template: '@SyliusAdmin/shared/crud/common/navbar.html.twig' + priority: 100 + content: + template: '@YaroslavcheSyliusTranslationPlugin/translation.html.twig' + priority: 0 +``` + + + + +``` + + + Install assets and clear cache. ```bash $ yarn build diff --git a/behat.yml.dist b/behat.yml.dist deleted file mode 100644 index 0e34348..0000000 --- a/behat.yml.dist +++ /dev/null @@ -1,47 +0,0 @@ -imports: - - vendor/sylius/sylius/src/Sylius/Behat/Resources/config/suites.yml - - tests/Behat/Resources/suites.yml - -default: - extensions: - Lakion\Behat\MinkDebugExtension: - directory: etc/build - clean_start: false - screenshot: true - - Behat\MinkExtension: - files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/" - base_url: "http://localhost:8080/" - default_session: symfony - javascript_session: chrome - sessions: - symfony: - symfony: ~ - chrome: - selenium2: - browser: chrome - capabilities: - browserName: chrome - browser: chrome - version: "" - marionette: null # https://github.com/Behat/MinkExtension/pull/311 - chrome: - switches: - - "start-fullscreen" - - "start-maximized" - - "no-sandbox" - firefox: - selenium2: - browser: firefox - show_auto: false - - FriendsOfBehat\SymfonyExtension: - bootstrap: tests/Application/config/bootstrap.php - kernel: - class: Tests\Yaroslavche\SyliusTranslationPlugin\Application\Kernel - - FriendsOfBehat\VariadicExtension: ~ - - FriendsOfBehat\SuiteSettingsExtension: - paths: - - "features" diff --git a/composer.json b/composer.json index cbc7dd2..2228d1b 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "license": "MIT", "require": { "php": "^7.2 || ^7.3 || ^8.0", - "sylius/sylius": ">=1.14 <2.0", + "sylius/sylius": "^2.0", "ext-json": "*" }, "require-dev": { diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml index da6261f..c946b69 100644 --- a/src/Resources/config/services.yml +++ b/src/Resources/config/services.yml @@ -26,6 +26,6 @@ services: # controller Yaroslavche\SyliusTranslationPlugin\Controller\TranslationController: - arguments: - $translationService: '@yaroslavche_sylius_translation_plugin_translation_service' - tags: ['controller.service_arguments'] + autowire: true + autoconfigure: true + public: true diff --git a/src/Resources/views/base.html.twig b/src/Resources/views/base.html.twig index a2603a1..bc376a6 100644 --- a/src/Resources/views/base.html.twig +++ b/src/Resources/views/base.html.twig @@ -1,7 +1,4 @@ -{% extends '@SyliusAdmin/layout.html.twig' %} - -{% block title %}Translation | Sylius{% endblock %} - +{% extends '@SyliusAdmin/shared/layout/base.html.twig' %} {% block stylesheets %} {{ parent() }} @@ -10,11 +7,10 @@ {% endblock %} {% block javascripts %} - {{ parent() }} {% include '@YaroslavcheSyliusTranslationPlugin/_javascripts.html.twig' %} {% endblock %} -{% block content %} -
+{% block body %} + {% hook ['sylius_admin.translation.index'] %} {% endblock %} diff --git a/src/Resources/views/translation.html.twig b/src/Resources/views/translation.html.twig new file mode 100644 index 0000000..a6f5e68 --- /dev/null +++ b/src/Resources/views/translation.html.twig @@ -0,0 +1,7 @@ +
+
+
+
+
+
+
\ No newline at end of file From d79ef337310c79b79864fda2d3d36b085e83898f Mon Sep 17 00:00:00 2001 From: camilleislasse Date: Tue, 13 May 2025 10:24:18 +0200 Subject: [PATCH 2/3] Don't delete behat config --- behat.yml.dist | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 behat.yml.dist diff --git a/behat.yml.dist b/behat.yml.dist new file mode 100644 index 0000000..0e34348 --- /dev/null +++ b/behat.yml.dist @@ -0,0 +1,47 @@ +imports: + - vendor/sylius/sylius/src/Sylius/Behat/Resources/config/suites.yml + - tests/Behat/Resources/suites.yml + +default: + extensions: + Lakion\Behat\MinkDebugExtension: + directory: etc/build + clean_start: false + screenshot: true + + Behat\MinkExtension: + files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/" + base_url: "http://localhost:8080/" + default_session: symfony + javascript_session: chrome + sessions: + symfony: + symfony: ~ + chrome: + selenium2: + browser: chrome + capabilities: + browserName: chrome + browser: chrome + version: "" + marionette: null # https://github.com/Behat/MinkExtension/pull/311 + chrome: + switches: + - "start-fullscreen" + - "start-maximized" + - "no-sandbox" + firefox: + selenium2: + browser: firefox + show_auto: false + + FriendsOfBehat\SymfonyExtension: + bootstrap: tests/Application/config/bootstrap.php + kernel: + class: Tests\Yaroslavche\SyliusTranslationPlugin\Application\Kernel + + FriendsOfBehat\VariadicExtension: ~ + + FriendsOfBehat\SuiteSettingsExtension: + paths: + - "features" From 996941ed0a90cfafe6e939463efaddf22ef65f24 Mon Sep 17 00:00:00 2001 From: camilleislasse Date: Tue, 13 May 2025 10:36:00 +0200 Subject: [PATCH 3/3] Fix space --- README.md | 5 ----- src/Resources/views/translation.html.twig | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index f2a441f..3a0238c 100644 --- a/README.md +++ b/README.md @@ -76,11 +76,6 @@ sylius_twig_hooks: - -``` - - - Install assets and clear cache. ```bash $ yarn build diff --git a/src/Resources/views/translation.html.twig b/src/Resources/views/translation.html.twig index a6f5e68..af69a76 100644 --- a/src/Resources/views/translation.html.twig +++ b/src/Resources/views/translation.html.twig @@ -4,4 +4,4 @@
- \ No newline at end of file +