Merge branch '1.6' into 1.x

pimcore · Nov 1, 2023 · 9c708be · 9c708be
2 parents ce780dd + 1f7f883
commit 9c708be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -23,23 +23,21 @@ env:
     PIMCORE_PROJECT_ROOT: ${{ github.workspace }}
     APP_ENV: test
     PIMCORE_TEST: 1
-    #PIMCORE_TEST_DB_DSN: "mysql://root@127.0.0.1:33006/pimcore_test"
+    PIMCORE_TEST_DB_DSN: "mysql://root@127.0.0.1:33006/pimcore_test"
     PIMCORE_TEST_REDIS_DSN: "redis://127.0.0.1:63379"
 
 jobs:
     codeception-tests:
         name: "Codeception tests"
         runs-on: "ubuntu-20.04"
         continue-on-error: ${{ matrix.experimental }}
-        env:
-            PIMCORE_TEST_DB_DSN: "mysql://root@127.0.0.1:33006/pimcore_test?serverVersion=${{ matrix.server_version }}"
         strategy:
             matrix:
                 include:
-                    - { php-version: 8.0, database: "mariadb:10.7.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: lowest, experimental: false, require_admin_bundle: false }
-                    - { php-version: 8.1, database: "mariadb:10.7.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, experimental: false, require_admin_bundle: true }
-                    - { php-version: 8.2, database: "mariadb:10.7.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, experimental: false, require_admin_bundle: true }
-                    - { php-version: 8.2, database: "mariadb:10.7.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true, require_admin_bundle: true }
+                    - { php-version: 8.0, database: "mariadb:10.3", dependencies: lowest, experimental: false, require_admin_bundle: false }
+                    - { php-version: 8.1, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true }
+                    - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false, require_admin_bundle: true }
+                    - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true, require_admin_bundle: true }
         services:
             redis:
                 image: redis

diff --git a/src/GraphQL/Resolver/AssetType.php b/src/GraphQL/Resolver/AssetType.php
@@ -193,7 +193,7 @@ public function resolveSrcSet($value = null, $args = [], $context = [], ResolveI
         if ($asset instanceof Asset\Image) {
             $mediaQueries = [];
             $thumbnail = $assetFieldHelper->getAssetThumbnail($asset, $thumbNailConfig, $thumbNailFormat);
-            $thumbnailConfig = $asset->getThumbnailConfig($args['thumbnail']);
+            $thumbnailConfig = $asset->getThumbnail($args['thumbnail'])->getConfig();
             if ($thumbnailConfig) {
                 foreach ($thumbnailConfig->getMedias() as $key => $val) {
                     $mediaQueries[] = [

diff --git a/src/GraphQL/Traits/ElementTagTrait.php b/src/GraphQL/Traits/ElementTagTrait.php
@@ -70,7 +70,7 @@ protected function getTagsFromInput(array $input)
         $tags = [];
         foreach ($input as $tag_input) {
             if (isset($tag_input['id']) && $tag_input['id']) {
-                $tag = Tag::getById($tag_input['id']);
+                $tag = Tag::getById((int)$tag_input['id']);
             } elseif (isset($tag_input['path']) && $tag_input['path']) {
                 $tag = Tag::getByPath($tag_input['path']);
             } else {