Skip to content

Commit 8a7d639

Browse files
committed
adjust license
1 parent d1e0cba commit 8a7d639

File tree

9 files changed

+208
-300
lines changed

9 files changed

+208
-300
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 <[email protected]>
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: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
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)
8+
The default OpenSearch Index 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)
711
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
@@ -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 OpenSearch Index Provider Bundle (Dynamic Search Extension) Commercial License (DCL) please contact [email protected].

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# Dynamic Search | Index Provider: Opensearch
1+
# Dynamic Search | Index Provider: OpenSearch
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-index-provider-opensearch.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/dynamic-search-index-provider-opensearch)
56
[![Codeception](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/actions/workflows/codeception.yml/badge.svg?branch=main)](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/actions/workflows/codeception.yml)
67
[![PHP Stan](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/actions/workflows/php-stan.yml/badge.svg?branch=main)](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/actions/workflows/php-stan.yml)
@@ -11,7 +12,7 @@ Store data with the opensearch index service.
1112
## Release Plan
1213
| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
1314
|---------|----------------------------|----------------------------|--------------|----------------|--------|
14-
| **2.x** | `11.0` | `^6.2` | 28.09.2023 | Feature Branch | master |
15+
| **2.x** | `11.0` | `^6.4` | 28.09.2023 | Feature Branch | master |
1516
| **1.x** | `10.0` - `10.6` | `^5.4` | 09.03.2023 | No | 1.x |
1617

1718
***
@@ -173,12 +174,12 @@ $ bin/console dynamic-search:os:rebuild-index -c default
173174

174175
***
175176

177+
## Upgrade Info
178+
Before updating, please [check our upgrade notes!](./UPGRADE.md)
179+
176180
## License
177181
**DACHCOM.DIGITAL AG**, Löwenhofstrasse 15, 9424 Rheineck, Schweiz
178182
[dachcom.com](https://www.dachcom.com), [email protected]
179-
Copyright © 2024 DACHCOM.DIGITAL. All rights reserved.
183+
Copyright © 2025 DACHCOM.DIGITAL. All rights reserved.
180184

181185
For licensing details please visit [LICENSE.md](LICENSE.md)
182-
183-
## Upgrade Info
184-
Before updating, please [check our upgrade notes!](./UPGRADE.md)

UPGRADE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Upgrade Notes
22

3+
## 2.0.3
4+
- [LICENSE] Dual-License with GPL and Dachcom Commercial License (DCL) added
35
## 2.0.2
46
added backend ui (supported in dynamic search >= 4.0.4) [#10](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/pull/10)
5-
67
## 2.0.1
78
size param for aggregation filter [#4](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/issues/4)
89

composer.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"name": "dachcom-digital/dynamic-search-index-provider-opensearch",
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": [
710
"pimcore",
@@ -15,13 +18,13 @@
1518
{
1619
"name": "DACHCOM.DIGITAL Robert Kaczmarczyk",
1720
"email": "[email protected]",
18-
"homepage": "http://www.dachcom.com/",
21+
"homepage": "https://www.dachcom.com/",
1922
"role": "Developer"
2023
},
2124
{
2225
"name": "DACHCOM.DIGITAL Stefan Hagspiel",
2326
"email": "[email protected]",
24-
"homepage": "http://www.dachcom.com/",
27+
"homepage": "https://www.dachcom.com/",
2528
"role": "Developer"
2629
}
2730
],
@@ -36,16 +39,16 @@
3639
}
3740
},
3841
"require": {
39-
"pimcore/pimcore": "^11",
42+
"pimcore/pimcore": "^11.0",
4043
"dachcom-digital/dynamic-search": "^3.0 || ^4.0",
4144
"opensearch-project/opensearch-php": "^2.1",
4245
"smoench/opensearch-dsl": "^1.2"
4346
},
4447
"require-dev": {
4548
"codeception/codeception": "^5.0",
4649
"codeception/module-symfony": "^3.1",
47-
"phpstan/phpstan": "^1.0",
48-
"phpstan/phpstan-symfony": "^1.0",
49-
"symplify/easy-coding-standard": "^9.0"
50+
"phpstan/phpstan": "^2.0",
51+
"phpstan/phpstan-symfony": "^2.0",
52+
"symplify/easy-coding-standard": "~12.2.0"
5053
}
5154
}

0 commit comments

Comments
 (0)