Merge pull request #83 from lanfisis/feat/sylius-2.0

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']
 
     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

.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:

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL := help
 SHELL=/bin/bash
 APP_DIR=tests/Application
-SYLIUS_VERSION=1.14.0
+SYLIUS_VERSION=2.0.0
 SYMFONY=cd ${APP_DIR} && symfony
 COMPOSER=symfony composer
 CONSOLE=${SYMFONY} console

README.md

@@ -7,19 +7,20 @@
 [![Recipe Status](https://img.shields.io/github/actions/workflow/status/monsieurbiz/SyliusCmsPagePlugin/recipe.yaml?branch=master&label=recipes&logo=github)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/actions?query=workflow%3ASecurity)
 [![Security Status](https://img.shields.io/github/actions/workflow/status/monsieurbiz/SyliusCmsPagePlugin/security.yaml?branch=master&label=security&logo=github)](https://github.com/monsieurbiz/SyliusCmsPagePlugin/actions?query=workflow%3ASecurity)
 
-This plugins allows you to add manage CMS pages using the Rich Editor.
+This plugins allows you to add manage CMS pages using the Rich Editor and the Media Manager.
 
-If you want to know more about our editor, see the [Rich Editor Repository](https://github.com/monsieurbiz/SyliusRichEditorPlugin)
+If you want to know more about our editor, see the [Rich Editor Plugin](https://github.com/monsieurbiz/SyliusRichEditorPlugin)  
+If you want to know more about our editor, see the [Media Manager Plugin](https://github.com/monsieurbiz/SyliusMediaManagerPlugin)
 
-![Example of CMS page creation](screenshots/demo.gif)
+![Example of CMS Page display](screenshots/front-example.png)
 
 ## Compatibility
 
 | 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            | 8.2 - 8.3       |
+
+ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusCmsPagePlugin/tree/1.x) and all 1.x releases.
 
 ## Installation
 
@@ -33,6 +34,8 @@ composer config --no-plugins --json extra.symfony.endpoint '["https://api.github
 composer require monsieurbiz/sylius-cms-page-plugin
 ```
 
+If you do not use the recipes : 
+
 Change your `config/bundles.php` file to add the line for the plugin : 
 
 ```php
@@ -58,9 +61,25 @@ monsieurbiz_cms_page_admin:
     resource: "@MonsieurBizSyliusCmsPagePlugin/Resources/config/routing/admin.yaml"
     prefix: /%sylius_admin.path_name%
 
-monsieurbiz_cms_page_shop:
-    resource: "@MonsieurBizSyliusCmsPagePlugin/Resources/config/routing/shop.yaml"
-    prefix: /{_locale}
+# Show page
+monsieurbiz_cms_page_show:
+    path: /{_locale}/{slug}
+    methods: [GET]
+    requirements:
+        slug: .+
+        _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
+    defaults:
+        _controller: monsieurbiz_cms_page.controller.page::showAction
+        _sylius:
+            template: "@MonsieurBizSyliusCmsPagePlugin/shop/page/show.html.twig"
+            repository:
+                method: findOneEnabledAndPublishedBySlugAndChannelCode
+                arguments:
+                    - $slug
+                    - "expr:service('sylius.context.locale').getLocaleCode()"
+                    - "expr:service('sylius.context.channel').getChannel().getCode()"
+                    - "expr:service('monsieurbiz.cms_page.datetime_provider').now()"
+    condition: "not(context.getPathInfo() matches '`^%sylius.security.api_route%`') and context.checkPageSlug(request)"
 ```
 
 ### Migrations
@@ -85,13 +104,13 @@ bin/console doctrine:migrations:migrate
 
 ## Example of complete CMS Page
 
-### Admin form with preview
+### Admin grid
 
-![Admin full form](screenshots/full_back.jpg)
+![Admin grid](screenshots/admin-grid.png)
 
-### Front display
+### Admin form
 
-![Front full display](screenshots/full_front.jpg)
+![Admin form](screenshots/admin-form.png)
 
 ## Create custom elements
 
@@ -100,8 +119,8 @@ In order to do that, you can check the [Rich Editor custom element creation](htt
 
 ## SEO Friendly
 
-You can define for every page the meta title, meta description and meta 
-keywords.
+You can define for every page the meta title, meta description, meta 
+keywords and meta image.
 
 ## Troubleshooting
 

UPGRADE-2.0.md

@@ -0,0 +1,35 @@
+# Upgrade from 1.X to 2.X
+
+In the 2.x we changed the route definition for the shop route.
+
+The file `@MonsieurBizSyliusCmsPagePlugin/Resources/config/routing/shop.yaml` does not exist anymore.
+
+Update the file `config/routes/monsieurbiz_sylius_cms_page_plugin.yaml` : 
+
+```yaml
+monsieurbiz_cms_page_admin:
+    resource: "@MonsieurBizSyliusCmsPagePlugin/Resources/config/routing/admin.yaml"
+    prefix: /%sylius_admin.path_name%
+
+# Show page
+monsieurbiz_cms_page_show:
+    path: /{_locale}/{slug}
+    methods: [GET]
+    requirements:
+        slug: .+
+        _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$
+    defaults:
+        _controller: monsieurbiz_cms_page.controller.page::showAction
+        _sylius:
+            template: "@MonsieurBizSyliusCmsPagePlugin/shop/page/show.html.twig"
+            repository:
+                method: findOneEnabledAndPublishedBySlugAndChannelCode
+                arguments:
+                    - $slug
+                    - "expr:service('sylius.context.locale').getLocaleCode()"
+                    - "expr:service('sylius.context.channel').getChannel().getCode()"
+                    - "expr:service('monsieurbiz.cms_page.datetime_provider').now()"
+    condition: "not(context.getPathInfo() matches '`^%sylius.security.api_route%`') and context.checkPageSlug(request)"
+```
+
+We upgraded also the [Rich Editor to the 3.0 version](https://github.com/monsieurbiz/SyliusRichEditorPlugin/blob/3.x/UPGRADE-3.0.md).  

composer.json

@@ -5,11 +5,10 @@
     "description": "This plugins allows you to add manage CMS pages using the Rich Editor",
     "license": "MIT",
     "require": {
-        "monsieurbiz/sylius-plus-adapter-plugin": "^1.1",
-        "monsieurbiz/sylius-media-manager-plugin": "^1.1",
-        "monsieurbiz/sylius-rich-editor-plugin": "^2.8",
-        "php": "^8.1",
-        "sylius/sylius": ">=1.12 <2.0"
+        "monsieurbiz/sylius-media-manager-plugin": "^2.0",
+        "monsieurbiz/sylius-rich-editor-plugin": "^3.0",
+        "php": "^8.2",
+        "sylius/sylius": "~2.0.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.16",
@@ -39,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         },
         "symfony": {
             "docker": false,