Fix more errors after PHPStan update

phpstan-baseline.neon

@@ -531,12 +531,12 @@ parameters:
 			path: src/Routing/HookMenuRoutes.php
 
 		-
-			message: "#^Cannot access offset '\\#title' on mixed\\.$#"
+			message: "#^Cannot access offset '\\#id' on mixed\\.$#"
 			count: 1
 			path: src/Theme/HookPreprocess.php
 
 		-
-			message: "#^Offset '\\#id' might not exist on array\\<int\\|string, mixed\\>\\|string\\.$#"
+			message: "#^Cannot access offset '\\#title' on mixed\\.$#"
 			count: 1
 			path: src/Theme/HookPreprocess.php
 

src/Form/FormBuilder.php

@@ -12,6 +12,7 @@ class FormBuilder extends CoreFormBuilder
 {
     /**
      * @param FormStateInterface|mixed[] $form_state
+     * @param-out FormStateInterface $form_state
      * @return mixed[]
      */
     public function buildForm(mixed $form_arg, FormStateInterface|array &$form_state): array

src/Theme/HookPreprocess.php

@@ -11,7 +11,7 @@
 use Retrofit\Drupal\Entity\WrappedConfigEntity;
 
 /**
- * @phpstan-type Variables array<string, string|array<int|string, mixed>>
+ * @phpstan-type Variables array<string, mixed>
  * @phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
  */
 final class HookPreprocess

src/Theme/Registry.php

@@ -20,6 +20,7 @@ final class Registry extends CoreRegistry
 {
     /**
      * @param RegistryData $cache
+     * @param-out array $cache
      */
     protected function processExtension(array &$cache, $name, $type, $theme, $path): void
     {
@@ -72,6 +73,7 @@ protected function processExtension(array &$cache, $name, $type, $theme, $path):
 
     /**
      * @param array<string, array{'preprocess functions': callable[]}> $cache
+     * @param-out array $cache
      */
     protected function postProcessExtension(array &$cache, ActiveTheme $theme): void
     {

src/functions/common.php

@@ -9,7 +9,6 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Asset\LibraryDiscoveryInterface;
-use Drupal\Core\Database\Query\Merge;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\RevisionableInterface;
@@ -131,6 +130,7 @@ function entity_language(string $entity_type, EntityInterface $entity): ?string
 
 /**
  * @param array<string, mixed> $elements
+ * @param-out array $elements
  * @return array<string, mixed>
  */
 function element_children(array &$elements, bool $sort = false): array
@@ -147,6 +147,7 @@ function drupal_get_path(string $type, string $name): string
 
 /**
  * @param array<string, mixed> $element
+ * @param-out array $element
  * @param string[]|null $children_keys
  */
 function drupal_render_children(array &$element, array $children_keys = null): string
@@ -165,6 +166,7 @@ function drupal_render_children(array &$element, array $children_keys = null): s
 
 /**
  * @param array<string, mixed> $elements
+ * @param-out array $elements
  * @phpstan-ignore-next-line
  */
 function drupal_render(array &$elements): MarkupInterface|string
@@ -348,6 +350,7 @@ function drupal_clean_css_identifier(string $identifier, array $filter = [
 
 /**
  * @param array<int|string, mixed> $array
+ * @param-out array $array
  * @param array<int, int|string> $parents
  */
 function &drupal_array_get_nested_value(array &$array, array $parents, ?bool &$key_exists = null): mixed
@@ -357,6 +360,7 @@ function &drupal_array_get_nested_value(array &$array, array $parents, ?bool &$k
 
 /**
  * @param array<int|string, mixed> $array
+ * @param-out array $array
  * @param array<int, int|string> $parents
  */
 function drupal_array_set_nested_value(array &$array, array $parents, mixed $value, bool $force = false): void
@@ -402,6 +406,7 @@ function drupal_get_query_array(string $query): array
 function drupal_goto(string $path = '', array $options = [], int $http_response_code = 302): void
 {
     \Drupal::moduleHandler()->alter('drupal_goto', $path, $options, $http_response_code);
+    assert(is_string($path) && is_array($options) && is_int($http_response_code));
     $url = \Drupal::pathValidator()->getUrlIfValidWithoutAccessCheck($path);
     if ($url !== false) {
         $url->mergeOptions($options);
@@ -426,6 +431,7 @@ function drupal_json_encode(mixed $var): string
 
 /**
  * @param array<string, mixed>|object $record
+ * @param-out array|object $record
  * @param string[] $primary_keys
  */
 function drupal_write_record(string $table, array|object &$record, array|string $primary_keys = []): int|false

src/functions/form.php

@@ -4,16 +4,20 @@
 
 use Drupal\Core\Form\FormStateInterface;
 use Retrofit\Drupal\Form\DrupalGetForm;
+use Retrofit\Drupal\Form\FormBuilder;
 
 /**
  * @param mixed[] $form_state
+ * @param-out FormStateInterface $form_state
  * @return mixed[]
  */
 function drupal_build_form(string $form_id, array &$form_state): array
 {
     $form_object = \Drupal::classResolver(DrupalGetForm::class);
     $form_object->setFormId($form_id);
-    return \Drupal::formBuilder()->buildForm($form_object, $form_state);
+    $form_builder = \Drupal::formBuilder();
+    assert($form_builder instanceof FormBuilder);
+    return $form_builder->buildForm($form_object, $form_state);
 }
 
 function drupal_form_submit(string $form_id, FormStateInterface $form_state): void

tests/src/Integration/Database/DrupalWriteRecordTest.php

@@ -30,11 +30,13 @@ public function testWritingRecord(): void
             'timestamp' => time(),
         ];
         $result = drupal_write_record('watchdog', $record);
+        assert(is_array($record));
         self::assertEquals(1, $result);
         self::assertArrayHasKey('wid', $record);
         self::assertEquals(1, $record['wid']);
         $record['message'] = 'test2';
         $result = drupal_write_record('watchdog', $record, ['wid']);
+        assert(is_array($record));
         self::assertEquals(2, $result);
         self::assertArrayHasKey('wid', $record);
         self::assertEquals(1, $record['wid']);