Refine types after CI v4.7.4 fixes

Author: paulbalandan

tests/data/type-inference/request-accessors.php

@@ -40,10 +40,10 @@ function test_get_server(IncomingRequest $request, string $name): void
 function test_get_json(IncomingRequest $request, bool $assoc): void
 {
     // A constant true decodes objects as associative arrays, so stdClass is dropped.
-    assertType('array|bool|float|int|null', $request->getJSON(true));
+    assertType('array<int|string, mixed>|bool|float|int|null', $request->getJSON(true));
 
     // A false, absent, or non-constant $assoc leaves the declared union.
-    assertType('array|bool|float|int|stdClass|null', $request->getJSON());
-    assertType('array|bool|float|int|stdClass|null', $request->getJSON(false));
-    assertType('array|bool|float|int|stdClass|null', $request->getJSON($assoc));
+    assertType('array<int|string, mixed>|bool|float|int|stdClass|null', $request->getJSON());
+    assertType('array<int|string, mixed>|bool|float|int|stdClass|null', $request->getJSON(false));
+    assertType('array<int|string, mixed>|bool|float|int|stdClass|null', $request->getJSON($assoc));
 }

tests/data/type-inference/request-var-accessors.php

@@ -44,13 +44,13 @@ function test_incoming_request(IncomingRequest $request, string $key, array $key
     assertType('array<mixed>|string|null', $request->getGetPost('id'));
 
     // getRawInputVar's string leaf is left as the declared union.
-    assertType('array|bool|float|int|object|string|null', $request->getRawInputVar('field'));
+    assertType('mixed', $request->getRawInputVar('field'));
 
     // A filter argument re-types the value, so the declared union is left in place.
-    assertType('array|bool|float|int|object|string|null', $request->getGet('q', FILTER_VALIDATE_INT));
+    assertType('mixed', $request->getGet('q', FILTER_VALIDATE_INT));
 
     // An ambiguous index (string or null) cannot be resolved.
-    assertType('array|bool|float|int|object|string|null', $request->getGet($maybe));
+    assertType('mixed', $request->getGet($maybe));
 }
 
 /**