Reduce PHPStan baseline: fix generic object types and invalid array keys

phpstan-baseline.php

@@ -2587,12 +2587,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/src/Event/Listener/ContentFillListener.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Call to an undefined method object\\:\\:getType\\(\\)\\.$#',
-	'identifier' => 'method.notFound',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Event/Listener/FieldDiscriminatorListener.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<T of object\\>\\|T of object, string given\\.$#',
 	'identifier' => 'argument.type',
@@ -3229,36 +3223,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/src/Repository/ContentRepository.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Call to an undefined method object\\:\\:setDefaultLocale\\(\\)\\.$#',
-	'identifier' => 'method.notFound',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Repository/FieldRepository.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Call to an undefined method object\\:\\:setDefinition\\(\\)\\.$#',
-	'identifier' => 'method.notFound',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Repository/FieldRepository.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Call to an undefined method object\\:\\:setLabel\\(\\)\\.$#',
-	'identifier' => 'method.notFound',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Repository/FieldRepository.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Call to an undefined method object\\:\\:setLocale\\(\\)\\.$#',
-	'identifier' => 'method.notFound',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Repository/FieldRepository.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Call to an undefined method object\\:\\:setName\\(\\)\\.$#',
-	'identifier' => 'method.notFound',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Repository/FieldRepository.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Cannot call method getMetadataFactory\\(\\) on Doctrine\\\\ORM\\\\EntityManagerInterface\\|null\\.$#',
 	'identifier' => 'method.nonObject',
@@ -3277,12 +3241,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/src/Repository/FieldRepository.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method Bolt\\\\Repository\\\\FieldRepository\\:\\:factory\\(\\) should return Bolt\\\\Entity\\\\Field but returns object\\.$#',
-	'identifier' => 'return.type',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Repository/FieldRepository.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method Bolt\\\\Repository\\\\FieldRepository\\:\\:findAllByParent\\(\\) return type has no value type specified in iterable type array\\.$#',
 	'identifier' => 'missingType.iterableValue',
@@ -3985,12 +3943,6 @@
 	'count' => 4,
 	'path' => __DIR__ . '/src/Storage/SelectQuery.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Possibly invalid array key type array\\|string\\.$#',
-	'identifier' => 'offsetAccess.invalidOffset',
-	'count' => 3,
-	'path' => __DIR__ . '/src/Storage/SelectQuery.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property Bolt\\\\Storage\\\\SelectQuery\\:\\:\\$coreDateFields type has no value type specified in iterable type array\\.$#',
 	'identifier' => 'missingType.iterableValue',

src/Event/Listener/FieldDiscriminatorListener.php

@@ -66,7 +66,9 @@ private function isField(string $class): bool
 
     private function extractFieldType(string $class): string
     {
-        $fieldType = (new $class())->getType();
+        /** @var FieldInterface $field */
+        $field = new $class();
+        $fieldType = $field->getType();
         if (in_array($fieldType, $this->tempMap, true) === true) {
             throw new LogicException("Found duplicate discriminator map entry '" . $fieldType . "' in " . $class);
         }

src/Repository/FieldRepository.php

@@ -96,6 +96,7 @@ public static function factory(Collection $definition, string $name = '', string
         $classname = self::getFieldClassname($type);
 
         if ($classname && class_exists($classname)) {
+            /** @var Field $field */
             $field = new $classname();
         } else {
             $field = new Field();

src/Storage/SelectQuery.php

@@ -498,8 +498,10 @@ private function getCoreFieldExpression(Filter $filter): string
 
     private function getReferenceFieldExpression(Filter $filter): string
     {
-        if ($filter->getKey() !== $this->anything) {
-            $this->referenceJoins[$filter->getKey()] = $filter;
+        /** @var string $key */
+        $key = $filter->getKey();
+        if ($key !== $this->anything) {
+            $this->referenceJoins[$key] = $filter;
 
             return $filter->getExpression();
         }
@@ -518,7 +520,9 @@ private function getReferenceFieldExpression(Filter $filter): string
 
     private function getTaxonomyFieldExpression(Filter $filter): string
     {
-        $this->taxonomyJoins[$filter->getKey()] = $filter;
+        /** @var string $key */
+        $key = $filter->getKey();
+        $this->taxonomyJoins[$key] = $filter;
 
         $originalExpression = $filter->getExpression();
         $originalLeftExpression = '/content\.([^\s])*/';
@@ -542,14 +546,16 @@ private function getCheckboxFieldExpression(Filter $filter): string
             $value = $isSqlite ? true : 'true';
         }
 
-        $filter->setParameters([key($filter->getParameters()) => $value]);
+        $filter->setParameters([(string) key($filter->getParameters()) => $value]);
 
         return $this->getRegularFieldExpression($filter);
     }
 
     private function getRegularFieldExpression(Filter $filter): string
     {
-        $this->fieldJoins[$filter->getKey()] = $filter;
+        /** @var string $key */
+        $key = $filter->getKey();
+        $this->fieldJoins[$key] = $filter;
         $expr = $this->qb->expr()->andX();
 
         // where clause for the value of the field

src/Twig/FieldExtension.php

@@ -120,7 +120,7 @@ public function getSelected(SelectField $field, $returnsingle = false, $returnar
 
         // Sort the results in the order of the $ids.
         $order = array_flip($ids);
-        $records = $records->sortBy(fn (Content $record) => $order[$record->getId()])->values()->toArray();
+        $records = $records->sortBy(fn (Content $record) => $order[(int) $record->getId()])->values()->toArray();
 
         if ($returnsingle || (! $returnarray && $definition->get('multiple') === false)) {
             return current($records);

src/Utils/TranslationsManager.php

@@ -44,7 +44,7 @@ private function getFieldChildrenTranslations(array &$translations, FieldParentI
                 $this->getFieldChildrenTranslations($translations, $child);
             }
 
-            $translations[$child->getId()] = $child->getTranslations();
+            $translations[(int) $child->getId()] = $child->getTranslations();
         }
     }
 

src/Validator/ContentValidator.php

@@ -159,6 +159,9 @@ private function relationsToMap(Collection $relations): array
         foreach ($relations as $relation) {
             $to = $relation->getToContent();
             $typeName = $to->getContentType();
+            if ($typeName === null) {
+                continue;
+            }
             if (! isset($result[$typeName])) {
                 $result[$typeName] = [];
             }