Skip to content

Commit

Permalink
adjust license (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
solverat authored Dec 4, 2024
1 parent 994965c commit 5930192
Show file tree
Hide file tree
Showing 23 changed files with 212 additions and 424 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.

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
61 changes: 0 additions & 61 deletions CONTRIBUTING.md

This file was deleted.

12 changes: 6 additions & 6 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
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 I18n 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 I18n Bundle Commercial License (DCL) please contact [email protected].
1 change: 0 additions & 1 deletion PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
| Q | A
| ------------- | ---
| Branch? | dev-master for features / 2.4 for bug fixes
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | no
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Pimcore - i18n Manager

# Pimcore - I18n
[![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/i18n.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/i18n)
[![Tests](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-i18n/.github/workflows/codeception.yml?branch=master&style=flat-square&logo=github&label=codeception)](https://github.com/dachcom-digital/pimcore-i18n/actions?query=workflow%3ACodeception+branch%3Amaster)
[![PhpStan](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-i18n/.github/workflows/php-stan.yml?branch=master&style=flat-square&logo=github&label=phpstan%20level%204)](https://github.com/dachcom-digital/pimcore-i18n/actions?query=workflow%3A"PHP+Stan"+branch%3Amaster)
Expand Down Expand Up @@ -28,7 +28,7 @@ This bundle helps you to master this challenges and gives you the freedom to ela

```json
"require" : {
"dachcom-digital/i18n" : "~5.0.0"
"dachcom-digital/i18n" : "~5.1.0"
}
```

Expand Down Expand Up @@ -87,12 +87,12 @@ When using this bundle, you should:
- [Navigation Caching](docs/110_NavigationCaching.md): Cache your navigation right!
- [Cookie Settings](docs/120_CookieSettings.md): Change Symfony default cookie settings.

## 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)
4 changes: 2 additions & 2 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Upgrade Notes

## 5.1.1
- [IMPROVEMENT] prevent applying str_contains on null value
## 5.1.0
- [FEATURE] pimcore backend: object preview button
- [IMPROVEMENT] prevent applying str_contains on null value
- [LICENSE] Dual-License with GPL and Dachcom Commercial License (DCL) added
## 5.0.6
- [IMPROVEMENT] Try to determinate locale and site when inline renderer is active (mostly via `checkMissingRequiredEditable()`)
## 5.0.5
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
},
"require": {
"pimcore/pimcore": "^11.0",
"symfony/intl": "^6.2",
"symfony/intl": "^6.4",
"geoip2/geoip2": "^2.0"
},
"require-dev": {
"codeception/codeception": "^5.0",
"codeception/module-asserts": "^3.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 5930192

Please sign in to comment.