From ef77523c641c61ccdba1b9b62bbff3a93a1d7ccf Mon Sep 17 00:00:00 2001 From: Stefan Hagspiel Date: Thu, 14 Nov 2024 18:29:28 +0100 Subject: [PATCH 1/2] add cla check --- .actrc | 1 - .gitattributes | 12 +++++++++++ .github/workflows/cla-check.yml | 30 ++++++++++++++++++++++++++ .github/workflows/codeception.yml | 25 +++++++++++---------- .github/workflows/ecs.yml | 18 ++++++++-------- .github/workflows/php-stan.yml | 20 ++++++++++------- CLA.md | 36 +++++++++++++++++++++++++++++++ ISSUE_TEMPLATE.md | 2 +- LICENSE.md | 2 +- README.md | 9 +++++++- tests/_envs/github.yml | 5 +++-- tests/_envs/local.yml | 2 +- tests/_etc/config/app/config.yaml | 4 ++++ 13 files changed, 131 insertions(+), 35 deletions(-) delete mode 100644 .actrc create mode 100644 .gitattributes create mode 100644 .github/workflows/cla-check.yml create mode 100644 CLA.md diff --git a/.actrc b/.actrc deleted file mode 100644 index 4d0fcda..0000000 --- a/.actrc +++ /dev/null @@ -1 +0,0 @@ --P ubuntu-latest=gitlab-actions:latest \ No newline at end of file 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..515af75 --- /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-emailizr/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 1aea67e..d55fdc7 100644 --- 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,9 +99,11 @@ 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 @@ -108,10 +111,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') }} @@ -136,7 +139,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 index 30e65db..7b9834b 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') }} @@ -114,4 +114,4 @@ jobs: continue-on-error: true run: | bin/console cache:warmup --env=test - vendor/bin/ecs check ${{ github.workspace }}/lib/test-bundle/src/EmailizrBundle --config ${{ github.workspace }}/lib/test-bundle/ecs.php \ No newline at end of file + vendor/bin/ecs check ${{ github.workspace }}/lib/test-bundle/src --config ${{ github.workspace }}/lib/test-bundle/ecs.php \ No newline at end of file diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml index 90e5742..35a7177 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 3f51a10..e5ce93d 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -7,6 +7,6 @@ \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md index a2a1ff1..b1a5fc8 100644 --- 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 . -[GNU General Public License](lhttps://www.gnu.org/licenses/gpl-3.0.en.html) \ No newline at end of file +[GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html) \ No newline at end of file diff --git a/README.md b/README.md index 0ec6920..4b6a246 100644 --- a/README.md +++ b/README.md @@ -115,4 +115,11 @@ class YourClass - [Use Emailizr with FormBuilder](docs/10_FormBuilder.md) ## Upgrade Info -Before updating, please [check our upgrade notes!](UPGRADE.md) \ No newline at end of file +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. + +For licensing details please visit [LICENSE.md](LICENSE.md) \ No newline at end of file diff --git a/tests/_envs/github.yml b/tests/_envs/github.yml index ca9cafc..99f9fbe 100644 --- a/tests/_envs/github.yml +++ b/tests/_envs/github.yml @@ -5,8 +5,9 @@ modules: 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' \ No newline at end of file diff --git a/tests/_envs/local.yml b/tests/_envs/local.yml index abd7179..605a31f 100644 --- a/tests/_envs/local.yml +++ b/tests/_envs/local.yml @@ -7,4 +7,4 @@ modules: 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 295c894..3603d34 100755 --- a/tests/_etc/config/app/config.yaml +++ b/tests/_etc/config/app/config.yaml @@ -3,6 +3,10 @@ imports: - { resource: 'local/' } doctrine: + orm: + entity_managers: + default: + connection: default dbal: connections: default: From 6b44ffae5ad8b8dd94d8367188535c01ec9d46ad Mon Sep 17 00:00:00 2001 From: Stefan Hagspiel Date: Thu, 14 Nov 2024 18:41:42 +0100 Subject: [PATCH 2/2] fix capture node arguments --- src/Twig/Node/InlineStyleNode.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Twig/Node/InlineStyleNode.php b/src/Twig/Node/InlineStyleNode.php index 1701af3..d087048 100644 --- a/src/Twig/Node/InlineStyleNode.php +++ b/src/Twig/Node/InlineStyleNode.php @@ -19,8 +19,7 @@ public function compile(Compiler $compiler): void { $node = new CaptureNode( $this->getNode('html'), - $this->getNode('html')->lineno, - $this->getNode('html')->tag + $this->getNode('html')->lineno ); $node->setAttribute('with_blocks', true);