Skip to content

Commit

Permalink
adjust license (#505)
Browse files Browse the repository at this point in the history
  • Loading branch information
solverat authored Jan 13, 2025
1 parent dceb991 commit cd525e0
Show file tree
Hide file tree
Showing 22 changed files with 235 additions and 356 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.2 ]
symfony: [ ^6.2 ]
pimcore: [ ~11.2.0 ]
php: [ 8.3 ]
symfony: [ ^6.4 ]
pimcore: [ ~11.4.0 ]
include:
- pimcore: ~11.2.0
template_tag: v11.0.0
- pimcore: ~11.4.0
template_tag: 2024.3
steps:
- uses: nanasess/setup-chromedriver@v2
- uses: actions/checkout@v4
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/ecs-fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Coding standard refactor
on:
schedule:
- cron: '0 0 * * SUN'
workflow_dispatch: ~

jobs:
ecs-fix:
runs-on: ubuntu-latest
timeout-minutes: 5
strategy:
fail-fast: false
matrix:
branch: [ 'master' ]
steps:
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3

- name: Composer install
run: composer install --no-interaction --no-scripts

- name: Run ECS
run: |
vendor/bin/ecs check src --fix --config ecs.php
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
commit-message: '[CS] Refactor'
author: DACHCOM Bot <[email protected]>
title: '[CS] Refactor'
body: |
This PR has been generated automatically to fix code-styles
labels: |
Enhancement
branch: coding-standard/refactor-${{ matrix.branch }}
delete-branch: true
base: ${{ matrix.branch }}
117 changes: 0 additions & 117 deletions .github/workflows/ecs.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/php-stan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.2 ]
symfony: [ ^6.2 ]
pimcore: [ ~11.2.0 ]
php: [ 8.3 ]
symfony: [ ^6.4 ]
pimcore: [ ~11.4.0 ]
include:
- pimcore: ~11.2.0
template_tag: v11.0.0
- pimcore: ~11.4.0
template_tag: 2024.3
steps:
- uses: actions/checkout@v4
with:
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ atlassian-ide-plugin.xml
.project
ehthumbs.db
Thumbs.db
Vagrantfile
.vagrant
php-cgi.core
.sass-cache
/vendor/
/composer.lock

# codeception (only stage *.dist.yml config files)
/codeception.yml
Expand Down
14 changes: 7 additions & 7 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
| Q | A |
|------------------|--------|
| Bug report? | yes/no |
| Feature request? | yes/no |
| BC Break report? | yes/no |
| RFC? | yes/no |
| Q | A
| ---------------- | -----
| Bug report? | yes/no
| Feature request? | yes/no
| BC Break report? | yes/no
| RFC? | yes/no

<!--
- Please fill in this template according to your issue.
- For support request or how-tos, visit https://gitter.im/pimcore/pimcore or https://talk.pimcore.org/
- For support request or how-tos, visit the discussions section.
- Otherwise, replace this comment by the description of your issue.
-->
20 changes: 14 additions & 6 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# License
Copyright (C) 2023 DACHCOM.DIGITAL
Copyright (C) DACHCOM.DIGITAL

This software is available under the GNU General Public License version 3 (GPLv3).
This software is available under two different licenses:
* GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
* DACHCOM Commercial License (DCL)

### GNU General Public License version 3 (GPLv3)
If you decide to choose the GPLv3 license, you must comply with the following terms:
The default FormBuilder Bundle license, without a valid DACHCOM Commercial License agreement, is the Open-Source GPLv3 license.

## GNU General Public License version 3 (GPLv3)
If you decide to choose the GPLv3 license, you must comply with the following terms:

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -13,10 +17,14 @@ the Free Software Foundation, either version 3 of the License, or

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

[GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html)
## DACHCOM Commercial License (DCL)
Alternatively, commercial and supported versions of the program - also known as
Commercial Distributions - must be used in accordance with the terms and conditions
contained in a separate written agreement between you and DACHCOM.DIGITAL AG.
For more information about the FormBuilder Bundle Commercial License (DCL) please contact [email protected].
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Pimcore FormBuilder

[![Join the chat at https://gitter.im/pimcore/pimcore](https://img.shields.io/gitter/room/pimcore/pimcore.svg?style=flat-square)](https://gitter.im/pimcore/pimcore)
[![Software License](https://img.shields.io/badge/license-GPLv3-brightgreen.svg?style=flat-square)](LICENSE.md)
[![Software License](https://img.shields.io/badge/license-DCL-white.svg?style=flat-square&color=%23ff5c5c)](LICENSE.md)
[![Latest Release](https://img.shields.io/packagist/v/dachcom-digital/formbuilder.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/formbuilder)
[![Tests](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-formbuilder/.github/workflows/codeception.yml?branch=master&style=flat-square&logo=github&label=codeception)](https://github.com/dachcom-digital/pimcore-formbuilder/actions?query=workflow%3ACodeception+branch%3Amaster)
[![PhpStan](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-formbuilder/.github/workflows/php-stan.yml?branch=master&style=flat-square&logo=github&label=phpstan%20level%204)](https://github.com/dachcom-digital/pimcore-formbuilder/actions?query=workflow%3A"PHP+Stan"+branch%3Amaster)
Expand All @@ -12,7 +12,7 @@

| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
|---------|-----------------------------------|----------------------------|--------------|----------------|----------------------------------------------------------------------------------|
| **5.x** | `11.0` | `^6.2` | 18.10.2023 | Feature Branch | master |
| **5.x** | `11.0` | `^6.4` | 18.10.2023 | Feature Branch | master |
| **4.x** | `10.5`, `10.6` | `^5.4` | 13.10.2021 | Unsupported | [4.x](https://github.com/dachcom-digital/pimcore-formbuilder/tree/4.x) |
| **3.x** | `6.0` - `6.9` | `3.4`, `^4.4` | 17.07.2019 | Unsupported | [3.x](https://github.com/dachcom-digital/pimcore-formbuilder/tree/3.x) |
| **2.7** | `5.4`, `5.5`, `5.6`, `5.7`, `5.8` | `3.4` | 27.06.2019 | Unsupported | [2.7](https://github.com/dachcom-digital/pimcore-formbuilder/tree/2.7) |
Expand All @@ -21,7 +21,7 @@
## Installation

```bash
composer require "dachcom-digital/formbuilder":"~5.1.4"
composer require "dachcom-digital/formbuilder":"~5.2.0"
```

Add Bundle to `bundles.php`:
Expand Down Expand Up @@ -93,12 +93,13 @@ Nothing to tell here, it's just [Symfony](https://symfony.com/doc/current/templa
- [FormBuilder Javascript Plugins](docs/91_Javascript.md)
- [Configuration Flags](docs/100_ConfigurationFlags.md)
- [Custom form templates](docs/110_CustomTemplates.md)

## Upgrade Info
Before updating, please [check our upgrade notes!](UPGRADE.md)

## License
**DACHCOM.DIGITAL AG**, Löwenhofstrasse 15, 9424 Rheineck, Schweiz
[dachcom.com](https://www.dachcom.com), [email protected]
Copyright © 2024 DACHCOM.DIGITAL. All rights reserved.
Copyright © 2025 DACHCOM.DIGITAL. All rights reserved.

For licensing details please visit [LICENSE.md](LICENSE.md)
1 change: 1 addition & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Upgrade Notes

## 5.2.0
- **[LICENSE]** Dual-License with GPL and Dachcom Commercial License (DCL) added
- **[NEW FEATURE]** Bootstrap 5 Layout Support [@mackrais](https://github.com/dachcom-digital/pimcore-formbuilder/pull/500)
- **[NEW FEATURE]** Introduce Channel Context [#486](https://github.com/dachcom-digital/pimcore-formbuilder/issues/486)
- **[IMPROVEMENT]** Doctrine ORM 3.0 Support [#503](https://github.com/dachcom-digital/pimcore-formbuilder/pull/503)
Expand Down
19 changes: 11 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{
"name": "dachcom-digital/formbuilder",
"type": "pimcore-bundle",
"license": "GPL-3.0-or-later",
"license": [
"GPL-3.0-or-later",
"proprietary"
],
"description": "Pimcore FormBuilder - create forms easily!",
"keywords": ["pimcore", "formbuilder"],
"homepage": "https://github.com/dachcom-digital/pimcore-formbuilder",
"authors": [
{
"name": "DACHCOM.DIGITAL Stefan Hagspiel",
"email": "[email protected]",
"homepage": "http://www.dachcom.com/",
"homepage": "https://www.dachcom.com",
"role": "Developer"
}
],
Expand All @@ -33,16 +36,16 @@
"require": {
"php": "^8.2",
"pimcore/pimcore": "^11.0",
"symfony/form": "^6.2",
"symfony/intl": "^6.2",
"doctrine/orm": "^2.7"
"symfony/form": "^6.4",
"symfony/intl": "^6.4",
"doctrine/orm": "^2.7 || ^3.0"
},
"require-dev": {
"codeception/codeception": "^5.0",
"codeception/module-symfony": "^3.1",
"codeception/module-webdriver": "^4.0",
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-symfony": "^1.0",
"symplify/easy-coding-standard": "^9.0"
"phpstan/phpstan": "^2.0",
"phpstan/phpstan-symfony": "^2.0",
"symplify/easy-coding-standard": "~12.2.0"
}
}
Loading

0 comments on commit cd525e0

Please sign in to comment.