IBX-9727: Added missing type hints

composer.json

@@ -47,10 +47,10 @@
         "ibexa/search": "~5.0.x-dev",
         "ibexa/test-core": "~5.0.x-dev",
         "ibexa/user": "~5.0.x-dev",
-        "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "^1.12",
-        "phpstan/phpstan-phpunit": "^1.4",
-        "phpstan/phpstan-symfony": "^1.4"
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-symfony": "^2.0",
+        "phpunit/phpunit": "^9.5"
     },
     "scripts": {
         "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",

src/bundle/Command/MigrateLegacyMatrixCommand.php

@@ -16,22 +16,22 @@
 use Ibexa\Core\Persistence\Legacy\Content\StorageFieldValue;
 use Ibexa\FieldTypeMatrix\FieldType\Converter\MatrixConverter;
 use SimpleXMLElement;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-#[\Symfony\Component\Console\Attribute\AsCommand(name: 'ibexa:migrate:legacy_matrix')]
+#[AsCommand(name: 'ibexa:migrate:legacy_matrix')]
 class MigrateLegacyMatrixCommand extends Command
 {
     private const DEFAULT_ITERATION_COUNT = 1000;
     private const EZMATRIX_IDENTIFIER = 'ezmatrix';
     private const CONFIRMATION_ANSWER = 'yes';
 
-    /** @var \Doctrine\DBAL\Connection */
-    private $connection;
+    private Connection $connection;
 
     /**
      * @param \Doctrine\DBAL\Connection $connection

src/lib/FieldType/Converter/MatrixConverter.php

@@ -59,7 +59,7 @@ public function toStorageFieldDefinition(FieldDefinition $fieldDef, StorageField
         $columns = array_values($fieldSettings['columns']);
         $minimumRows = (int)$fieldSettings['minimum_rows'];
 
-        array_walk($columns, static function ($column) {
+        array_walk($columns, static function ($column): array {
             return [
                 'identifier' => trim($column['identifier'] ?? ''),
                 'name' => trim($column['name'] ?? ''),

src/lib/FieldType/Type.php

@@ -31,8 +31,7 @@ class Type extends FieldType
         ],
     ];
 
-    /** @var string */
-    private $fieldTypeIdentifier;
+    private string $fieldTypeIdentifier;
 
     /**
      * @param string $fieldTypeIdentifier

src/lib/Form/Type/ColumnType.php

@@ -13,6 +13,9 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @phpstan-extends \Symfony\Component\Form\AbstractType<array{name: string, identifier: string}>
+ */
 class ColumnType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void

src/lib/Form/Type/FieldType/MatrixCollectionType.php

@@ -14,6 +14,9 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @phpstan-extends \Symfony\Component\Form\AbstractType<array<int, array<string, mixed>>>
+ */
 class MatrixCollectionType extends AbstractType
 {
     public function getName(): string

src/lib/Form/Type/FieldType/MatrixEntryType.php

@@ -15,6 +15,9 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @phpstan-extends \Symfony\Component\Form\AbstractType<array<string, mixed>>
+ */
 class MatrixEntryType extends AbstractType
 {
     public function getName(): string

src/lib/Form/Type/FieldType/MatrixFieldType.php

@@ -19,27 +19,21 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @phpstan-extends \Symfony\Component\Form\AbstractType<array{entries: array<int, array<string, mixed>>}>
+ */
 class MatrixFieldType extends AbstractType
 {
-    /**
-     * @return string
-     */
     public function getName(): string
     {
         return $this->getBlockPrefix();
     }
 
-    /**
-     * @return string
-     */
     public function getBlockPrefix(): string
     {
         return 'ezplatform_fieldtype_ezmatrix';
     }
 
-    /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolver $resolver
-     */
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefined(['columns', 'minimum_rows']);
@@ -68,7 +62,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
         $columnsByIdentifier = array_flip(array_column($options['columns'], 'identifier'));
 
         // Filter out unnecessary/obsolete columns data
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $event) use ($columnsByIdentifier) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $event) use ($columnsByIdentifier): void {
             $value = $event->getData();
 
             /** @var \Ibexa\FieldTypeMatrix\FieldType\Value\Row $originalRow */

src/lib/GraphQL/InputHandler.php

@@ -11,15 +11,16 @@
 use Ibexa\Contracts\Core\FieldType\Value;
 use Ibexa\Contracts\GraphQL\Mutation\InputHandler\FieldTypeInputHandler;
 use Ibexa\FieldTypeMatrix\FieldType\Value as MatrixValue;
+use Ibexa\FieldTypeMatrix\FieldType\Value\Row;
 
 class InputHandler implements FieldTypeInputHandler
 {
     public function toFieldValue($input, $inputFormat = null): Value
     {
         return new MatrixValue(
             array_map(
-                static function (array $row) {
-                    return new MatrixValue\Row($row);
+                static function (array $row): Row {
+                    return new Row($row);
                 },
                 $input
             )

src/lib/GraphQL/Schema/MatrixFieldDefinitionInputSchemaWorker.php

@@ -15,8 +15,7 @@
 
 class MatrixFieldDefinitionInputSchemaWorker implements Worker
 {
-    /** @var \Ibexa\FieldTypeMatrix\GraphQL\Schema\NameHelper */
-    private $nameHelper;
+    private NameHelper $nameHelper;
 
     public function __construct(NameHelper $nameHelper)
     {

src/lib/GraphQL/Schema/MatrixFieldDefinitionMapper.php

@@ -16,8 +16,7 @@
 
 class MatrixFieldDefinitionMapper extends DecoratingFieldDefinitionMapper implements FieldDefinitionMapper
 {
-    /** @var \Ibexa\FieldTypeMatrix\GraphQL\Schema\NameHelper */
-    private $nameHelper;
+    private NameHelper $nameHelper;
 
     /** @var iterable<\Ibexa\FieldTypeMatrix\FieldType\Mapper\FieldTypeToContentTypeStrategyInterface> */
     private iterable $strategies;

src/lib/GraphQL/Schema/MatrixFieldDefinitionSchemaWorker.php

@@ -15,8 +15,7 @@
 
 class MatrixFieldDefinitionSchemaWorker implements Worker
 {
-    /** @var \Ibexa\FieldTypeMatrix\GraphQL\Schema\NameHelper */
-    private $nameHelper;
+    private NameHelper $nameHelper;
 
     public function __construct(NameHelper $nameHelper)
     {