Merge pull request #4 from bourtitom/feat/upgrade-2.x

Author: maximehuran

.github/workflows/recipe.yaml

@@ -2,7 +2,7 @@ name: Flex Recipe
 
 on:
   push:
-    branches: [ master ]
+    branches: [ $default-branch ]
   pull_request:
 
 jobs:
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
-        sylius: ["~1.12.0", "~1.13.0", "1.14.0"]
+        php: ['8.2', '8.3']
+        sylius: ["~2.0.0", "~2.1.0"]
 
     steps:
       - name: Setup PHP

.github/workflows/security.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.2', '8.3']
 
     steps:
       - uses: actions/checkout@v3
@@ -50,4 +50,3 @@ jobs:
         run: composer update --prefer-dist
 
       - uses: symfonycorp/security-checker-action@v4
-

.github/workflows/tests.yaml

@@ -2,7 +2,7 @@ name: Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ $default-branch ]
   pull_request:
 
 jobs:
@@ -14,7 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.2', '8.3']
+        node: ['20']
 
     env:
       SYMFONY_ARGS: --no-tls
@@ -25,7 +26,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: ${{ matrix.node }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -75,5 +76,5 @@ jobs:
       - run: make test.twig
 
       - run: make test.schema
-
+      
       - run: make test.container

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.14.0
+SYLIUS_VERSION=2.1.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console
@@ -74,6 +74,9 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins --json extra.symfony.endpoint '["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master","flex://defaults"]')
 	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
+	# Temporary fix for Sylius 2.1
+	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress api-platform/state)
+	# End Temporary fix for Sylius 2.1
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini
 	(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)
@@ -138,13 +141,13 @@ test.container: ## Lint the symfony container
 	${CONSOLE} lint:container
 
 test.yaml: ## Lint the symfony Yaml files
-	${CONSOLE} lint:yaml ../../src/Resources/config --parse-tags
+	${CONSOLE} lint:yaml ../../config --parse-tags
 
 test.schema: ## Validate MySQL Schema
 	${CONSOLE} doctrine:schema:validate
 
 test.twig: ## Validate Twig templates
-	${CONSOLE} lint:twig --no-debug templates/ ../../src/Resources/views/
+	${CONSOLE} lint:twig --no-debug templates/ ../../templates/
 
 ###
 ### SYLIUS

README.md

@@ -24,9 +24,9 @@ For example, add Google Analytics, Facebook Pixel, or any other tracking script.
 
 | Sylius Version | PHP Version     |
 |----------------|-----------------|
-| 1.12           | 8.1 - 8.2 - 8.3 |
-| 1.13           | 8.1 - 8.2 - 8.3 |
-| 1.14           | 8.1 - 8.2 - 8.3 |
+| 2.0, 2.1       | 8.2 - 8.3       |
+
+ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusScriptsPlugin/tree/1.x) and all 1.x releases.
 
 ## Installation
 

composer.json

@@ -5,9 +5,9 @@
     "description": "Allows you to add JS scripts from the admin panel.",
     "license": "MIT",
     "require": {
-        "monsieurbiz/sylius-settings-plugin": "^1.0.0",
-        "php": "^8.1",
-        "sylius/sylius": ">=1.12 <2.0"
+        "monsieurbiz/sylius-settings-plugin": "^2.0",
+        "php": "^8.2",
+        "sylius/sylius": "~2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.16",
@@ -37,7 +37,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         },
         "symfony": {
             "docker": false,

config/config.yaml

@@ -0,0 +1,3 @@
+imports:
+    - { resource: 'settings.yaml' }
+    - { resource: 'twig_hooks.yaml' }

src/Resources/config/services.yaml renamed to config/services.yaml

@@ -5,9 +5,9 @@ services:
         public: false
 
     MonsieurBiz\SyliusScriptsPlugin\:
-        resource: '../../*'
-        exclude: '../../{Entity,Migrations}'
+        resource: '../src/*'
+        exclude: '../src/{Entity,Migrations}'
 
     MonsieurBiz\SyliusScriptsPlugin\Controller\:
-        resource: '../../Controller'
+        resource: '../src/Controller'
         tags: [ 'controller.service_arguments' ]

src/Resources/config/monsieurbiz/settings.yaml renamed to config/settings.yaml

@@ -4,7 +4,7 @@ monsieurbiz_sylius_settings:
             vendor_name: Monsieur Biz
             plugin_name: monsieurbiz_scripts.settings.scripts.plugin_name
             description: monsieurbiz_scripts.settings.scripts.description
-            icon: js square
+            icon: ix:scripts
             use_locales: true
             classes:
                 form: MonsieurBiz\SyliusScriptsPlugin\Form\Type\Settings\ScriptsType

config/twig_hooks.yaml

@@ -0,0 +1,32 @@
+sylius_twig_hooks:
+    hooks:
+        sylius_shop.base.head:
+            monsieurbiz_scripts_before_head_end:
+                template: '@MonsieurBizSyliusScriptsPlugin/shop/scripts/before_head_end.html.twig'
+                priority: -100
+
+        sylius_shop.base.header:
+            monsieurbiz_scripts_after_body_start:
+                template: '@MonsieurBizSyliusScriptsPlugin/shop/scripts/after_body_start.html.twig'
+                priority: -100
+
+        # Manage after_body_start on checkout
+        sylius_shop.checkout.common.header:
+            monsieurbiz_scripts_after_body_start:
+                template: '@MonsieurBizSyliusScriptsPlugin/shop/scripts/after_body_start.html.twig'
+                priority: -100
+
+        sylius_shop.base#javascripts:
+            monsieurbiz_scripts_before_body_end:
+                template: '@MonsieurBizSyliusScriptsPlugin/shop/scripts/before_body_end.html.twig'
+                priority: -100
+
+        sylius_shop.order.thank_you:
+            monsieurbiz_scripts_checkout_success:
+                template: '@MonsieurBizSyliusScriptsPlugin/shop/scripts/checkout_success.html.twig'
+                priority: -100
+
+        sylius_admin.base#javascripts:
+            monsieurbiz_scripts_admin_javascripts:
+                template: '@MonsieurBizSyliusScriptsPlugin/admin/scripts/javascripts.html.twig'
+                priority: -100