Merge remote-tracking branch 'origin/1.9' into 1.x

# Conflicts: # .github/workflows/codeception.yml # .github/workflows/static-analysis.yml
pimcore · Feb 20, 2025 · acc18fa · acc18fa
2 parents b28e6e8 + 87b443e
commit acc18fa
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 139 deletions.
diff --git a/.github/ci/scripts/setup-environment.sh → ...b/ci/scripts/setup-pimcore-environment.sh b/.github/ci/scripts/setup-environment.sh → ...b/ci/scripts/setup-pimcore-environment.sh
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -1,102 +1,92 @@
-
-name: "Codeception Tests"
+name: "Codeception Tests centralised"
 
 on:
-    schedule:
-        - cron: '0 3 * * 1,3,5'
-    pull_request:
-        branches:
-            - "[0-9]+.[0-9]+"
-            - "[0-9]+.x"
-        paths-ignore:
-            - 'doc/**'
-            - 'src/Resources/public/**'
+    workflow_dispatch:
     push:
         branches:
             - "[0-9]+.[0-9]+"
             - "[0-9]+.x"
-        paths-ignore:
-            - 'doc/**'
-            - 'src/Resources/public/**'
+            - "feature-*"
+    pull_request:
+        types: [opened, synchronize, reopened]
 
 env:
     PIMCORE_PROJECT_ROOT: ${{ github.workspace }}
-    APP_ENV: test
-    PIMCORE_TEST: 1
-    PIMCORE_TEST_DB_DSN: "mysql://[email protected]:33006/pimcore_test"
-    PIMCORE_TEST_REDIS_DSN: "redis://127.0.0.1:63379"
+    PRIVATE_REPO: ${{ github.event.repository.private }}
 
 jobs:
-    codeception-tests:
-        name: "Codeception tests"
-        runs-on: "ubuntu-20.04"
-        continue-on-error: ${{ matrix.experimental }}
-        strategy:
-            matrix:
-                include:
-                    - { php-version: 8.1, database: "mariadb:10.3", dependencies: lowest, experimental: false }
-                    - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false }
-                    - { php-version: 8.3, database: "mariadb:10.11", dependencies: highest, experimental: false }
-                    - { php-version: 8.4, database: "mariadb:10.11", dependencies: highest, pimcore_version: "12.x-dev", experimental: true }
-        services:
-            redis:
-                image: redis
-                ports:
-                    - 63379:6379
-            mariadb:
-                image: "${{ matrix.database }}"
-                ports:
-                    - 33006:3306
-                env:
-                    MYSQL_ALLOW_EMPTY_PASSWORD: yes
-
+    setup-matrix:
+        runs-on: ubuntu-latest
+        outputs:
+            php_versions: ${{ steps.parse-php-versions.outputs.php_versions }}
+            matrix: ${{ steps.set-matrix.outputs.matrix }}
+            private_repo: ${{ env.PRIVATE_REPO }}
         steps:
-            - name: "Checkout code"
-              uses: "actions/checkout@v2"
+            - name: Checkout code
+              uses: actions/checkout@v4
 
-            - name: "Install PHP"
-              uses: "shivammathur/setup-php@v2"
+            - name: Checkout reusable workflow repo
+              uses: actions/checkout@v4
               with:
-                  coverage: "none"
-                  extensions: imagick
-                  ini-values: display_errors=On, display_startup_errors=On, error_reporting=32767
-                  php-version: "${{ matrix.php-version }}"
+                  repository: pimcore/workflows-collection-public
+                  ref: main
+                  path: reusable-workflows
 
-            - name: Verify MariaDB connection
+            - name: Parse PHP versions from composer.json
+              id: parse-php-versions
               run: |
-                  cp .github/ci/files/.my.cnf ~/.my.cnf
-                  while ! mysqladmin ping --silent; do
-                    sleep 1
-                  done
+                  if [ -f composer.json ]; then
+                    php_versions=$(jq -r '.require.php' composer.json | grep -oP '\d+\.\d+' | tr '\n' ',' | sed 's/,$//')
+                    if [ -z "$php_versions" ]; then
+                      echo "No PHP versions found in composer.json"
+                      echo "Setting default PHP value"
+                      echo "php_versions=default" >> $GITHUB_OUTPUT
+                    else
+                      echo "php_versions=$php_versions" >> $GITHUB_OUTPUT
+                      echo "#### php versions #### : $php_versions"
+                    fi
+                  else
+                    echo "composer.json not found"
+                    exit 1
+                  fi
 
-            - name: "Setup Pimcore environment"
+            - name: Set up matrix
+              id: set-matrix
               run: |
-                  mysql -e "CREATE DATABASE pimcore_test CHARSET=utf8mb4;"
-                  chmod 755 .github/ci/scripts/setup-environment.sh
-                  .github/ci/scripts/setup-environment.sh
+                  php_versions="${{ steps.parse-php-versions.outputs.php_versions }}"
+                  
+                  MATRIX_JSON=$(cat reusable-workflows/codeception-tests-configuration/matrix-config.json)
+                  
+                  IFS=',' read -ra VERSIONS_ARRAY <<< "$php_versions"
+                  
+                  FILTERED_MATRIX_JSON=$(echo $MATRIX_JSON | jq --arg php_versions "$php_versions" '
+                  {
+                    matrix: [
+                      .configs[] |
+                      select(.php_version == $php_versions) |
+                      .matrix[]
+                    ]
+                  }')
+                  
+                  ENCODED_MATRIX_JSON=$(echo $FILTERED_MATRIX_JSON | jq -c .)
+                  
+                  echo "matrix=${ENCODED_MATRIX_JSON}" >> $GITHUB_OUTPUT
 
-            - name: "Update Pimcore version"
-              env:
-                  PIMCORE_VERSION: "${{ matrix.pimcore_version }}"
-              run: |
-                  if [ ! -z "$PIMCORE_VERSION" ]; then
-                        composer require --no-update pimcore/pimcore:"${PIMCORE_VERSION}"
-                  fi    
-
-            - name: "Install dependencies with Composer"
-              uses: "ramsey/composer-install@v2"
-              with:
-                  dependency-versions: "${{ matrix.dependencies }}"
-#
-#            - name: "Test environment infos"
-#              run: |
-#                  mysql -e "SELECT VERSION();"
-#                  php -i
-#                  ./bin/console pimcore:system:requirements:check
-
-            - name: "Sync Metadata Storage"
-              run: |
-                  bin/console doctrine:migrations:sync-metadata-storage -vvv
-
-            - name: "Run Codeception"
-              run: "vendor/bin/codecept run -c . -vvv --xml"
+    codeception-tests:
+        needs: setup-matrix
+        strategy:
+            matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
+        uses: pimcore/workflows-collection-public/.github/workflows/reusable-codeception-tests-centralized.yaml@main
+        with:
+            APP_ENV: test
+            PIMCORE_TEST: 1
+            PRIVATE_REPO: ${{ needs.setup-matrix.outputs.private_repo}}
+            PHP_VERSION: ${{ matrix.matrix.php-version }}
+            DATABASE: ${{ matrix.matrix.database }}
+            SERVER_VERSION: ${{ matrix.matrix.server_version }}
+            DEPENDENCIES: ${{ matrix.matrix.dependencies }}
+            EXPERIMENTAL: ${{ matrix.matrix.experimental }}
+            PIMCORE_VERSION: ${{ matrix.matrix.pimcore_version }}
+        secrets:
+            SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER: ${{ secrets.SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER }}
+            COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN: ${{ secrets.COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN }}
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -1,71 +1,95 @@
-name: "Static Analysis"
+name: "Static analysis centralised"
 
 on:
     schedule:
-        - cron: '0 3 * * 1,3,5'
-    pull_request:
-        branches:
-            - "[0-9]+.[0-9]+"
-            - "[0-9]+.x"
-        paths-ignore:
-            - 'doc/**'
-            - 'src/Resources/public/**'
+        -   cron: '0 3 * * 1,3,5'
+    workflow_dispatch:
     push:
         branches:
             - "[0-9]+.[0-9]+"
             - "[0-9]+.x"
-        paths-ignore:
-            - 'doc/**'
-            - 'src/Resources/public/**'
+            - "feature-*"
+    pull_request:
+        types: [ opened, synchronize, reopened ]
+
+
+env:
+    PIMCORE_PROJECT_ROOT: ${{ github.workspace }}
+    PRIVATE_REPO: ${{ github.event.repository.private }}
 
 jobs:
-    static-analysis-phpstan:
-        name: "Static Analysis with PHPStan"
-        runs-on: "ubuntu-20.04"
-        strategy:
-            matrix:
-                include:
-                    - { php-version: "8.1", dependencies: "lowest" }
-                    - { php-version: "8.2", dependencies: "highest" }
-                    - { php-version: "8.3", dependencies: "highest"}
-                    - { php-version: "8.4", dependencies: "highest", pimcore_version: "12.x-dev", phpstan_args: "", experimental: true }
+    setup-matrix:
+        runs-on: ubuntu-latest
+        outputs:
+            php_versions: ${{ steps.parse-php-versions.outputs.php_versions }}
+            matrix: ${{ steps.set-matrix.outputs.matrix }}
+            private_repo: ${{ env.PRIVATE_REPO }}
         steps:
-            - name: "Checkout code"
-              uses: "actions/checkout@v2"
+            - name: Checkout code
+              uses: actions/checkout@v4
 
-            - name: "Install PHP"
-              uses: "shivammathur/setup-php@v2"
+            - name: Checkout reusable workflow repo
+              uses: actions/checkout@v4
               with:
-                  coverage: "none"
-                  php-version: "${{ matrix.php-version }}"
+                  repository: pimcore/workflows-collection-public
+                  ref: main
+                  path: reusable-workflows
 
-            - name: "Setup Pimcore environment"
+            - name: Parse PHP versions from composer.json
+              id: parse-php-versions
               run: |
-                  .github/ci/scripts/setup-environment.sh
+                  if [ -f composer.json ]; then
+                    php_versions=$(jq -r '.require.php' composer.json | grep -oP '\d+\.\d+' | tr '\n' ',' | sed 's/,$//')
+                    if [ -z "$php_versions" ]; then
+                      echo "No PHP versions found in composer.json"
+                      echo "Setting default PHP value"
+                      echo "php_versions=default" >> $GITHUB_OUTPUT
+                    else
+                      echo "php_versions=$php_versions" >> $GITHUB_OUTPUT
+                      echo "#### php versions #### : $php_versions"
+                    fi
+                  else
+                    echo "composer.json not found"
+                    exit 1
+                  fi
 
-            - name: "Update Pimcore version"
-              env:
-                  PIMCORE_VERSION: "${{ matrix.pimcore_version }}"
+            - name: Set up matrix
+              id: set-matrix
               run: |
-                  if [ ! -z "$PIMCORE_VERSION" ]; then
-                        composer require --no-update pimcore/pimcore:"${PIMCORE_VERSION}"
-                  fi  
-
-            - name: "Install dependencies with Composer"
-              uses: "ramsey/composer-install@v2"
-              with:
-                  dependency-versions: "${{ matrix.dependencies }}"
-
-            - name: "Run a static analysis with phpstan/phpstan"
-              run: "vendor/bin/phpstan analyse --memory-limit=-1"
+                  php_versions="${{ steps.parse-php-versions.outputs.php_versions }}"
+                  
+                  MATRIX_JSON=$(cat reusable-workflows/phpstan-configuration/matrix-config.json)
+                  
+                  IFS=',' read -ra VERSIONS_ARRAY <<< "$php_versions"
+                  
+                  FILTERED_MATRIX_JSON=$(echo $MATRIX_JSON | jq --arg php_versions "$php_versions" '
+                  {
+                    matrix: [
+                      .configs[] |
+                      select(.php_version == $php_versions) |
+                      .matrix[]
+                    ]
+                  }')
+                  
+                  ENCODED_MATRIX_JSON=$(echo $FILTERED_MATRIX_JSON | jq -c .)
+                  
+                  echo "matrix=${ENCODED_MATRIX_JSON}" >> $GITHUB_OUTPUT
 
-            - name: "Generate baseline file"
-              if: ${{ failure() }}
-              run: "vendor/bin/phpstan analyse --memory-limit=-1 --generate-baseline"
-
-            - name: "Upload baseline file"
-              if: ${{ failure() }}
-              uses: actions/upload-artifact@v4
-              with:
-                  name: phpstan-baseline.neon
-                  path: phpstan-baseline.neon
+    static-analysis:
+        needs: setup-matrix
+        strategy:
+            matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
+        uses: pimcore/workflows-collection-public/.github/workflows/reusable-static-analysis-centralized.yaml@main
+        with:
+            APP_ENV: test
+            PIMCORE_TEST: 1
+            PRIVATE_REPO: ${{ needs.setup-matrix.outputs.private_repo}}
+            PHP_VERSION: ${{ matrix.matrix.php-version }}
+            SYMFONY: ${{ matrix.matrix.symfony }}
+            DEPENDENCIES: ${{ matrix.matrix.dependencies }}
+            EXPERIMENTAL: ${{ matrix.matrix.experimental }}
+            PIMCORE_VERSION: ${{ matrix.matrix.pimcore_version }}
+            COMPOSER_OPTIONS: ${{ matrix.matrix.composer_options }}
+        secrets:
+            SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER: ${{ secrets.SSH_PRIVATE_KEY_PIMCORE_DEPLOYMENTS_USER }}
+            COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN: ${{ secrets.COMPOSER_PIMCORE_REPO_PACKAGIST_TOKEN }}
diff --git a/src/GraphQL/Resolver/TranslationListing.php b/src/GraphQL/Resolver/TranslationListing.php
@@ -61,8 +61,9 @@ public function resolveListing(mixed $value = null, array $args = [], array $con
 
         if (!empty($args['keys'])) {
             $keysArray = explode(',', $args['keys']);
-            $keysString = "'" . implode("','", $keysArray) . "'" ;
-            $list->setCondition('translations_messages.key IN (' . $keysString . ')');
+            $keysArray = array_map(fn ($value): string => $list->quote($value), $keysArray);
+            $keysString = implode(',', $keysArray);
+            $list->setCondition('`key` IN (' . $keysString . ')');
         }
 
         if (!empty($args['languages'])) {