Skip to content

Commit d62158d

Browse files
solveratsolverat
authored
add cla check (#92)
1 parent 4d9a2a5 commit d62158d

File tree

12 files changed

+119
-38
lines changed

12 files changed

+119
-38
lines changed

‎.gitattributes

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/.github export-ignore
2+
/docs export-ignore
3+
/tests export-ignore
4+
/.gitattributes export-ignore
5+
/.gitignore export-ignore
6+
/codeception.dist.yml export-ignore
7+
/phpstan.neon export-ignore
8+
/ecs.php export-ignore
9+
/CLA.md export-ignore
10+
/CODE_OF_CONDUCT.md export-ignore
11+
/ISSUE_TEMPLATE.md export-ignore
12+
/PULL_REQUEST_TEMPLATE.md export-ignore

‎.github/workflows/cla-check.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: CLA Check
2+
on:
3+
issue_comment:
4+
types: [ created ]
5+
pull_request_target:
6+
types: [ opened, closed, synchronize ]
7+
8+
permissions:
9+
actions: write
10+
contents: write
11+
pull-requests: write
12+
statuses: write
13+
14+
jobs:
15+
cla-assistant:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: 'CLA Assistant'
19+
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
20+
uses: contributor-assistant/[email protected]
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }}
24+
with:
25+
path-to-signatures: 'signatures/version1/cla.json'
26+
path-to-document: 'https://github.com/dachcom-digital/pimcore-dynamic-search/blob/master/CLA.md'
27+
branch: 'main'
28+
allowlist: bot*
29+
remote-organization-name: 'dachcom-digital'
30+
remote-repository-name: 'cla'

‎.github/workflows/codeception.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3939
strategy:
4040
matrix:
41-
php: [ 8.2 ]
42-
symfony: [ ^6.2 ]
43-
pimcore: [ ~11.2.0 ]
41+
php: [ 8.3 ]
42+
symfony: [ ^6.4 ]
43+
pimcore: [ ~11.4.0 ]
4444
include:
45-
- pimcore: ~11.2.0
46-
template_tag: v11.0.0
45+
- pimcore: ~11.4.0
46+
template_tag: 2024.3
4747
steps:
4848
- uses: nanasess/setup-chromedriver@v2
4949
- uses: actions/checkout@v4

‎.github/workflows/ecs.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3838
strategy:
3939
matrix:
40-
php: [ 8.2 ]
41-
symfony: [ ^6.2 ]
42-
pimcore: [ ~11.0.0 ]
40+
php: [ 8.3 ]
41+
symfony: [ ^6.4 ]
42+
pimcore: [ ~11.4.0 ]
4343
include:
44-
- pimcore: ~11.0.0
45-
template_tag: v11.0.0
44+
- pimcore: ~11.4.0
45+
template_tag: 2024.3
4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
with:
4949
path: lib/test-bundle
5050

@@ -88,10 +88,10 @@ jobs:
8888
- name: Get Composer Cache Directory
8989
id: composer-cache
9090
run: |
91-
echo "::set-output name=dir::$(composer config cache-files-dir)"
91+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
9292
9393
- name: Cache Composer Downloads
94-
uses: actions/cache@v1
94+
uses: actions/cache@v4
9595
with:
9696
path: ${{ steps.composer-cache.outputs.dir }}
9797
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

‎.github/workflows/php-stan.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3838
strategy:
3939
matrix:
40-
php: [ 8.2 ]
41-
symfony: [ ^6.2 ]
42-
pimcore: [ ~11.0.0 ]
40+
php: [ 8.3 ]
41+
symfony: [ ^6.4 ]
42+
pimcore: [ ~11.4.0 ]
4343
include:
44-
- pimcore: ~11.0.0
45-
template_tag: v11.0.0
44+
- pimcore: ~11.4.0
45+
template_tag: 2024.3
4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
with:
4949
path: lib/test-bundle
5050

@@ -88,10 +88,10 @@ jobs:
8888
- name: Get Composer Cache Directory
8989
id: composer-cache
9090
run: |
91-
echo "::set-output name=dir::$(composer config cache-files-dir)"
91+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
9292
9393
- name: Cache Composer Downloads
94-
uses: actions/cache@v1
94+
uses: actions/cache@v4
9595
with:
9696
path: ${{ steps.composer-cache.outputs.dir }}
9797
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -110,6 +110,10 @@ jobs:
110110
run: |
111111
bin/console assets:install public --relative --symlink
112112
113+
- name: Validate Container
114+
run: |
115+
bin/console lint:container
116+
113117
- name: Php Stan
114118
run: |
115119
bin/console cache:warmup --env=test

‎CLA.md

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Contributor License Agreement
2+
3+
The following terms are used throughout this agreement:
4+
5+
- **You** - the person or legal entity including its affiliates asked to accept this agreement. An affiliate is any entity
6+
that controls or is controlled by the legal entity, or is under common control with it.
7+
- **Project** - is an umbrella term that refers to any and all DACHCOM.DIGITAL AG open source projects.
8+
- **Contribution** - any type of work that is submitted to a Project, including any modifications or additions to existing
9+
work.
10+
- **Submitted** - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or verbal
11+
communication with DACHCOM.DIGITAL AG, contributors or maintainers.
12+
13+
## 1. Grant of Copyright License.
14+
Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and
15+
to DACHCOM.DIGITAL AG a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce,
16+
prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such
17+
derivative works. Except for this license, You reserve all rights, title, and interest in your contributions.
18+
19+
## 2. Grant of Patent License.
20+
Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and
21+
to DACHCOM.DIGITAL AG a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
22+
section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions,
23+
where such license applies only to those patent claims licensable by you that are necessarily infringed by your
24+
contribution or by combination of your contribution with the project to which this contribution was submitted.
25+
26+
If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging
27+
that your contribution or any project it was submitted to constitutes or is responsible for direct or contributory
28+
patent infringement, then any patent licenses granted to that entity under this agreement shall terminate as of the date
29+
such litigation is filed.
30+
31+
## 3. Source of Contribution.
32+
Your contribution is either your original creation, based upon previous work that, to the best of your knowledge, is
33+
covered under an appropriate open source license, and you have the right under that license to submit that work with
34+
modifications, whether created in whole or in part by you, or you have clearly identified the source of the contribution
35+
and any license or other restriction (like related patents, trademarks, and license agreements) of which you are
36+
personally aware.

‎ISSUE_TEMPLATE.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
| Q | A
22
| ---------------- | -----
3-
| Branch | master, 2.x
43
| Bug report? | yes/no
54
| Feature request? | yes/no
65
| BC Break report? | yes/no
76
| RFC? | yes/no
87

98
<!--
109
- Please fill in this template according to your issue.
11-
- For support request or how-tos, visit https://gitter.im/pimcore/pimcore or https://talk.pimcore.org/
10+
- For support request or how-tos, visit the discussions section.
1211
- Otherwise, replace this comment by the description of your issue.
1312
-->

‎README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ $ bin/console dynamic-search:run -v
101101
- [Backend UI](docs/50_BackendUI.md)
102102
- API
103103

104+
## License
105+
**DACHCOM.DIGITAL AG**, Löwenhofstrasse 15, 9424 Rheineck, Schweiz
106+
[dachcom.com](https://www.dachcom.com), [email protected]
107+
Copyright © 2024 DACHCOM.DIGITAL. All rights reserved.
104108

105-
## Copyright and License
106-
Copyright: [DACHCOM.DIGITAL](http://dachcom-digital.com)
107-
For licensing details please visit [LICENSE.md](LICENSE.md)
109+
For licensing details please visit [LICENSE.md](LICENSE.md)
108110

109111
## Upgrade Info
110112
Before updating, please [check our upgrade notes!](UPGRADE.md)

‎UPGRADE.md

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
# Upgrade Notes
22

3-
# 4.0.2
4-
5-
* introduced backend ui event [#91](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/91)
6-
7-
# 4.0.1
8-
9-
* fix resource deletion [#90](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/90)
3+
## 4.0.2
4+
- introduced backend ui event [#91](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/91)
5+
## 4.0.1
6+
- fix resource deletion [#90](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/90)
107

118
## Migrating from Version 3.x to Version 4.x
129

‎config/services/queue.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,3 @@ services:
1919
DynamicSearchBundle\Queue\DataCollector:
2020
arguments:
2121
$messageBus: '@dynamic_search.bus'
22-
23-
DynamicSearchBundle\Queue\DataProcessorInterface: '@DynamicSearchBundle\Queue\DataProcessor'
24-
DynamicSearchBundle\Queue\DataProcessor: ~

‎tests/_envs/local.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
modules:
22
config:
3-
\Dachcom\Codeception\Helper\Browser\WebDriver:
3+
\Dachcom\Codeception\Support\Helper\Browser\WebDriver:
44
browser: chrome
55
port: 4444
66
restart: true
77
wait: 1
88
capabilities:
99
chromeOptions:
10-
args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1024,768']
10+
args: ['--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']

‎tests/_etc/config/app/config.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ services:
1111
- [setContainer, ['@service_container']]
1212

1313
doctrine:
14+
orm:
15+
entity_managers:
16+
default:
17+
connection: default
1418
dbal:
1519
connections:
1620
default:

0 commit comments

Comments
 (0)