Skip to content

Commit

Permalink
prepare for 10.2 (#164)
Browse files Browse the repository at this point in the history
* prepare for 10.2
* add mapping_types
* adjust docs
  • Loading branch information
solverat authored Oct 17, 2021
1 parent f42b4de commit 91e8517
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ jobs:
matrix:
php: [ 8.0 ]
symfony: [ ^5.3 ]
pimcore: [ ~10.1.0 ]
pimcore: [ ~10.1.0, ~10.2.0 ]
include:
- pimcore: ~10.1.0
template_tag: v10.1.0
- pimcore: ~10.2.0
template_tag: v10.1.4
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# License
Copyright (C) 2018 DACHCOM.DIGITAL
Copyright (C) 2021 DACHCOM.DIGITAL

This software is available under the GNU General Public License version 3 (GPLv3).

Expand Down
2 changes: 1 addition & 1 deletion PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
| Q | A
| ------------- | ---
| Branch? | dev-master for features / 2.8 for bug fixes
| Branch? | dev-master for features / 3.x for bug fixes
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | no
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Toolbox is a Kickstarter for your every day project. It provides some import

| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
|---------|-----------------------------------|----------------------------|--------------|----------------|------------|
| **4.x** | `10.1` | `5.3` | 01.10.2021 | Feature Branch | dev-master |
| **4.x** | `10.1` - `10.2` | `5.3` | 01.10.2021 | Feature Branch | master |
| **3.x** | `6.0` - `6.9` | `3.4`, `^4.4` | 16.07.2019 | Unsupported | 3.x |
| **2.8** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4` | 30.06.2019 | Unsupported | 2.8 |
| **1.8** | `4.0` | -- | 28.04.2017 | Unsupported | pimcore4 |
Expand Down
6 changes: 6 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Upgrade Notes

## Version 4.0.2
- [FEATURE] PIMCORE 10.2 Support

## Version 4.0.1
- [BUGFIX] Fetching edit mode state from editable instead of checking area param

## Migrating from Version 3.x to Version 4.0.0
⚠️ If you're still on version `2.x`, you need to install `3.x` first, then [migrate](https://github.com/dachcom-digital/pimcore-toolbox/blob/3.x/UPGRADE.md) to `3.3`. After that, you're able to update to `^4.0`.

Expand Down
1 change: 0 additions & 1 deletion src/ToolboxBundle/Tool/Install.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ private function installDocumentTypes(): void
{
// get list of types
$list = new DocType\Listing();
$list->getDao()->load();

$skipInstall = false;
$elementName = 'Teaser Snippet';
Expand Down
8 changes: 8 additions & 0 deletions tests/_etc/config/app/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ services:
calls:
- [setContainer, ['@service_container']]

doctrine:
dbal:
connections:
default:
mapping_types:
enum: string
bit: boolean

framework:
profiler:
enabled: true
Expand Down

0 comments on commit 91e8517

Please sign in to comment.