-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from dachcom-digital/p11
Pimcore 11 Support
- Loading branch information
Showing
57 changed files
with
307 additions
and
461 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ jobs: | |
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}" | ||
|
||
PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework" | ||
PIMCORE_CODECEPTION_VERSION: "2.0" | ||
PIMCORE_CODECEPTION_VERSION: "3.0" | ||
|
||
APP_ENV: test | ||
PIMCORE_TEST_DB_DSN: "mysql://test:[email protected]:3306/dachcom_bundle_test" | ||
|
@@ -38,12 +38,12 @@ jobs: | |
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 | ||
strategy: | ||
matrix: | ||
php: [ 8.1 ] | ||
symfony: [ ^5.4 ] | ||
pimcore: [ ~10.6.0 ] | ||
php: [ 8.2 ] | ||
symfony: [ ^6.2 ] | ||
pimcore: [ ~11.0.0 ] | ||
include: | ||
- pimcore: ~10.6.0 | ||
template_tag: v10.2.5 | ||
- pimcore: ~11.0.0 | ||
template_tag: v11.0.0 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ jobs: | |
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}" | ||
|
||
PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework" | ||
PIMCORE_CODECEPTION_VERSION: "2.0" | ||
PIMCORE_CODECEPTION_VERSION: "3.0" | ||
|
||
APP_ENV: test | ||
PIMCORE_TEST_DB_DSN: "mysql://root:[email protected]:3306/dachcom_bundle_test" | ||
|
@@ -37,12 +37,12 @@ jobs: | |
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 | ||
strategy: | ||
matrix: | ||
php: [ 8.1 ] | ||
symfony: [ ^5.4 ] | ||
pimcore: [ ~10.6.0 ] | ||
php: [ 8.2 ] | ||
symfony: [ ^6.2 ] | ||
pimcore: [ ~11.0.0 ] | ||
include: | ||
- pimcore: ~10.6.0 | ||
template_tag: v10.2.5 | ||
- pimcore: ~11.0.0 | ||
template_tag: v11.0.0 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,7 +15,7 @@ jobs: | |
TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}" | ||
|
||
PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework" | ||
PIMCORE_CODECEPTION_VERSION: "2.0" | ||
PIMCORE_CODECEPTION_VERSION: "3.0" | ||
|
||
APP_ENV: test | ||
PIMCORE_TEST_DB_DSN: "mysql://root:[email protected]:3306/dachcom_bundle_test" | ||
|
@@ -37,12 +37,12 @@ jobs: | |
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 | ||
strategy: | ||
matrix: | ||
php: [ 8.1 ] | ||
symfony: [ ^5.4 ] | ||
pimcore: [ ~10.6.0 ] | ||
php: [ 8.2 ] | ||
symfony: [ ^6.2 ] | ||
pimcore: [ ~11.0.0 ] | ||
include: | ||
- pimcore: ~10.6.0 | ||
template_tag: v10.2.5 | ||
- pimcore: ~11.0.0 | ||
template_tag: v11.0.0 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,15 @@ | ||
# Upgrade Notes | ||
-- | ||
|
||
## Version 2.0.3 | ||
- Allow `pelago/emogrifier:^7.0` | ||
- Bump `lorenzo/pinky` to `1.0.9` | ||
|
||
## Version 2.0.2 | ||
- Allow Pimcore 11 | ||
- Fix parsing of variables in links (`<a href="{{ variable }}">link</a>`) | ||
|
||
## Version 2.0.1 | ||
- [ENHANCEMENT] PHP 8.1 compatibility [@scrummer](https://github.com/dachcom-digital/pimcore-emailizr/pull/35) | ||
|
||
## Migrating from Version 1.x to Version 2.0.0 | ||
- Pimcore X support only | ||
- PHP 8.0 support only | ||
## Migrating from Version 2.x to Version 3.0.0 | ||
- Pimcore 11.0 support only | ||
- PHP >= 8.1 support only | ||
- [NEW FEATURE][BC BREAK] We're now using the symfony [inky parser](https://twig.symfony.com/doc/2.x/filters/inky_to_html.html) instead of `lorenzo/pinky` (which will be used by twig, but we want to stick with Symfony's recommended stack). | ||
- replace `{% emailizr_inky %}` with `{% apply inky_to_html %}` | ||
- replace `{% end_emailizr_inky %}` with `{% endapply %}` | ||
- [BC BREAK] `@Emailizr/layout.html.twig` is using inky markup by default | ||
- [BC BREAK] Include path `@EmailizrBundle/Resources/public/[...]` changed to `@EmailizrBundle/public/[...]`. Please change your includes accordingly | ||
|
||
*** | ||
|
||
Emailizr 1.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-emailizr/blob/1.x/UPGRADE.md | ||
Emailizr 2.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-emailizr/blob/2.x/UPGRADE.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
imports: | ||
- { resource: services/*.yaml } |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.