IBX-8470: Upgraded codebase to Symfony 6 (#78)

* IBX-8470: Upgraded dependencies to Symfony 6 * Fixed phpstan issues after upgrading * [GraphQL] Replaced deprecated resolver expression function usage --------- Co-authored-by: Adam Wójs <[email protected]>
ibexa · Feb 4, 2025 · f6344ca · f6344ca
1 parent e577855
commit f6344ca
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -15,13 +15,13 @@
         "ibexa/graphql": "~5.0.x-dev",
         "ibexa/rest": "~5.0.x-dev",
         "psr/log": "^1.1",
-        "symfony/dependency-injection": "^5.0",
-        "symfony/event-dispatcher": "^5.0",
-        "symfony/expression-language": "^5.0",
-        "symfony/framework-bundle": "^5.0",
-        "symfony/http-kernel": "^5.0",
-        "symfony/translation": "^5.0",
-        "symfony/yaml": "^5.0"
+        "symfony/dependency-injection": "^6.4",
+        "symfony/event-dispatcher": "^6.4",
+        "symfony/expression-language": "^6.4",
+        "symfony/framework-bundle": "^6.4",
+        "symfony/http-kernel": "^6.4",
+        "symfony/translation": "^6.4",
+        "symfony/yaml": "^6.4"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -90,12 +90,6 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Legacy/Content/FieldValue/Converter/QueryConverter.php
 
-		-
-			message: '#^Anonymous function should return Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Content but returns Ibexa\\Contracts\\Core\\Repository\\Values\\ValueObject\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/QueryFieldService.php
-
 		-
 			message: '#^Method Ibexa\\FieldTypeQuery\\QueryFieldService\:\:isExpression\(\) has parameter \$expression with no type specified\.$#'
 			identifier: missingType.parameter

diff --git a/src/bundle/Resources/config/graphql/types/QueryFieldType.types.yaml b/src/bundle/Resources/config/graphql/types/QueryFieldType.types.yaml
@@ -18,7 +18,7 @@ ContentQueryFieldSettings:
             parameters:
                 type: "[ContentQueryFieldParameter]"
                 description: "Parameters used to generate the Query from the Query type"
-                resolve: "@=resolver('QueryFieldDefinitionParameters', [value['Parameters']])"
+                resolve: "@=query('QueryFieldDefinitionParameters', [value['Parameters']])"
             returnedType:
                 type: ContentType
                 description: "Content type returned by the field"

diff --git a/src/lib/ContentView/QueryResultsPagerFantaAdapter.php b/src/lib/ContentView/QueryResultsPagerFantaAdapter.php
@@ -11,6 +11,9 @@
 use Ibexa\Contracts\FieldTypeQuery\QueryFieldServiceInterface;
 use Pagerfanta\Adapter\AdapterInterface;
 
+/**
+ * @implements AdapterInterface<\Ibexa\Contracts\Core\Repository\Values\Content\Content>
+ */
 final class QueryResultsPagerFantaAdapter implements AdapterInterface
 {
     /** @var \Ibexa\Contracts\FieldTypeQuery\QueryFieldServiceInterface */
@@ -32,15 +35,15 @@ public function __construct(
         $this->fieldDefinitionIdentifier = $fieldDefinitionIdentifier;
     }
 
-    public function getNbResults()
+    public function getNbResults(): int
     {
-        return $this->queryFieldService->countContentItems(
+        return max($this->queryFieldService->countContentItems(
             $this->content,
             $this->fieldDefinitionIdentifier
-        );
+        ), 0);
     }
 
-    public function getSlice($offset, $length)
+    public function getSlice($offset, $length): iterable
     {
         return $this->queryFieldService->loadContentItemsSlice(
             $this->content,

diff --git a/src/lib/ContentView/QueryResultsWithLocationPagerFantaAdapter.php b/src/lib/ContentView/QueryResultsWithLocationPagerFantaAdapter.php
@@ -11,6 +11,9 @@
 use Ibexa\Contracts\FieldTypeQuery\QueryFieldLocationService;
 use Pagerfanta\Adapter\AdapterInterface;
 
+/**
+ * @implements AdapterInterface<\Ibexa\Contracts\Core\Repository\Values\Content\Content>
+ */
 final class QueryResultsWithLocationPagerFantaAdapter implements AdapterInterface
 {
     /** @var \Ibexa\Contracts\FieldTypeQuery\QueryFieldLocationService */
@@ -32,15 +35,15 @@ public function __construct(
         $this->fieldDefinitionIdentifier = $fieldDefinitionIdentifier;
     }
 
-    public function getNbResults()
+    public function getNbResults(): int
     {
-        return $this->queryFieldService->countContentItemsForLocation(
+        return max($this->queryFieldService->countContentItemsForLocation(
             $this->location,
             $this->fieldDefinitionIdentifier
-        );
+        ), 0);
     }
 
-    public function getSlice($offset, $length)
+    public function getSlice($offset, $length): iterable
     {
         return $this->queryFieldService->loadContentItemsSliceForLocation(
             $this->location,

diff --git a/src/lib/GraphQL/QueryFieldResolver.php b/src/lib/GraphQL/QueryFieldResolver.php
@@ -32,7 +32,7 @@ public function resolveQueryField(Field $field, Content $content): iterable
     }
 
     /**
-     * @return \GraphQL\Executor\Promise\Promise|\Overblog\GraphQLBundle\Relay\Connection\Output\Connection|null
+     * @return \GraphQL\Executor\Promise\Promise|\Overblog\GraphQLBundle\Relay\Connection\Output\Connection<\Ibexa\Contracts\Core\Repository\Values\Content\Content>|null
      */
     public function resolveQueryFieldConnection(Argument $args, ?Field $field, Content $content)
     {
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * @return \GraphQL\Executor\Promise\Promise|\Overblog\GraphQLBundle\Relay\Connection\Output\Connection|null
+         * @return \GraphQL\Executor\Promise\Promise|\Overblog\GraphQLBundle\Relay\Connection\Output\Connection<\Ibexa\Contracts\Core\Repository\Values\Content\Content>|null
          */
         public function resolveQueryFieldConnection(Argument $args, ?Field $field, Content $content)
         {
@@ Expand Down @@