Skip to content

Commit

Permalink
Merge pull request #23 from dachcom-digital/license_adjustment
Browse files Browse the repository at this point in the history
adjust license
  • Loading branch information
solverat authored Nov 27, 2024
2 parents 761dd5b + 267e092 commit 133480e
Show file tree
Hide file tree
Showing 11 changed files with 201 additions and 314 deletions.
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.

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) 2021 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 Jobs 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 Jobs Bundle Commercial License (DCL) please contact [email protected].
11 changes: 7 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"name": "dachcom-digital/jobs",
"type": "pimcore-bundle",
"license": "GPL-3.0-or-later",
"license": [
"GPL-3.0-or-later",
"proprietary"
],
"description": "Pimcore Jobs API",
"keywords": ["pimcore", "jobs"],
"homepage": "https://github.com/dachcom-digital/pimcore-jobs",
Expand Down Expand Up @@ -38,9 +41,9 @@
"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": {
"league/oauth2-facebook": "^2.0",
Expand Down
Loading

0 comments on commit 133480e

Please sign in to comment.