Skip to content

adjust license #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <bot@dachcom.ch>
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 }}
120 changes: 0 additions & 120 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.yaml config files)
/codeception.yaml
Expand Down
18 changes: 13 additions & 5 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# 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)
The default OpenSearch Index Provider Bundle (Dynamic Search Extension) 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
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 OpenSearch Index Provider Bundle (Dynamic Search Extension) Commercial License (DCL) please contact dcdi@dachcom.ch.
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Dynamic Search | Index Provider: Opensearch
# Dynamic Search | Index Provider: OpenSearch

[![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/dynamic-search-index-provider-opensearch.svg?style=flat-square)](https://packagist.org/packages/dachcom-digital/dynamic-search-index-provider-opensearch)
[![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)
[![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)
Expand All @@ -11,7 +12,7 @@ Store data with the opensearch index service.
## Release Plan
| Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained | Branch |
|---------|----------------------------|----------------------------|--------------|----------------|--------|
| **2.x** | `11.0` | `^6.2` | 28.09.2023 | Feature Branch | master |
| **2.x** | `11.0` | `^6.4` | 28.09.2023 | Feature Branch | master |
| **1.x** | `10.0` - `10.6` | `^5.4` | 09.03.2023 | No | 1.x |

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

***

## 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), dcdi@dachcom.ch
Copyright © 2024 DACHCOM.DIGITAL. All rights reserved.
Copyright © 2025 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)
3 changes: 2 additions & 1 deletion UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Upgrade Notes

## 2.0.3
- [LICENSE] Dual-License with GPL and Dachcom Commercial License (DCL) added
## 2.0.2
added backend ui (supported in dynamic search >= 4.0.4) [#10](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/pull/10)

## 2.0.1
size param for aggregation filter [#4](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-opensearch/issues/4)

Expand Down
17 changes: 10 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"name": "dachcom-digital/dynamic-search-index-provider-opensearch",
"type": "dynamic-search-provider-bundle",
"license": "GPL-3.0-or-later",
"license": [
"GPL-3.0-or-later",
"proprietary"
],
"description": "",
"keywords": [
"pimcore",
Expand All @@ -15,13 +18,13 @@
{
"name": "DACHCOM.DIGITAL Robert Kaczmarczyk",
"email": "rkaczmarczyk@dachcom.ch",
"homepage": "http://www.dachcom.com/",
"homepage": "https://www.dachcom.com/",
"role": "Developer"
},
{
"name": "DACHCOM.DIGITAL Stefan Hagspiel",
"email": "shagspiel@dachcom.ch",
"homepage": "http://www.dachcom.com/",
"homepage": "https://www.dachcom.com/",
"role": "Developer"
}
],
Expand All @@ -36,16 +39,16 @@
}
},
"require": {
"pimcore/pimcore": "^11",
"pimcore/pimcore": "^11.0",
"dachcom-digital/dynamic-search": "^3.0 || ^4.0",
"opensearch-project/opensearch-php": "^2.1",
"smoench/opensearch-dsl": "^1.2"
},
"require-dev": {
"codeception/codeception": "^5.0",
"codeception/module-symfony": "^3.1",
"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
Loading