Skip to content

Commit bcf9597

Browse files
solveratsolverat
authored
Merge pull request #38 from dachcom-digital/license_adjustment
adjust license
2 parents ed7e387 + 2b63ce0 commit bcf9597

File tree

13 files changed

+210
-329
lines changed

13 files changed

+210
-329
lines changed

‎.github/workflows/ecs-fix.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Coding standard refactor
2+
on:
3+
schedule:
4+
- cron: '0 0 * * SUN'
5+
workflow_dispatch: ~
6+
7+
jobs:
8+
ecs-fix:
9+
runs-on: ubuntu-latest
10+
timeout-minutes: 5
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
branch: [ 'master' ]
15+
steps:
16+
- uses: actions/checkout@v4
17+
with:
18+
ref: ${{ matrix.branch }}
19+
20+
- name: Setup PHP
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: 8.3
24+
25+
- name: Composer install
26+
run: composer install --no-interaction --no-scripts
27+
28+
- name: Run ECS
29+
run: |
30+
vendor/bin/ecs check src --fix --config ecs.php
31+
32+
- name: Create Pull Request
33+
uses: peter-evans/create-pull-request@v4
34+
with:
35+
commit-message: '[CS] Refactor'
36+
author: DACHCOM Bot <bot@dachcom.ch>
37+
title: '[CS] Refactor'
38+
body: |
39+
This PR has been generated automatically to fix code-styles
40+
labels: |
41+
Enhancement
42+
branch: coding-standard/refactor-${{ matrix.branch }}
43+
delete-branch: true
44+
base: ${{ matrix.branch }}

‎.github/workflows/ecs.yml‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ atlassian-ide-plugin.xml
4040
.project
4141
ehthumbs.db
4242
Thumbs.db
43-
Vagrantfile
44-
.vagrant
4543
php-cgi.core
46-
.sass-cache
44+
/vendor/
45+
/composer.lock
4746

4847
# codeception (only stage *.dist.yaml config files)
4948
/codeception.yaml

‎LICENSE.md‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# License
2-
Copyright (C) 2023 DACHCOM.DIGITAL
2+
Copyright (C) DACHCOM.DIGITAL
33

4-
This software is available under the GNU General Public License version 3 (GPLv3).
4+
This software is available under two different licenses:
5+
* GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
6+
* DACHCOM Commercial License (DCL)
57

6-
### GNU General Public License version 3 (GPLv3)
7-
If you decide to choose the GPLv3 license, you must comply with the following terms:
8+
The default Trinity Data Provider Bundle (Dynamic Search Extension) license, without a valid DACHCOM Commercial License agreement, is the Open-Source GPLv3 license.
9+
10+
## GNU General Public License version 3 (GPLv3)
11+
If you decide to choose the GPLv3 license, you must comply with the following terms:
812

913
This program is free software: you can redistribute it and/or modify
1014
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
1317

1418
This program is distributed in the hope that it will be useful,
1519
but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1721
GNU General Public License for more details.
1822

1923
You should have received a copy of the GNU General Public License
2024
along with this program. If not, see <http://www.gnu.org/licenses/>.
2125

22-
[GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html)
26+
## DACHCOM Commercial License (DCL)
27+
Alternatively, commercial and supported versions of the program - also known as
28+
Commercial Distributions - must be used in accordance with the terms and conditions
29+
contained in a separate written agreement between you and DACHCOM.DIGITAL AG.
30+
For more information about the Elasticsearch Trinity Data Provider Bundle (Dynamic Search Extension) Commercial License (DCL) please contact dcdi@dachcom.ch.

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Dynamic Search | Data Provider: Trinity Data
22

33
[![Software License](https://img.shields.io/badge/license-GPLv3-brightgreen.svg?style=flat-square)](LICENSE.md)
4+
[![Software License](https://img.shields.io/badge/license-DCL-white.svg?style=flat-square&color=%23ff5c5c)](LICENSE.md)
45
[![Latest Release](https://img.shields.io/packagist/v/dachcom-digital/dynamic-search-data-provider-trinity.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/dynamic-search-data-provider-trinity)
56
[![Tests](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-dynamic-search-data-provider-trinity/.github/workflows/codeception.yml?branch=master&style=flat-square&logo=github&label=codeception)](https://github.com/dachcom-digital/pimcore-dynamic-search-data-provider-trinity/actions?query=workflow%3ACodeception+branch%3Amaster)
67
[![PhpStan](https://img.shields.io/github/actions/workflow/status/dachcom-digital/pimcore-dynamic-search-data-provider-trinity/.github/workflows/php-stan.yml?branch=master&style=flat-square&logo=github&label=phpstan%20level%204)](https://github.com/dachcom-digital/pimcore-dynamic-search-data-provider-trinity/actions?query=workflow%3A"PHP+Stan"+branch%3Amaster)
@@ -11,7 +12,7 @@ Fetch pimcore elements by listings: `assets`, `documents` and `objects`.
1112
## Release Plan
1213
| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
1314
|---------|----------------------------|----------------------------|--------------|--------------------|-------------------------------------------------------------------------------------------------|
14-
| **3.x** | `11.0` | `^6.2` | 28.09.2023 | Feature Branch | master |
15+
| **3.x** | `11.0` | `^6.4` | 28.09.2023 | Feature Branch | master |
1516
| **2.x** | `10.0` - `10.6` | `^5.4` | 19.12.2021 | No | [1.x](https://github.com/dachcom-digital/pimcore-dynamic-search-data-provider-trinity/tree/2.x) |
1617
| **1.x** | `6.6` - `6.9` | `^4.4` | 18.04.2021 | No | [1.x](https://github.com/dachcom-digital/pimcore-dynamic-search-data-provider-trinity/tree/1.x) |
1718

@@ -236,12 +237,12 @@ Options: none
236237

237238
***
238239

240+
## Upgrade Info
241+
Before updating, please [check our upgrade notes!](./UPGRADE.md)
242+
239243
## License
240244
**DACHCOM.DIGITAL AG**, Löwenhofstrasse 15, 9424 Rheineck, Schweiz
241245
[dachcom.com](https://www.dachcom.com), dcdi@dachcom.ch
242-
Copyright © 2024 DACHCOM.DIGITAL. All rights reserved.
246+
Copyright © 2025 DACHCOM.DIGITAL. All rights reserved.
243247

244248
For licensing details please visit [LICENSE.md](LICENSE.md)
245-
246-
## Upgrade Info
247-
Before updating, please [check our upgrade notes!](./UPGRADE.md)

‎UPGRADE.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Upgrade Notes
22

3+
## 3.0.2
4+
- [LICENSE] Dual-License with GPL and Dachcom Commercial License (DCL) added
5+
## 3.0.1
6+
- [IMPROVEMENT] Allow dynamic search ^4.0
7+
38
## Migrating from Version 2.x to Version 3.0.0
49

510
### Global Changes

‎composer.json‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
{
22
"name": "dachcom-digital/dynamic-search-data-provider-trinity",
33
"type": "dynamic-search-provider-bundle",
4-
"license": "GPL-3.0-or-later",
4+
"license": [
5+
"GPL-3.0-or-later",
6+
"proprietary"
7+
],
58
"description": "",
69
"keywords": ["pimcore", "search", "dynamic-search", "data-provider","trinity", "assets", "documents", "objects"],
710
"homepage": "https://github.com/dachcom-digital/pimcore-dynamic-search-data-provider-trinity",
811
"authors": [
912
{
1013
"name": "DACHCOM.DIGITAL Stefan Hagspiel",
1114
"email": "shagspiel@dachcom.ch",
12-
"homepage": "http://www.dachcom.com/",
15+
"homepage": "https://www.dachcom.com/",
1316
"role": "Developer"
1417
}
1518
],
@@ -30,8 +33,8 @@
3033
"require-dev": {
3134
"codeception/codeception": "^5.0",
3235
"codeception/module-symfony": "^3.1",
33-
"phpstan/phpstan": "^1.0",
34-
"phpstan/phpstan-symfony": "^1.0",
35-
"symplify/easy-coding-standard": "^9.0"
36+
"phpstan/phpstan": "^2.0",
37+
"phpstan/phpstan-symfony": "^2.0",
38+
"symplify/easy-coding-standard": "~12.2.0"
3639
}
3740
}

0 commit comments

Comments
 (0)