From d62158d5926cfae3587f80ffb741cee97e7d2b53 Mon Sep 17 00:00:00 2001 From: Stefan Hagspiel Date: Fri, 15 Nov 2024 07:48:35 +0100 Subject: [PATCH] add cla check (#92) --- .gitattributes | 12 +++++++++++ .github/workflows/cla-check.yml | 30 ++++++++++++++++++++++++++ .github/workflows/codeception.yml | 10 ++++----- .github/workflows/ecs.yml | 16 +++++++------- .github/workflows/php-stan.yml | 20 ++++++++++------- CLA.md | 36 +++++++++++++++++++++++++++++++ ISSUE_TEMPLATE.md | 3 +-- README.md | 8 ++++--- UPGRADE.md | 11 ++++------ config/services/queue.yaml | 3 --- tests/_envs/local.yml | 4 ++-- tests/_etc/config/app/config.yaml | 4 ++++ 12 files changed, 119 insertions(+), 38 deletions(-) create mode 100644 .gitattributes create mode 100644 .github/workflows/cla-check.yml create mode 100644 CLA.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1d0a697 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +/.github export-ignore +/docs export-ignore +/tests export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore +/codeception.dist.yml export-ignore +/phpstan.neon export-ignore +/ecs.php export-ignore +/CLA.md export-ignore +/CODE_OF_CONDUCT.md export-ignore +/ISSUE_TEMPLATE.md export-ignore +/PULL_REQUEST_TEMPLATE.md export-ignore \ No newline at end of file diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml new file mode 100644 index 0000000..0f8a0ee --- /dev/null +++ b/.github/workflows/cla-check.yml @@ -0,0 +1,30 @@ +name: CLA Check +on: + issue_comment: + types: [ created ] + pull_request_target: + types: [ opened, closed, synchronize ] + +permissions: + actions: write + contents: write + pull-requests: write + statuses: write + +jobs: + cla-assistant: + runs-on: ubuntu-latest + steps: + - name: 'CLA Assistant' + 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' + uses: contributor-assistant/github-action@v2.6.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }} + with: + path-to-signatures: 'signatures/version1/cla.json' + path-to-document: 'https://github.com/dachcom-digital/pimcore-dynamic-search/blob/master/CLA.md' + branch: 'main' + allowlist: bot* + remote-organization-name: 'dachcom-digital' + remote-repository-name: 'cla' \ No newline at end of file diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index 07f68e8..ad3726e 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -38,12 +38,12 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 strategy: matrix: - php: [ 8.2 ] - symfony: [ ^6.2 ] - pimcore: [ ~11.2.0 ] + php: [ 8.3 ] + symfony: [ ^6.4 ] + pimcore: [ ~11.4.0 ] include: - - pimcore: ~11.2.0 - template_tag: v11.0.0 + - pimcore: ~11.4.0 + template_tag: 2024.3 steps: - uses: nanasess/setup-chromedriver@v2 - uses: actions/checkout@v4 diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml index c2f4656..97913ee 100644 --- a/.github/workflows/ecs.yml +++ b/.github/workflows/ecs.yml @@ -37,14 +37,14 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 strategy: matrix: - php: [ 8.2 ] - symfony: [ ^6.2 ] - pimcore: [ ~11.0.0 ] + php: [ 8.3 ] + symfony: [ ^6.4 ] + pimcore: [ ~11.4.0 ] include: - - pimcore: ~11.0.0 - template_tag: v11.0.0 + - pimcore: ~11.4.0 + template_tag: 2024.3 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: lib/test-bundle @@ -88,10 +88,10 @@ jobs: - name: Get Composer Cache Directory id: composer-cache run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache Composer Downloads - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml index f79fcfb..2b38553 100644 --- a/.github/workflows/php-stan.yml +++ b/.github/workflows/php-stan.yml @@ -37,14 +37,14 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 strategy: matrix: - php: [ 8.2 ] - symfony: [ ^6.2 ] - pimcore: [ ~11.0.0 ] + php: [ 8.3 ] + symfony: [ ^6.4 ] + pimcore: [ ~11.4.0 ] include: - - pimcore: ~11.0.0 - template_tag: v11.0.0 + - pimcore: ~11.4.0 + template_tag: 2024.3 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: lib/test-bundle @@ -88,10 +88,10 @@ jobs: - name: Get Composer Cache Directory id: composer-cache run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" + echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache Composer Downloads - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -110,6 +110,10 @@ jobs: run: | bin/console assets:install public --relative --symlink + - name: Validate Container + run: | + bin/console lint:container + - name: Php Stan run: | bin/console cache:warmup --env=test diff --git a/CLA.md b/CLA.md new file mode 100644 index 0000000..e9e9187 --- /dev/null +++ b/CLA.md @@ -0,0 +1,36 @@ +# Contributor License Agreement + +The following terms are used throughout this agreement: + +- **You** - the person or legal entity including its affiliates asked to accept this agreement. An affiliate is any entity +that controls or is controlled by the legal entity, or is under common control with it. +- **Project** - is an umbrella term that refers to any and all DACHCOM.DIGITAL AG open source projects. +- **Contribution** - any type of work that is submitted to a Project, including any modifications or additions to existing +work. +- **Submitted** - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or verbal +communication with DACHCOM.DIGITAL AG, contributors or maintainers. + +## 1. Grant of Copyright License. +Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and +to DACHCOM.DIGITAL AG a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, +prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such +derivative works. Except for this license, You reserve all rights, title, and interest in your contributions. + +## 2. Grant of Patent License. +Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and +to DACHCOM.DIGITAL AG a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this +section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions, +where such license applies only to those patent claims licensable by you that are necessarily infringed by your +contribution or by combination of your contribution with the project to which this contribution was submitted. + +If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging +that your contribution or any project it was submitted to constitutes or is responsible for direct or contributory +patent infringement, then any patent licenses granted to that entity under this agreement shall terminate as of the date +such litigation is filed. + +## 3. Source of Contribution. +Your contribution is either your original creation, based upon previous work that, to the best of your knowledge, is +covered under an appropriate open source license, and you have the right under that license to submit that work with +modifications, whether created in whole or in part by you, or you have clearly identified the source of the contribution +and any license or other restriction (like related patents, trademarks, and license agreements) of which you are +personally aware. \ No newline at end of file diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 62afe6e..b42afe3 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,6 +1,5 @@ | Q | A | ---------------- | ----- -| Branch | master, 2.x | Bug report? | yes/no | Feature request? | yes/no | BC Break report? | yes/no @@ -8,6 +7,6 @@ \ No newline at end of file diff --git a/README.md b/README.md index 49ba98b..a2782a4 100644 --- a/README.md +++ b/README.md @@ -101,10 +101,12 @@ $ bin/console dynamic-search:run -v - [Backend UI](docs/50_BackendUI.md) - API +## 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 and License -Copyright: [DACHCOM.DIGITAL](http://dachcom-digital.com) -For licensing details please visit [LICENSE.md](LICENSE.md) +For licensing details please visit [LICENSE.md](LICENSE.md) ## Upgrade Info Before updating, please [check our upgrade notes!](UPGRADE.md) diff --git a/UPGRADE.md b/UPGRADE.md index a70dc47..07f6306 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,12 +1,9 @@ # Upgrade Notes -# 4.0.2 - -* introduced backend ui event [#91](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/91) - -# 4.0.1 - -* fix resource deletion [#90](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/90) +## 4.0.2 +- introduced backend ui event [#91](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/91) +## 4.0.1 +- fix resource deletion [#90](https://github.com/dachcom-digital/pimcore-dynamic-search/pull/90) ## Migrating from Version 3.x to Version 4.x diff --git a/config/services/queue.yaml b/config/services/queue.yaml index cddb2f2..ccaccb1 100644 --- a/config/services/queue.yaml +++ b/config/services/queue.yaml @@ -19,6 +19,3 @@ services: DynamicSearchBundle\Queue\DataCollector: arguments: $messageBus: '@dynamic_search.bus' - - DynamicSearchBundle\Queue\DataProcessorInterface: '@DynamicSearchBundle\Queue\DataProcessor' - DynamicSearchBundle\Queue\DataProcessor: ~ diff --git a/tests/_envs/local.yml b/tests/_envs/local.yml index 8012f3c..605a31f 100644 --- a/tests/_envs/local.yml +++ b/tests/_envs/local.yml @@ -1,10 +1,10 @@ modules: config: - \Dachcom\Codeception\Helper\Browser\WebDriver: + \Dachcom\Codeception\Support\Helper\Browser\WebDriver: browser: chrome port: 4444 restart: true wait: 1 capabilities: chromeOptions: - args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1024,768'] + args: ['--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024'] diff --git a/tests/_etc/config/app/config.yaml b/tests/_etc/config/app/config.yaml index 7ac9dbd..b5f83ed 100755 --- a/tests/_etc/config/app/config.yaml +++ b/tests/_etc/config/app/config.yaml @@ -11,6 +11,10 @@ services: - [setContainer, ['@service_container']] doctrine: + orm: + entity_managers: + default: + connection: default dbal: connections: default: