Merge branch '1.x' of https://github.com/pimcore/studio-ui-bundle int…

…o 197-context-menu-improvements

.github/workflows/codeception.yaml

@@ -27,7 +27,6 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: 8.1, dependencies: lowest, pimcore_version: "", experimental: false }
                     - { php-version: 8.2, dependencies: highest, pimcore_version: "", experimental: false }
 
         steps:
@@ -43,7 +42,8 @@ jobs:
 
             - name: "Add authentication for private pimcore packages"
               run: |
-                  composer config --global --auth http-basic.enterprise.repo.pimcore.com token ${{ secrets.COMPOSER_PIMCORE_REPO_TOKEN }}
+                  composer config repositories.private-packagist composer https://repo.pimcore.com/github-actions/
+                  composer config --global --auth http-basic.repo.pimcore.com github-actions ${{ secrets.COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN }}
 
             - name: "Install dependencies with Composer"
               uses: "ramsey/composer-install@v3"

.github/workflows/frontend-build.yaml

@@ -32,12 +32,13 @@ jobs:
       - name: Cache npm dependencies
         uses: actions/cache@v4
         with:
-          path: node_modules
+          path: ./assets/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
       - name: Install dependencies
+        working-directory: ./assets
         run: npm ci
 
   lint:
@@ -59,12 +60,13 @@ jobs:
       - name: Cache npm dependencies
         uses: actions/cache@v4
         with:
-          path: node_modules
+          path: ./assets/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
       - name: Run code linting
+        working-directory: ./assets
         run: npm run lint-fix
 
       - uses: stefanzweifel/git-auto-commit-action@v5
@@ -90,12 +92,13 @@ jobs:
       - name: Cache npm dependencies
         uses: actions/cache@v4
         with:
-          path: node_modules
+          path: ./assets/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
       - name: Run production build
+        working-directory: ./assets
         run: npm run build
 
       - uses: stefanzweifel/git-auto-commit-action@v5
@@ -119,10 +122,11 @@ jobs:
       - name: Cache npm dependencies
         uses: actions/cache@v4
         with:
-          path: node_modules
+          path: ./assets/node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
       - name: Run tests
+        working-directory: ./assets
         run: npm run test

.github/workflows/php-cs-fixer.yaml

@@ -1,7 +1,7 @@
 name: "PHP-CS-Fixer"
 
 on:
-    pull_request:
+    pull_request_target:
         branches:
             - "[0-9]+.[0-9]+"
             - "[0-9]+.x"
@@ -24,7 +24,8 @@ jobs:
         steps:
             - uses: actions/checkout@v4
               with:
-                  ref: ${{ github.head_ref }}
+                  ref: ${{ github.event.pull_request.head.ref }}
+                  repository: ${{ github.event.pull_request.head.repo.full_name }}
 
             - name: PHP-CS-Fixer
               uses: docker://oskarstark/php-cs-fixer-ga:latest

.github/workflows/qodana.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: curl, mbstring, openssl, pdo, pdo_sqlite
           ini-values: memory_limit=-1, date.timezone='UTC'
           coverage: xdebug

.github/workflows/static-analysis.yaml

@@ -24,7 +24,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - { php-version: "8.1", dependencies: "lowest", experimental: false }
           - { php-version: "8.2", dependencies: "highest", experimental: false }
           - { php-version: "8.2", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true }
     steps:

.gitignore

@@ -29,7 +29,9 @@ Thumbs.db
 /var
 /vendor
 
-/node_modules
+# Frontend related files
+assets/node_modules
+assets/dist/build
 
 # code style fixer
 .php_cs

.php-cs-fixer.dist.php

@@ -23,11 +23,14 @@
     'header_comment'         => [
         'comment_type' => 'PHPDoc',
         'header' => 'Pimcore' . PHP_EOL . PHP_EOL .
-            'This source file is available under following license:' . PHP_EOL .
+            'This source file is available under two different licenses:' . PHP_EOL .
+            '- GNU General Public License version 3 (GPLv3)' . PHP_EOL .
             '- Pimcore Commercial License (PCL)' . PHP_EOL .
+            'Full copyright and license information is available in' . PHP_EOL .
+            'LICENSE.md which is distributed with this source code.' . PHP_EOL .
             PHP_EOL .
             ' @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)' . PHP_EOL .
-            ' @license    http://www.pimcore.org/license     PCL'
+            ' @license    http://www.pimcore.org/license     GPLv3 and PCL'
     ],
 
     'blank_line_before_statement'         => true,

LICENSE.md

@@ -1,11 +1,40 @@
 # License
 Copyright (C) Pimcore GmbH
 
-This software is available under following license: 
+This software is available under two different licensing options:
+* Pimcore Open Core License (POCL) + GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
+    * All contents inside of `/assets/` and `/public/build` are licensed under the Pimcore Open Core License (POCL).
+    * All contents outside of `/assets/` and `/public/build` are licensed under the GNU General Public License version 3 (GPLv3).
 * Pimcore Commercial License (PCL)
 
+## Pimcore Community Edition
+If you decide to choose the Pimcore Community Edition, you must comply with the following terms: 
+
+### Pimcore Open Core License (POCL)
+
+> For all contents inside of `/assets/` and `/public/build`
+
+The `pocl.txt` file in the root of this repository contains the Pimcore Open Core License (POCL) licensing terms.
+
+### GNU General Public License version 3 (GPLv3)
+
+> For all contents outside of `/assets/` and `/public/build`
+
+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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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/>.
+
 ## Pimcore Commercial License (PCL)
 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 Pimcore GmbH.
-For more information about the Pimcore Commercial License (PCL) please contact info@pimcore.com.
+For more information about the Pimcore Commercial License (PCL) please contact info@pimcore.com.