Merge pull request #27 from dachcom-digital/cla

add cla check
dachcom-digital · Nov 15, 2024 · 05dc5b9 · 05dc5b9
2 parents 09b2773 + 464f08d
commit 05dc5b9
Show file tree

Hide file tree

Showing 14 changed files with 131 additions and 39 deletions.
diff --git a/.actrc b/.actrc
diff --git a/.gitattributes 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
diff --git a/.github/workflows/cla-check.yml 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/[email protected]
+                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-index-provider-elasticsearch/blob/master/CLA.md'
+                    branch: 'main'
+                    allowlist: bot*
+                    remote-organization-name: 'dachcom-digital'
+                    remote-repository-name: 'cla'
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -38,14 +38,15 @@ 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: nanasess/setup-chromedriver@v2
+            -   uses: actions/checkout@v4
                 with:
                     path: lib/test-bundle
 
@@ -98,20 +99,22 @@ jobs:
 
             -   name: Setup Chromium
                 run: |
-                    nohup $CHROMEWEBDRIVER/chromedriver --url-base=/wd/hub /dev/null 2>&1 &
+                    export DISPLAY=:99
+                    chromedriver --url-base=/wd/hub --port=9515 &
+                    sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
 
-            -   name: Start Webserver and Chrome
+            -   name: Start Symfony Server
                 run: |
                     curl -sS https://get.symfony.com/cli/installer | bash -s -- --install-dir=$HOME/.symfony/bin
                     ~/.symfony/bin/symfony server:start --port=8080 --dir=public --allow-http --no-tls --daemon
 
             -   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') }}
@@ -139,7 +142,7 @@ jobs:
                     vendor/bin/codecept run --env github -c ${{ github.workspace }}/lib/test-bundle
 
             -   name: Log Output
-                uses: actions/upload-artifact@v2
+                uses: actions/upload-artifact@v4
                 if: failure()
                 with:
                     name: "Logs (PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}, Symfony ${{ matrix.symfony }})"

diff --git 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
@@ -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') }}
@@ -113,6 +113,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
@@ -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.
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -7,6 +7,6 @@
 
 <!--
 - Please fill in this template according to your issue.
-- For support request or how-tos, visit https://gitter.im/pimcore/pimcore or https://talk.pimcore.org/
+- For support request or how-tos, visit the discussions section. 
 - Otherwise, replace this comment by the description of your issue.
 -->
diff --git a/LICENSE.md b/LICENSE.md
@@ -19,4 +19,4 @@ 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](lhttps://www.gnu.org/licenses/gpl-3.0.en.html)  
+[GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html)  
diff --git a/README.md b/README.md
@@ -175,9 +175,12 @@ $  bin/console dynamic-search:es:rebuild-index -c default
 
 ***
 
-## Copyright and License
-Copyright: [DACHCOM.DIGITAL](http://dachcom-digital.com)  
-For licensing details please visit [LICENSE.md](./LICENSE.md)
+## License
+**DACHCOM.DIGITAL AG**, Löwenhofstrasse 15, 9424 Rheineck, Schweiz  
+[dachcom.com](https://www.dachcom.com), [email protected]  
+Copyright © 2024 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)  
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     },
     "require": {
         "pimcore/pimcore": "^11.0",
-        "dachcom-digital/dynamic-search": "^3.0",
+        "dachcom-digital/dynamic-search": "^3.0 || ^4.0",
         "elasticsearch/elasticsearch": "^7.0",
         "handcraftedinthealps/elasticsearch-dsl": "^7.0"
     },

diff --git a/tests/_envs/github.yml b/tests/_envs/github.yml
@@ -1,12 +1,13 @@
 modules:
     config:
-        \Dachcom\Codeception\Helper\Browser\WebDriver:
+        \Dachcom\Codeception\Support\Helper\Browser\WebDriver:
             browser: chrome
             port: 9515
             restart: true
             wait: 1
+            window_size: 1280x1024
             capabilities:
-                chromeOptions:
-                    args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1024,768']
+                'goog:chromeOptions':
+                    args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']
                     prefs:
                         download.default_directory: '%TEST_BUNDLE_TEST_DIR%/_data/downloads'
diff --git 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
@@ -11,6 +11,10 @@ services:
             - [setContainer, ['@service_container']]
 
 doctrine:
+    orm:
+        entity_managers:
+            default:
+                connection: default
     dbal:
         connections:
             default: