Skip to content

Commit ddc560b

Browse files
authored
Merge pull request #46 from delyriand/feature/sylius-2-0
2 parents 1651601 + 119f9e8 commit ddc560b

34 files changed

+289
-169
lines changed

.github/workflows/recipe.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Flex Recipe
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ $default-branch ]
66
pull_request:
77

88
jobs:
@@ -14,8 +14,8 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php: ['8.1', '8.2', '8.3']
18-
sylius: ["~1.12.0", "~1.13.0", "1.14.0"]
17+
php: ['8.2', '8.3']
18+
sylius: ['~2.0.0']
1919

2020
steps:
2121
- name: Setup PHP

.github/workflows/security.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php: ['8.1', '8.2', '8.3']
16+
php: ['8.2', '8.3']
1717

1818
steps:
1919
- uses: actions/checkout@v3

.github/workflows/tests.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ $default-branch ]
66
pull_request:
77

88
jobs:
@@ -14,7 +14,8 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php: ['8.1', '8.2', '8.3']
17+
php: ['8.2', '8.3']
18+
node: ['20']
1819

1920
env:
2021
SYMFONY_ARGS: --no-tls
@@ -25,7 +26,7 @@ jobs:
2526
- uses: actions/checkout@v2
2627
- uses: actions/setup-node@v2
2728
with:
28-
node-version: '14'
29+
node-version: ${{ matrix.node }}
2930
- name: Setup PHP
3031
uses: shivammathur/setup-php@v2
3132
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.DEFAULT_GOAL := help
22
SHELL=/bin/bash
33
APP_DIR=tests/Application
4-
SYLIUS_VERSION=1.14.0
4+
SYLIUS_VERSION=2.0.0
55
SYMFONY=cd ${APP_DIR} && symfony
66
COMPOSER=symfony composer
77
CONSOLE=${SYMFONY} console

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ This plugins allows you to manage your homepages using the Rich Editor.
1212

1313
If you want to know more about our editor, see the [Rich Editor Repository](https://github.com/monsieurbiz/SyliusRichEditorPlugin)
1414

15-
![Example of homepage edition](screenshots/demo.gif)
16-
1715
## Compatibility
1816

1917
| Sylius Version | PHP Version |
2018
|----------------|-----------------|
21-
| 1.12 | 8.1 - 8.2 - 8.3 |
22-
| 1.13 | 8.1 - 8.2 - 8.3 |
23-
| 1.14 | 8.1 - 8.2 - 8.3 |
19+
| 2.0 | 8.2 - 8.3 |
20+
21+
ℹ️ For Sylius 1.x, see our [1.x branch](https://github.com/monsieurbiz/SyliusHomepagePlugin/tree/1.x) and all 1.x releases.
2422

2523
## Installation
2624

@@ -91,20 +89,24 @@ Then run it :
9189
bin/console doctrine:migrations:migrate
9290
```
9391

94-
## Example of complete homepage
92+
## Example of homepage
93+
94+
### Admin grid
95+
96+
![Admin homepage grid](docs/images/admin_grid.png)
9597

9698
### Admin form with preview
9799

98-
![Admin full form](screenshots/full_back.jpg)
100+
![Admin full form](docs/images/admin_form.png)
99101

100102
### Front display
101103

102-
![Front full display](screenshots/full_front.jpg)
104+
![Front full display](docs/images/front.png)
103105

104106
## Create custom elements
105107

106108
You can customize and create custom elements in your page.
107-
In order to do that, you can check the [Rich Editor custom element creation](https://github.com/monsieurbiz/SyliusRichEditorPlugin#create-your-own-elements)
109+
To do that, you can check the [Rich Editor custom element creation](https://github.com/monsieurbiz/SyliusRichEditorPlugin#create-your-own-elements)
108110

109111
## SEO Friendly
110112

UPGRADE-2.0.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# UPGRADE FROM `1.3` TO `2.0`
2+
3+
- Support of Sylius Plus RBAC is momentarily removed.
4+
- If you've customized the admin form, use twig hooks to add your fields.
5+
(see [Twig Hooks config](src/Resources/config/sylius/twig_hooks.yaml)).
6+
- Template path has changed from `@MonsieurBizSyliusHomepagePlugin/Homepage/index.html.twig` to `@MonsieurBizSyliusHomepagePlugin/shop/homepage/index.html.twig`, particularly in the `monsieurbiz_sylius_homepage_homepage` route.

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
"description": "Add a homepage management to your Sylius using the Rich Editor.",
66
"license": "MIT",
77
"require": {
8-
"monsieurbiz/sylius-plus-adapter-plugin": "^1.1",
9-
"monsieurbiz/sylius-media-manager-plugin": "^1.1",
10-
"monsieurbiz/sylius-rich-editor-plugin": "^2.8",
11-
"php": "^8.1",
12-
"sylius/sylius": ">=1.12 <2.0"
8+
"monsieurbiz/sylius-media-manager-plugin": "^2.0",
9+
"monsieurbiz/sylius-rich-editor-plugin": "^3.0",
10+
"php": "^8.2",
11+
"sylius/sylius": "~2.0.0"
1312
},
1413
"require-dev": {
1514
"friendsofphp/php-cs-fixer": "^3.16",
@@ -39,7 +38,7 @@
3938
},
4039
"extra": {
4140
"branch-alias": {
42-
"dev-master": "1.2-dev"
41+
"dev-master": "2.0-dev"
4342
},
4443
"symfony": {
4544
"docker": false,

docs/images/admin_form.png

5.56 MB
Loading

docs/images/admin_grid.png

182 KB
Loading

docs/images/front.png

6.18 MB
Loading

0 commit comments

Comments
 (0)