Skip to content

Commit

Permalink
Merge pull request #1 from instride-ch/5.0
Browse files Browse the repository at this point in the history
Merge from source
  • Loading branch information
paulverdu authored Oct 28, 2024
2 parents f242d00 + 0cfa8fc commit 7d39e5c
Show file tree
Hide file tree
Showing 358 changed files with 5,205 additions and 5,016 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/cla-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
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:
CLAAssistant:
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 }}
with:
path-to-signatures: 'signatures/version1/cla.json'
path-to-document: 'https://github.com/instride-ch/pimcore-data-definitions/blob/5.0/CLA.md'
branch: "5.0"
allowlist: user1,bot*
48 changes: 48 additions & 0 deletions .github/workflows/codestyles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Coding standard refactor

on:
schedule:
- cron: "0 2 * * MON" # Run at 2am every Monday
workflow_dispatch: ~

jobs:
coding-standard:
runs-on: ubuntu-latest
name: "Coding standard refactor"

timeout-minutes: 5

strategy:
fail-fast: false
matrix:
branch: [ '4.0' ]

steps:
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.1

- name: Install PHP dependencies
run: composer update --no-interaction --no-scripts

- name: Run ECS
run: vendor/bin/ecs check --fix src

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
commit-message: '[CS] Refactor'
author: CORS GmbH <[email protected]>
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 }}
42 changes: 42 additions & 0 deletions CLA.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# 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 CORS GmbH in combination with instride 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 CORS GmbH and instride 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 CORS GmbH and instride 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 CORS GmbH and instride 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.
21 changes: 20 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# License
Copyright (C) 2016-2024 instride AG
Copyright (C) CORS GmbH in combination with instride AG

This software is available under two different licenses:
* GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
* Data Definitions Commercial License (DDCL)

The default Data Definitions license, without a valid Data Definitions 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
it under the terms of the GNU General Public License as published by
Expand All @@ -13,3 +22,13 @@ 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/>.

## Data Definitions Commercial License (DDCL)
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 CORS GmbH/instride AG.
For more information about the Data Definitions Commercial License (DDCL) please contact [email protected].


Please see also (files in this directory):
[GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - gpl-3.0.txt](gpl-3.0.txt)
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@
"symfony/http-client": "^6.3 | ^7.0"
},
"require-dev": {
"roave/security-advisories": "dev-latest",
"behat/behat": "^3.8",
"friends-of-behat/symfony-extension": "^2.1",
"phpstan/phpstan": "^1.5",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-symfony": "^1.1",
"phpstan/phpstan-webmozart-assert": "^1.1"
"phpstan/phpstan-webmozart-assert": "^1.1",
"roave/security-advisories": "dev-latest",
"symplify/easy-coding-standard": "^11"
},
"conflict": {
"guzzlehttp/psr7": "< 2.0"
Expand Down
Loading

0 comments on commit 7d39e5c

Please sign in to comment.