adjust license

dachcom-digital · Jan 8, 2025 · 20439b1 · 20439b1
1 parent 41fdc5f
commit 20439b1
Show file tree

Hide file tree

Showing 13 changed files with 236 additions and 330 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.yml config files)
 /codeception.yml

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -1,9 +1,9 @@
-| 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.

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 Emailizr 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 Emailizr Bundle Commercial License (DCL) please contact dcdi@dachcom.ch.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,10 @@
-| Q             | A                                                  |
-|---------------|----------------------------------------------------|
-| Bug fix?      | yes/no                                             |
-| New feature?  | yes/no                                             |
-| BC breaks?    | no                                                 |
-| Deprecations? | yes/no                                             |
-| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any --> |
+| Q             | A
+| ------------- | ---
+| Bug fix?      | yes/no
+| New feature?  | yes/no
+| BC breaks?    | no
+| Deprecations? | yes/no
+| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any -->
 
 <!--
 Write a short README entry for your feature/bugfix here (replace this comment block.)

diff --git a/README.md b/README.md
@@ -1,29 +1,30 @@
 # Pimcore Emailizr
 
-[![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/emailizr.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/emailizr)
 [![Tests](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-emailizr/.github/workflows/codeception.yml?branch=master&style=flat-square&logo=github&label=codeception)](https://github.com/dachcom-digital/pimcore-emailizr/actions?query=workflow%3A%22Codeception%22)
 [![PhpStan](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-dynamic-search/.github/workflows/php-stan.yml?branch=master&style=flat-square&logo=github&label=phpstan%20level%204)](https://github.com/dachcom-digital/pimcore-emailizr/actions?query=workflow%3A%22PHP%20Stan%22)
 
 ### Requirements
-* Pimcore: ^11.0
-* PHP: >= 8.1
-* Twig >= 3.9
+- Pimcore ^11.4
+- PHP >= 8.1
+- Twig >= 3.9
 
 ### Release Plan
 
-| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained     | Branch                                                              |
-|---------|----------------------------|----------------------------|--------------|----------------|---------------------------------------------------------------------|
-| **3.x** | `11.0`                     | `^6.2`                     | 30.08.2023   | Feature Branch | master                                                              |
-| **2.x** | `10.1` - `10.6`            | `^5.4`                     | 21.09.2021   | No             | [2.x](https://github.com/dachcom-digital/pimcore-emailizr/tree/2.x) |
-| **1.x** | `6.0` - `6.9`              | `3.4`, `^4.4`              | 06.12.2017   | No             | [1.x](https://github.com/dachcom-digital/pimcore-emailizr/tree/1.x) |
+| Release   | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained     | Branch                                                              |
+|-----------|----------------------------|----------------------------|--------------|----------------|---------------------------------------------------------------------|
+| **>=3.1** | `11.4`                     | `^6.4`                     | 08.01.2025   | Feature Branch | master                                                              |
+| **3.x**   | `11.0`                     | `^6.2`                     | 30.08.2023   | Feature Branch | master                                                              |
+| **2.x**   | `10.1` - `10.6`            | `^5.4`                     | 21.09.2021   | No             | [2.x](https://github.com/dachcom-digital/pimcore-emailizr/tree/2.x) |
+| **1.x**   | `6.0` - `6.9`              | `3.4`, `^4.4`              | 06.12.2017   | No             | [1.x](https://github.com/dachcom-digital/pimcore-emailizr/tree/1.x) |
 
 ## Installation
 
 ```json
 "require" : {
-    "dachcom-digital/emailizr" : "~3.1.0",
+    "dachcom-digital/emailizr" : "~3.2.0",
 }
 ```
 
@@ -95,11 +96,8 @@ use EmailizrBundle\Service\ContentService;
 
 class YourClass
 {
-    protected ContentService $contentService;
-
-    public function __construct(ContentService $contentService)
+    public function __construct(protected ContentService $contentService)
     {
-        $this->contentService = $contentService;
     }
 
     public function parse($content)
@@ -120,6 +118,6 @@ 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)  
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,6 +1,10 @@
 # Upgrade Notes
 
-## Version 3.1
+## Version 3.2.0
+- Pimcore >= 11.4 Support only
+- [LICENSE] Dual-License with GPL and Dachcom Commercial License (DCL) added
+
+## Version 3.1.0
 Starting with 3.1, Emailizr only supports Twig 3.9
 
 ## Migrating from Version 2.x to Version 3.0.0

diff --git a/composer.json b/composer.json
@@ -1,15 +1,18 @@
 {
     "name": "dachcom-digital/emailizr",
     "type": "pimcore-bundle",
-    "license": "GPL-3.0-or-later",
+    "license": [
+        "GPL-3.0-or-later",
+        "proprietary"
+    ],
     "description": "Pimcore Emailizr - create html emails the right way!",
     "keywords": ["pimcore", "email", "inky", "inline style"],
     "homepage": "https://github.com/dachcom-digital/pimcore-emailizr",
     "authors": [
         {
             "name": "DACHCOM.DIGITAL Stefan Hagspiel",
             "email": "shagspiel@dachcom.ch",
-            "homepage": "http://www.dachcom.com/",
+            "homepage": "https://www.dachcom.com",
             "role": "Developer"
         }
     ],
@@ -31,16 +34,16 @@
         }
     },
     "require": {
-        "pimcore/pimcore": "^11.0",
-        "twig/twig": "^3.9",
+        "pimcore/pimcore": "^11.4",
+        "twig/twig": "^3.14",
         "twig/inky-extra": "^3.0",
         "pelago/emogrifier": "^7.0"
     },
     "require-dev": {
         "codeception/codeception": "^5.0",
         "codeception/module-symfony": "^3.1",
-        "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"
     }
 }
diff --git a/docs/10_FormBuilder.md b/docs/10_FormBuilder.md
@@ -143,11 +143,8 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class FormBuilderMailListener implements EventSubscriberInterface
 {
-    protected ContentService $contentService;
-
-    public function __construct(ContentService $contentService)
+    public function __construct(protected ContentService $contentService)
     {
-        $this->contentService = $contentService;
     }
 
     public static function getSubscribedEvents()