Merge 3.x into 4.x

sonata-project · May 30, 2022 · b19bab9 · b19bab9
2 parents e7cb104 + 5b9023d
commit b19bab9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -47,11 +47,6 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 4.4.*
                       variant: symfony/symfony:"4.4.*"
-                    - php-version: '8.1'
-                      dependencies: highest
-                      allowed-to-fail: false
-                      symfony-require: 5.3.*
-                      variant: symfony/symfony:"5.3.*"
                     - php-version: '8.1'
                       dependencies: highest
                       allowed-to-fail: false
@@ -62,6 +57,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.0.*
                       variant: symfony/symfony:"6.0.*"
+                    - php-version: '8.1'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.1.*
+                      variant: symfony/symfony:"6.1.*"
 
         steps:
             - name: Checkout

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -64,7 +64,6 @@
     'static_lambda' => true,
     'strict_comparison' => true,
     'strict_param' => true,
-    'types_spaces' => ['space' => 'single'],
     'void_return' => false,
 ];
 

diff --git a/src/Filter/TranslationFieldFilter.php b/src/Filter/TranslationFieldFilter.php
@@ -101,9 +101,13 @@ public function getRenderSettings(): array
 
     protected function association(ProxyQueryInterface $query, FilterData $data): array
     {
-        $alias = $query->entityJoin($this->getParentAssociationMappings());
+        $defaultAlias = $query->entityJoin($this->getParentAssociationMappings());
+        /** @var literal-string $alias */
+        $alias = $this->getOption('alias', $defaultAlias);
+        /** @var literal-string $fieldName */
+        $fieldName = $this->getFieldName();
 
-        return [(string) $this->getOption('alias', $alias), $this->getFieldName()];
+        return [$alias, $fieldName];
     }
 
     private function applyGedmoFilters(ProxyQueryInterface $query, string $joinAlias, string $alias, string $field, string $value): void