Merge branch 'pimcore:11.x' into 11.x

.gitattributes

@@ -5,13 +5,11 @@
 # Exclude build/test files from archive to reduce ZIP size for composer dist download
 /.github export-ignore
 /doc export-ignore
-/tests export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.markdownlint.json export-ignore
 /.php-cs-fixer.dist.php export-ignore
 /CLA.md export-ignore
 /CONTRIBUTING.md export-ignore
-/codeception.dist.yml export-ignore
 /phpstan* export-ignore

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,15 @@
 <!--
 
 Before working on a contribution, you must determine on which branch you need to work:
-- Bug fix: choose the latest maintenance branch `11.1`
+- Bug fix: choose the latest maintenance branch `11.3`
 - Feature/Improvement: choose `11.x` 
 
 > All bug fixes merged into the latest maintenance branch are also merged to the current dev branch (`11.x`) on a regular basis.
 
 ## Please make sure your PR complies with all of the following points: 
 - [ ] Read and accept our [contributing guidelines](/CONTRIBUTING.md) before you submit a PR.
 - [ ] Features need to be proper documented in `doc/` 
-- [ ] Bugfixes need a short guide how to reproduce them -> target branch is the oldest supported maintenance branch, e.g. `11.1` (see Readme.md for the list of supported versions)
+- [ ] Bugfixes need a short guide how to reproduce them -> target branch is the oldest supported maintenance branch, e.g. `11.3` (see Readme.md for the list of supported versions)
 - [ ] Meet all coding standards (see PhpStan actions) 
 
 **Don't submit a PR if it doesn't comply, it'll be closed without a comment!**

.github/ci/files/bin/console

@@ -13,16 +13,19 @@
  * @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
+use Pimcore\Bootstrap;
+use Pimcore\Console\Application;
+
 ob_get_clean();
 
-include __DIR__ . "/../vendor/autoload.php";
+include __DIR__ . "/../vendor/autoload_runtime.php";
 
 define('PIMCORE_PROJECT_ROOT', __DIR__ . '/..');
 define('PIMCORE_CONSOLE', true);
 
-\Pimcore\Bootstrap::setProjectRoot();
-
-/** @var \Pimcore\Kernel $kernel */
-$kernel = \Pimcore\Bootstrap::startupCli();
-$application = new \Pimcore\Console\Application($kernel);
-$application->run();
+return function (array $context) {
+    $kernel = Bootstrap::startupCli();
+    $application = new Application($kernel);
+    $application->run();
+    return $application;
+};

.github/ci/files/public/index_test.php

@@ -14,6 +14,7 @@
  * @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
+use Pimcore\Bootstrap;
 use Pimcore\Tool;
 use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Request;
@@ -23,8 +24,8 @@
 define('PIMCORE_PROJECT_ROOT', __DIR__ . '/..');
 define('APP_ENV', 'test');
 
-\Pimcore\Bootstrap::setProjectRoot();
-\Pimcore\Bootstrap::bootstrap();
+Bootstrap::setProjectRoot();
+Bootstrap::bootstrap();
 
 $request = Request::createFromGlobals();
 
@@ -33,7 +34,7 @@
 Tool::setCurrentRequest($request);
 
 /** @var \Pimcore\Kernel $kernel */
-$kernel = \Pimcore\Bootstrap::kernel();
+$kernel = Bootstrap::kernel();
 
 // reset current request - will be read from request stack from now on
 Tool::setCurrentRequest(null);
@@ -42,3 +43,4 @@
 $response->send();
 
 $kernel->terminate($request, $response);
+

.github/ci/scripts/symfony-require-dev.sh

@@ -36,6 +36,7 @@ composer require --no-update \
     symfony/security-core:${SYMFONY_VERSION} \
     symfony/security-http:${SYMFONY_VERSION} \
     symfony/serializer:${SYMFONY_VERSION} \
+    symfony/string:${SYMFONY_VERSION} \
     symfony/templating:${SYMFONY_VERSION} \
     symfony/translation:${SYMFONY_VERSION} \
     symfony/twig-bridge:${SYMFONY_VERSION} \
@@ -45,4 +46,4 @@ composer require --no-update \
     symfony/var-dumper:${SYMFONY_VERSION} \
     symfony/web-profiler-bundle:${SYMFONY_VERSION} \
     symfony/workflow:${SYMFONY_VERSION} \
-    symfony/yaml:${SYMFONY_VERSION}
+    symfony/yaml:${SYMFONY_VERSION}

.github/workflows/cla-check.yaml

@@ -0,0 +1,14 @@
+name: CLA check
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened, closed, synchronize]
+
+jobs:
+  cla-workflow:
+    uses: pimcore/workflows-collection-public/.github/workflows/[email protected]
+    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'
+    secrets:
+      CLA_ACTION_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }}

.github/workflows/codeception.yaml

@@ -40,10 +40,12 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: 8.1, database: "mariadb:10.3", dependencies: lowest, experimental: false, storage: local, symfony: "", composer-options: "" }
+                    - { php-version: 8.3, database: "mariadb:11.2", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
+                    - { php-version: 8.3, database: "mariadb:10.3", dependencies: lowest, experimental: false, storage: local, symfony: "", composer-options: "" }
                     - { php-version: 8.2, database: "mariadb:10.5", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
-                    - { php-version: 8.1, database: "mariadb:10.7", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
                     - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
+                    - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: true, storage: local, symfony: "6.4.x-dev", composer-options: "" }
+                    - { php-version: 8.1, database: "mariadb:10.7", dependencies: highest, experimental: false, storage: local, symfony: "", composer-options: "" }
                     - { php-version: 8.1, database: "mysql:8.0", dependencies: lowest, experimental: false, storage: local, symfony: "", composer-options: "" }
                     - { php-version: 8.1, database: "percona:8.0", dependencies: lowest, experimental: false, storage: minio, symfony: "", composer-options: "" }
 

.github/workflows/composer-checks-outdated-monthly.yaml

@@ -0,0 +1,25 @@
+name: "Composer outdated check - monthly minor check"
+
+on:
+    workflow_dispatch:
+    schedule:
+        - cron:  '0 7 1 * *'
+
+permissions:
+  contents: read
+
+jobs:
+    composer-checks:
+        uses: pimcore/workflows-collection-public/.github/workflows/reusable-composer-checks.yaml@main
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - { php-version: 8.3, branch: 11.x }
+                    - { php-version: 8.3, branch: 11.3 }
+        with:
+            php-version: ${{ matrix.php-version }}
+            branch: ${{ matrix.branch }}
+            ignore-list: "public"
+            version-type: "-m"
+        secrets: inherit

.github/workflows/composer-checks.yaml → .github/workflows/composer-checks-outdated.yaml

@@ -1,8 +1,9 @@
-
-name: "Composer Audit & Outdated"
+name: "Composer outdated check"
 
 on:
     workflow_dispatch:
+    schedule:
+        - cron:  '0 7 * * 5'
 
 permissions:
   contents: read
@@ -14,8 +15,10 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - { php-version: 8.1, branch: 10.6 }
-                    - { php-version: 8.2, branch: 11.x }
+                    - { php-version: 8.3, branch: 11.x }
+                    - { php-version: 8.3, branch: 11.3 }
         with:
             php-version: ${{ matrix.php-version }}
             branch: ${{ matrix.branch }}
+            ignore-list: "public"
+        secrets: inherit

.github/workflows/composer-checks-vulnerabilities.yaml

@@ -0,0 +1,24 @@
+name: "Composer vulnerabilities check"
+
+on:
+    workflow_dispatch:
+    schedule:
+        - cron:  '0 7 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+    composer-checks:
+        uses: pimcore/workflows-collection-public/.github/workflows/reusable-composer-vulnerabilities.yaml@main
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - { php-version: 8.3, branch: 11.x }
+                    - { php-version: 8.3, branch: 11.3 }
+        with:
+            php-version: ${{ matrix.php-version }}
+            branch: ${{ matrix.branch }}
+            ignore-list: "public"
+        secrets: inherit

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

@@ -1,28 +1,24 @@
-
 name: "PHP-CS-Fixer"
 
 on:
     push:
         branches:
             - "[0-9]+.[0-9]+"
             - "[0-9]+.x"
+            - "*_actions"
+            - "feature-*"
+    pull_request_target:
+        types: [ opened,synchronize ]
 
 permissions:
-  contents: read
+    contents: write
 
 jobs:
-    php-cs-fixer:
-        permissions:
-          contents: write  # for stefanzweifel/git-auto-commit-action to push code in repo
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-              with:
-                  ref: ${{ github.head_ref }}
-
-            - name: PHP-CS-Fixer
-              uses: docker://oskarstark/php-cs-fixer-ga:latest
-
-            - uses: stefanzweifel/git-auto-commit-action@v4
-              with:
-                  commit_message: Apply php-cs-fixer changes
+    php-style:
+        uses: pimcore/workflows-collection-public/.github/workflows/reusable-php-cs-fixer.yaml@main
+        secrets:
+            PHP_CS_FIXER_GITHUB_TOKEN: ${{ secrets.PHP_CS_FIXER_GITHUB_TOKEN }}
+        with:
+            head_ref: ${{ github.event.pull_request.head.ref }}
+            repository: ${{ github.event.pull_request.head.repo.full_name }}
+            config_file: .php-cs-fixer.dist.php

.github/workflows/pull-request-checklist.yaml

@@ -16,7 +16,7 @@ jobs:
               env:
                   MESSAGE: |
                       ### Review Checklist
-                      - [ ] Target branch (`11.1` for bug fixes, others `11.x`)
+                      - [ ] Target branch (`11.3` for bug fixes, others `11.x`)
                       - [ ] Tests (if it's testable code, there should be a test for it - [get help](https://pimcore.com/docs/pimcore/current/Development_Documentation/Development_Tools_and_Details/Testing/Core_Tests.html))
                       - [ ] Docs (every functionality needs to be documented, [see here](https://github.com/pimcore/pimcore/tree/11.x/doc)) 
                       - [ ] [Migration](https://pimcore.com/docs/pimcore/current/Development_Documentation/Development_Tools_and_Details/Migrations.html) incl. `install.sql` (e.g. if the database schema changes, ...) 
@@ -32,4 +32,3 @@ jobs:
                         repo: context.repo.repo,
                         body: `${MESSAGE}`
                       })
-                      

.github/workflows/stale.yaml

@@ -8,35 +8,35 @@ permissions:
   contents: read
 
 jobs:
-    stale:
-        permissions:
-          issues: write  # for actions/stale to close stale issues
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/stale@v4
-              with:
-                days-before-stale: 20
-                days-before-close: 180
-                days-before-pr-stale: -1
-                days-before-pr-close: -1
-                exempt-all-milestones: true
-                exempt-issue-labels: 'Priority,Backlog'
-                remove-stale-when-updated: false
-                stale-issue-label: 'PR Welcome'
-                stale-issue-message: >
-                    Thanks a lot for reporting the issue.
-                    We did not consider the issue as "Priority" or "Backlog",
-                    so we're not going to work on that anytime soon.
-                    Please create a pull request to fix the issue if this is a bug report.
-                    We'll then review it as quickly as possible.
-                    If you're interested in contributing a feature, please contact us
-                    first here before creating a pull request. We'll then decide whether
-                    we'd accept it or not.
-                    Thanks for your understanding.
-                close-issue-message: >
-                    Closed due to inactivity (180 days).
-                    Please feel free to continue the discussion or provide the missing information on this issue,
-                    we'll then reopen it if necessary.
-                    Thanks a lot! 
-
-
+  stale:
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          days-before-issue-stale: 20
+          days-before-issue-close: -1
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          exempt-all-milestones: true
+          exempt-issue-labels: 'Pimcore:Priority,Pimcore:Backlog,Pimcore:ToDo'
+          remove-stale-when-updated: false
+          stale-issue-label: 'PR Welcome'
+          operations-per-run: 200
+          stale-issue-message: >
+              Thanks a lot for reporting the issue.
+              We did not consider the issue as "Pimcore:Priority", "Pimcore:ToDo" or "Pimcore:Backlog",
+              so we're not going to work on that anytime soon.
+              Please create a pull request to fix the issue if this is a bug report.
+              We'll then review it as quickly as possible.
+              If you're interested in contributing a feature, please contact us
+              first here before creating a pull request. We'll then decide whether
+              we'd accept it or not.
+              Thanks for your understanding.
+          close-issue-message: >
+              Closed due to inactivity (365 days).
+              Please feel free to continue the discussion or provide the missing information on this issue,
+              we'll then reopen it if necessary.
+              Thanks a lot!
+                

.github/workflows/static-analysis.yaml

@@ -38,9 +38,11 @@ jobs:
         strategy:
             matrix:
                 include:
+                    - { php-version: "8.3", dependencies: "lowest", experimental: false, symfony: "", composer-options: "" }
+                    - { php-version: "8.3", dependencies: "highest", experimental: false, symfony: "", composer-options: "" }
                     - { php-version: "8.2", dependencies: "lowest", experimental: false, symfony: "", composer-options: "" }
                     - { php-version: "8.2", dependencies: "highest", experimental: false, symfony: "", composer-options: "" }
-                    - { php-version: "8.2", dependencies: "highest", experimental: true, symfony: "6.3.x-dev", composer-options: "" }
+                    - { php-version: "8.2", dependencies: "highest", experimental: true, symfony: "6.4.x-dev", composer-options: "" }
                     - { php-version: "8.1", dependencies: "lowest", experimental: false, symfony: "", composer-options: "" }
                     - { php-version: "8.1", dependencies: "highest", experimental: false, symfony: "", composer-options: "" }
 
@@ -86,7 +88,7 @@ jobs:
 
             - name: "Upload baseline file"
               if: ${{ failure() }}
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: phpstan-baseline.neon
                   path: phpstan-baseline.neon