Merge pull request #75 from dachcom-digital/license_adjustment

adjust license

Author: solverat

.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 <[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 }}

.github/workflows/ecs.yml

@@ -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

.gitignore

@@ -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 SEO 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 SEO Bundle Commercial License (DCL) please contact [email protected].

LICENSE.md

@@ -1,5 +1,6 @@
 # Pimcore SEO Bundle
 [![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/seo.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/seo)
 [![Tests](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-seo/.github/workflows/codeception.yml?branch=master&style=flat-square&logo=github&label=codeception)](https://github.com/dachcom-digital/pimcore-seo/actions?query=workflow%3ACodeception+branch%3Amaster)
 [![PhpStan](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-seo/.github/workflows/php-stan.yml?branch=master&style=flat-square&logo=github&label=phpstan%20level%204)](https://github.com/dachcom-digital/pimcore-seo/actions?query=workflow%3A"PHP+Stan"+branch%3Amaster)
@@ -35,7 +36,7 @@ The last SEO Bundle for pimcore you'll ever need!
 
 ```json
 "require" : {
-    "dachcom-digital/seo" : "~3.1.0",
+    "dachcom-digital/seo" : "~3.2.0",
 }
 ```
 
@@ -74,12 +75,12 @@ This Bundle needs some preparation. Please check out the [Setup && Overview](doc
 - Use [dachcom-digital/jobs](https://github.com/dachcom-digital/pimcore-jobs) to push job data via google index!
 - Use [dachcom-digital/schema](https://github.com/dachcom-digital/pimcore-schema) to generate schema blocks via PHP API with ease!
 
+## 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.  
 
 For licensing details please visit [LICENSE.md](LICENSE.md)  
-
-## Upgrade Info
-Before updating, please [check our upgrade notes!](UPGRADE.md)

README.md

@@ -1,5 +1,9 @@
 # Upgrade Notes
 
+## 3.2.0
+- [LICENSE] Dual-License with GPL and Dachcom Commercial License (DCL) added
+- [ENHANCEMENT] Google Worker: Use new namespaces
+
 ## 3.1.3
 - **[ENHANCEMENT]** Allow no auth_config for Google Index Worker [@dpfaffenbauer](https://github.com/dachcom-digital/pimcore-seo/pull/69)
 - **[BUGFIX]** Fix Migration and Installer

UPGRADE.md

@@ -1,7 +1,10 @@
 {
     "name": "dachcom-digital/seo",
     "type": "pimcore-bundle",
-    "license": "GPL-3.0-or-later",
+    "license": [
+        "GPL-3.0-or-later",
+        "proprietary"
+    ],
     "description": "Pimcore SEO Enrichment Bundle",
     "keywords": ["pimcore", "seo"],
     "homepage": "https://github.com/dachcom-digital/pimcore-seo",
@@ -33,16 +36,16 @@
     "require": {
         "ext-dom": "*",
         "pimcore/pimcore": "^11.0",
-        "google/apiclient": "^2.0",
+        "google/apiclient": "^2.12",
         "doctrine/orm": "^2.7"
     },
     "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"
     },
     "suggest": {
         "dachcom-digital/schema": "^3.0"