Merge remote-tracking branch 'origin/4.6'

# Conflicts:
#	composer.json
#	src/bundle/Controller/QueryFieldRestController.php
#	src/lib/Persistence/Legacy/Content/FieldValue/Converter/QueryConverter.php
#	src/lib/QueryFieldPaginationService.php

.github/workflows/ci.yaml

@@ -64,3 +64,6 @@ jobs:
 
             - name: Run unit test suite
               run: composer test
+
+            - name: Run PHPStan analysis
+              run: composer run-script phpstan

composer.json

@@ -43,25 +43,27 @@
         "ibexa/fieldtype-richtext": "~5.0.x-dev",
         "ibexa/http-cache": "~5.0.x-dev",
         "ibexa/notifications": "~5.0.x-dev",
+        "ibexa/phpstan": "~5.0.0@dev",
         "ibexa/search": "~5.0.x-dev",
         "ibexa/user": "~5.0.x-dev",
-        "phpspec/phpspec": "^7.1"
+        "phpspec/phpspec": "^7.1",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-symfony": "^2.0"
     },
     "scripts": {
         "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",
         "check-cs": "@fix-cs --dry-run",
-        "test": "phpspec run --format=pretty"
+        "test": "phpspec run --format=pretty",
+        "phpstan": "phpstan analyse"
     },
     "extra": {
         "branch-alias": {
             "dev-main": "5.0.x-dev"
         }
     },
     "config": {
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true,
-            "php-http/discovery": false
-        },
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": false
     }
 }

phpstan-baseline.neon

@@ -0,0 +1,139 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Parameter \#1 \$href of method Ibexa\\Rest\\RequestParser\:\:parseHref\(\) expects string, string\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/bundle/Controller/QueryFieldRestController.php
+
+		-
+			message: '#^Parameter \#1 \$locationId of method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:loadLocation\(\) expects int, int\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/bundle/Controller/QueryFieldRestController.php
+
+		-
+			message: '#^Argument of an invalid type array\|bool\|float\|int\|string\|null supplied for foreach, only iterables are supported\.$#'
+			identifier: foreach.nonIterable
+			count: 1
+			path: src/bundle/DependencyInjection/Compiler/FieldDefinitionIdentifierViewMatcherPass.php
+
+		-
+			message: '#^Cannot access offset \(int\|string\) on non\-empty\-array\|bool\|float\|int\|string\|null\.$#'
+			identifier: offsetAccess.nonOffsetAccessible
+			count: 1
+			path: src/bundle/DependencyInjection/Compiler/FieldDefinitionIdentifierViewMatcherPass.php
+
+		-
+			message: '#^Parameter \#2 \$callback of function array_filter expects \(callable\(int\|string\)\: bool\)\|null, Closure\(mixed\)\: \(0\|1\|false\) given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/bundle/DependencyInjection/Compiler/FieldDefinitionIdentifierViewMatcherPass.php
+
+		-
+			message: '#^Parameter \#1 \$queryTypeIdentifier of method Ibexa\\Bundle\\FieldTypeQuery\\DependencyInjection\\Compiler\\QueryTypesListPass\:\:buildQueryTypeName\(\) expects string, int\|string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/bundle/DependencyInjection/Compiler/QueryTypesListPass.php
+
+		-
+			message: '#^Parameter \#1 \$input of static method Symfony\\Component\\Yaml\\Yaml\:\:parse\(\) expects string, string\|false given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/bundle/DependencyInjection/IbexaFieldTypeQueryExtension.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\ContentView\\QueryResultsInjector\:\:__construct\(\) has parameter \$views with no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/lib/ContentView/QueryResultsInjector.php
+
+		-
+			message: '#^Property Ibexa\\FieldTypeQuery\\ContentView\\QueryResultsInjector\:\:\$queryFieldService \(Ibexa\\Contracts\\FieldTypeQuery\\QueryFieldLocationService&Ibexa\\Contracts\\FieldTypeQuery\\QueryFieldServiceInterface\) does not accept Ibexa\\Contracts\\FieldTypeQuery\\QueryFieldServiceInterface\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: src/lib/ContentView/QueryResultsInjector.php
+
+		-
+			message: '#^Property Ibexa\\FieldTypeQuery\\ContentView\\QueryResultsInjector\:\:\$views type has no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/lib/ContentView/QueryResultsInjector.php
+
+		-
+			message: '#^Property Ibexa\\FieldTypeQuery\\ExceptionSafeQueryFieldService\:\:\$inner \(Ibexa\\Contracts\\FieldTypeQuery\\QueryFieldLocationService&Ibexa\\Contracts\\FieldTypeQuery\\QueryFieldServiceInterface\) does not accept Ibexa\\Contracts\\FieldTypeQuery\\QueryFieldServiceInterface\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: src/lib/ExceptionSafeQueryFieldService.php
+
+		-
+			message: '#^Class Ibexa\\FieldTypeQuery\\FieldType\\Form\\QueryFieldFormType extends generic class Symfony\\Component\\Form\\AbstractType but does not specify its types\: TData$#'
+			identifier: missingType.generics
+			count: 1
+			path: src/lib/FieldType/Form/QueryFieldFormType.php
+
+		-
+			message: '#^Generator expects key type string, string\|null given\.$#'
+			identifier: generator.keyType
+			count: 1
+			path: src/lib/FieldType/Mapper/QueryFormMapper.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\FieldType\\Mapper\\QueryFormMapper\:\:mapFieldDefinitionForm\(\) has parameter \$fieldDefinitionForm with generic interface Symfony\\Component\\Form\\FormInterface but does not specify its types\: TData$#'
+			identifier: missingType.generics
+			count: 1
+			path: src/lib/FieldType/Mapper/QueryFormMapper.php
+
+		-
+			message: '#^Property Ibexa\\Core\\Persistence\\Legacy\\Content\\StorageFieldValue\:\:\$dataText \(string\) does not accept array\|bool\|float\|int\|string\|null\.$#'
+			identifier: assign.propertyType
+			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
+			count: 1
+			path: src/lib/QueryFieldService.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\QueryFieldService\:\:prepareQuery\(\) has parameter \$extraParameters with no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/lib/QueryFieldService.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\QueryFieldService\:\:resolveExpression\(\) has no return type specified\.$#'
+			identifier: missingType.return
+			count: 1
+			path: src/lib/QueryFieldService.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\QueryFieldService\:\:resolveExpression\(\) has parameter \$variables with no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/lib/QueryFieldService.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\QueryFieldService\:\:resolveParameters\(\) has parameter \$expressions with no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/lib/QueryFieldService.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\QueryFieldService\:\:resolveParameters\(\) has parameter \$variables with no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/lib/QueryFieldService.php
+
+		-
+			message: '#^Method Ibexa\\FieldTypeQuery\\QueryFieldService\:\:resolveParameters\(\) return type has no value type specified in iterable type array\.$#'
+			identifier: missingType.iterableValue
+			count: 1
+			path: src/lib/QueryFieldService.php

phpstan.neon

@@ -0,0 +1,14 @@
+includes:
+    - phpstan-baseline.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-symfony/extension.neon
+    - vendor/ibexa/phpstan/extension.neon
+
+parameters:
+    ignoreErrors:
+        -
+            message: "#^Cannot call method (log|debug|info|notice|warning|error|critical|alert|emergency)\\(\\) on Psr\\\\Log\\\\LoggerInterface\\|null\\.$#"
+    level: 8
+    paths:
+        - src
+    treatPhpDocTypesAsCertain: false

src/bundle/Controller/QueryFieldRestController.php

@@ -17,6 +17,7 @@
 use Ibexa\Contracts\Rest\Exceptions\NotFoundException;
 use Ibexa\Contracts\Rest\UriParser\UriParserInterface;
 use Ibexa\FieldTypeQuery\QueryFieldService;
+use function Ibexa\PolyfillPhp82\iterator_to_array;
 use Ibexa\Rest\Server\Values as RestValues;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -50,10 +51,14 @@ public function __construct(
         $this->uriParser = $uriParser;
     }
 
-    public function getResults(Request $request, $contentId, $versionNumber, $fieldDefinitionIdentifier): RestValues\ContentList
-    {
-        $offset = (int)$request->query->get('offset', 0);
-        $limit = (int)$request->query->get('limit', -1);
+    public function getResults(
+        Request $request,
+        int $contentId,
+        int $versionNumber,
+        string $fieldDefinitionIdentifier
+    ): RestValues\ContentList {
+        $offset = (int)$request->query->get('offset', '0');
+        $limit = (int)$request->query->get('limit', '-1');
 
         if ($request->query->has('location')) {
             $location = $this->loadLocationByPath($request);
@@ -89,10 +94,10 @@ function (Content $content) {
                         $this->locationService->loadLocation($content->contentInfo->mainLocationId),
                         $content,
                         $this->getContentType($content->contentInfo),
-                        $this->contentService->loadRelations($content->getVersionInfo())
+                        iterator_to_array($this->contentService->loadRelations($content->getVersionInfo()))
                     );
                 },
-                $items
+                iterator_to_array($items)
             ),
             $this->queryFieldService->countContentItems($content, $fieldDefinitionIdentifier)
         );

src/bundle/DependencyInjection/Compiler/ConfigurableFieldDefinitionMapperPass.php

@@ -18,13 +18,16 @@ class ConfigurableFieldDefinitionMapperPass implements CompilerPassInterface
 {
     public const PARAMETER = 'ibexa.graphql.schema.content.mapping.field_definition_type';
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasParameter(self::PARAMETER)) {
             return;
         }
 
         $parameter = $container->getParameter(self::PARAMETER);
+        if (!is_array($parameter)) {
+            return;
+        }
         $parameter['ezcontentquery'] = [
             'definition_type' => 'QueryFieldDefinition',
             'value_resolver' => 'resolver("QueryFieldValue", [field, content])',

src/bundle/DependencyInjection/Compiler/FieldDefinitionIdentifierViewMatcherPass.php

@@ -19,7 +19,7 @@ class FieldDefinitionIdentifierViewMatcherPass implements CompilerPassInterface
     private const LONG_IDENTIFIER = '@' . FieldDefinitionIdentifierMatcher::class;
     private const SHORT_IDENTIFIER = 'Identifier\FieldDefinition';
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $configKeys = array_filter(
             array_keys($container->getParameterBag()->all()),

src/bundle/DependencyInjection/Compiler/QueryTypesListPass.php

@@ -25,7 +25,7 @@ public function __construct()
         $this->nameConverter = new CamelCaseToSnakeCaseNameConverter();
     }
 
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->has(ArrayQueryTypeRegistry::class) || !$container->has(QueryFormMapper::class)) {
             return;
@@ -48,12 +48,8 @@ public function process(ContainerBuilder $container)
 
     /**
      * Builds a human readable name out of a query type identifier.
-     *
-     * @param $queryTypeIdentifier
-     *
-     * @return string
      */
-    private function buildQueryTypeName($queryTypeIdentifier)
+    private function buildQueryTypeName(string $queryTypeIdentifier): string
     {
         return ucfirst(
             str_replace('_', ' ', $this->nameConverter->normalize($queryTypeIdentifier))

src/bundle/DependencyInjection/IbexaFieldTypeQueryExtension.php

@@ -17,7 +17,7 @@
 
 final class IbexaFieldTypeQueryExtension extends Extension implements PrependExtensionInterface
 {
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader(
             $container,
@@ -33,7 +33,7 @@ public function load(array $configs, ContainerBuilder $container)
         $this->addContentViewConfig($container);
     }
 
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $this->prependFieldTemplateConfig($container);
         $this->prependJMSTranslationConfig($container);
@@ -47,6 +47,9 @@ public function prepend(ContainerBuilder $container)
     protected function addContentViewConfig(ContainerBuilder $container): void
     {
         $contentViewDefaults = $container->getParameter('ibexa.site_access.config.default.content_view_defaults');
+        if (!is_array($contentViewDefaults)) {
+            return;
+        }
         $contentViewDefaults['content_query_field'] = [
             'default' => [
                 'template' => '@IbexaFieldTypeQuery/content/contentquery.html.twig',

src/bundle/IbexaFieldTypeQueryBundle.php

@@ -13,7 +13,7 @@
 
 final class IbexaFieldTypeQueryBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new Compiler\QueryTypesListPass());
         $container->addCompilerPass(new Compiler\ConfigurableFieldDefinitionMapperPass());

src/contracts/QueryFieldLocationService.php

@@ -17,14 +17,14 @@ interface QueryFieldLocationService
     /**
      * Returns the query results for the given location.
      *
-     * @return iterable An iterable that yields Content items.
+     * @return iterable<\Ibexa\Contracts\Core\Repository\Values\Content\Content>
      */
     public function loadContentItemsForLocation(Location $location, string $fieldDefinitionIdentifier): iterable;
 
     /**
      * Returns a slice of the query results for the given location.
      *
-     * @return iterable An iterable that yields Content items.
+     * @return iterable<\Ibexa\Contracts\Core\Repository\Values\Content\Content>
      */
     public function loadContentItemsSliceForLocation(Location $location, string $fieldDefinitionIdentifier, int $offset, int $limit): iterable;
 

src/contracts/QueryFieldServiceInterface.php

@@ -17,9 +17,6 @@ interface QueryFieldServiceInterface
     /**
      * Executes the query without pagination and returns the content items.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $content
-     * @param string $fieldDefinitionIdentifier
-     *
      * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content[]
      *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
@@ -29,33 +26,20 @@ public function loadContentItems(Content $content, string $fieldDefinitionIdenti
     /**
      * Counts the total results of a query.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
-     * @param string $fieldDefinitionIdentifier
-     *
-     * @return int
-     *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      */
     public function countContentItems(Content $content, string $fieldDefinitionIdentifier): int;
 
     /**
      * Executes a paginated query and return the requested content items slice.
      *
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
-     * @param string $fieldDefinitionIdentifier
-     * @param int $offset
-     * @param int $limit
-     *
      * @return \Ibexa\Contracts\Core\Repository\Values\Content\Content[]
      *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      */
     public function loadContentItemsSlice(Content $content, string $fieldDefinitionIdentifier, int $offset, int $limit): iterable;
 
     /**
-     * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
-     * @param string $fieldDefinitionIdentifier
-     *
      * @return int The page size, or 0 if pagination is disabled.
      *
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException