adjust license (#240)

dachcom-digital · Jan 8, 2025 · 2b2eaea · 2b2eaea
1 parent 6ec2e26
commit 2b2eaea
Show file tree

Hide file tree

Showing 13 changed files with 217 additions and 318 deletions.
diff --git a/.github/workflows/ecs-fix.yml b/.github/workflows/ecs-fix.yml
@@ -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 <bot@dachcom.ch>
+                    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 }}
diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
diff --git a/.gitignore b/.gitignore
@@ -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.yaml config files)
 /codeception.yaml

diff --git a/LICENSE.md b/LICENSE.md
@@ -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 Social Data 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
@@ -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 Social Data Bundle Commercial License (DCL) please contact dcdi@dachcom.ch.
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 The Toolbox is a Kickstarter for your every day project. It provides some important bricks and structure basics which allow rapid and quality-oriented web development. 
 
-[![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/toolbox.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/toolbox)
 [![Tests](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-toolbox/.github/workflows/codeception.yml?branch=master&style=flat-square&logo=github&label=codeception)](https://github.com/dachcom-digital/pimcore-toolbox/actions?query=workflow%3ACodeception+branch%3Amaster)
 [![PhpStan](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-toolbox/.github/workflows/php-stan.yml?branch=master&style=flat-square&logo=github&label=phpstan%20level%204)](https://github.com/dachcom-digital/pimcore-toolbox/actions?query=workflow%3A"PHP+Stan"+branch%3Amaster)
@@ -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   |
 |---------|-----------------------------------|----------------------------|--------------|----------------|----------|
-| **5.x** | `11.0`                            | `6.2`                      | 28.09.2023   | Feature Branch | master   |
+| **5.x** | `11.0`                            | `6.4`                      | 28.09.2023   | Feature Branch | master   |
 | **4.x** | `10.5`, `10.6`                    | `5.4`                      | 01.10.2021   | Bugfixes       | 4.x      |
 | **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      |
@@ -25,7 +25,7 @@ The Toolbox is a Kickstarter for your every day project. It provides some import
 
 ```json
 "require" : {
-    "dachcom-digital/toolbox" : "~5.2.0"
+    "dachcom-digital/toolbox" : "~5.3.0"
 }
 ```
 
@@ -107,12 +107,12 @@ The Toolbox provides a lot of [ready-to-use Bricks](docs/11_ElementsOverview.md)
 - Fix the pimcore iframe [maskFrames](public/js/document/edit.js) bug (in some cases the iframe overlay field does not apply to the right position)
 - Transforms all the brick config buttons (`pimcore_area_edit_button_*`) to more grateful ones.
 
+## 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), dcdi@dachcom.ch  
-Copyright © 2024 DACHCOM.DIGITAL. All rights reserved.  
+Copyright © 2025 DACHCOM.DIGITAL. All rights reserved.  
 
 For licensing details please visit [LICENSE.md](LICENSE.md)  
-
-## Upgrade Info
-Before updating, please [check our upgrade notes!](UPGRADE.md)
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,6 +1,7 @@
 # Upgrade Notes
 
 ## 5.3.0
+- [LICENSE] Dual-License with GPL and Dachcom Commercial License (DCL) added
 - [ENHANCEMENT] [Quill Editor Bundle](https://github.com/pimcore/quill-bundle) Support added. See [Editor Configuration Section](./docs/13_Wysiwyg_Editor.md#quill)
 
 ## 5.2.2

diff --git a/composer.json b/composer.json
@@ -1,15 +1,18 @@
 {
     "name": "dachcom-digital/toolbox",
     "type": "pimcore-bundle",
-    "license": "GPL-3.0-or-later",
+    "license": [
+        "GPL-3.0-or-later",
+        "proprietary"
+    ],
     "description": "Pimcore Project Kickstarter",
     "keywords": ["pimcore", "toolbox"],
     "homepage": "https://github.com/dachcom-digital/pimcore-toolbox",
     "authors": [
         {
             "name": "DACHCOM.DIGITAL Stefan Hagspiel",
             "email": "shagspiel@dachcom.ch",
-            "homepage": "http://www.dachcom.com/",
+            "homepage": "https://www.dachcom.com",
             "role": "Developer"
         }
     ],
@@ -37,8 +40,8 @@
         "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"
     }
 }