Merged branch '4.6' into main

Author: alongosz

.github/workflows/backend-ci.yaml

@@ -212,9 +212,13 @@ jobs:
                     VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
                     composer require --no-update "ibexa/solr:$VERSION"
 
-            -   uses: ramsey/composer-install@v3
+            -   name: Install Composer dependencies
+                uses: ibexa/gh-workflows/actions/composer-install@main
                 with:
-                    dependency-versions: "highest"
+                    gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
+                    gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
+                    satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
+                    satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
 
             -   name: Run integration test suite
                 run: composer test-integration-solr

tests/integration/Core/Repository/SearchService/Aggregation/Field/CountryTermAggregationTest.php

@@ -104,11 +104,11 @@ protected function createFixturesForAggregation(Aggregation $aggregation): void
         $generator->setFieldDefinitionIdentifier('country');
         $generator->setFieldTypeIdentifier('ibexa_country');
         $generator->setValues([
-            ['PL', 'US'],
-            ['FR', 'US'],
-            ['US'],
+            ['PL', 'CA'],
+            ['FR', 'CA'],
+            ['CA'],
             ['GA', 'PL', 'FR'],
-            ['FR', 'BE', 'US'],
+            ['FR', 'BE', 'CA'],
         ]);
 
         $generator->setFieldDefinitionCreateStructConfigurator(