Additional tests and fix for WP_REST_Request (#190)

Author: IanDelMar

functionMap.php

@@ -70,10 +70,10 @@
     'rest_ensure_response' => ['($response is WP_Error ? WP_Error : WP_REST_Response)'],
     'WP_REST_Request' => [null, '@phpstan-template' => 'T of array', '@phpstan-implements' => 'ArrayAccess<key-of<T>, value-of<T>>'],
     'WP_REST_Request::offsetExists' => [null, 'offset' => 'key-of<T>'],
-    'WP_REST_Request::offsetGet' => ['($offset is TOffset ? T[TOffset] : null)', '@phpstan-template' => 'TOffset of key-of<T>', 'offset' => 'TOffset'],
+    'WP_REST_Request::offsetGet' => ['T[TOffset]|null', '@phpstan-template' => 'TOffset of key-of<T>', 'offset' => 'TOffset'],
     'WP_REST_Request::offsetSet' => ['void', '@phpstan-template' => 'TOffset of key-of<T>', 'offset' => 'TOffset', 'value' => 'T[TOffset]'],
     'WP_REST_Request::offsetUnset' => ['void', '@phpstan-template' => 'TOffset of key-of<T>', 'offset' => 'TOffset'],
-    'WP_REST_Request::get_param' => ['($key is TOffset ? T[TOffset] : null)', '@phpstan-template' => 'TOffset of key-of<T>', 'key' => 'TOffset'],
+    'WP_REST_Request::get_param' => ['T[TOffset]|null', '@phpstan-template' => 'TOffset of key-of<T>', 'key' => 'TOffset'],
     'WP_REST_Request::get_params' => ['T'],
     'WP_REST_Request::set_param' => ['void', '@phpstan-template' => 'TOffset of key-of<T>', 'key' => 'TOffset', 'value' => 'T[TOffset]'],
     'WP_REST_Request::has_param' => [null, 'key' => 'key-of<T>'],

tests/data/wp_rest_request.php

@@ -19,6 +19,19 @@
 
 assertType('bool', $request->has_param('maybeParam'));
 
+/**
+ * @var \WP_REST_Request<array<string, string>> $request
+ */
+$request = new WP_REST_Request();
+
+assertType('string|null', $request->get_param('maybeParam'));
+
+assertType('string|null', $request['maybeParam']);
+
+assertType('array<string, string>', $request->get_params());
+
+assertType('bool', $request->has_param('maybeParam'));
+
 /**
  * @var \WP_REST_Request<array{
  *      stringParam: string,
@@ -28,15 +41,15 @@
  */
 $request = new WP_REST_Request();
 
-assertType('string', $request->get_param('stringParam'));
-assertType('int', $request->get_param('intParam'));
-assertType('bool', $request->get_param('boolParam'));
-assertType('null', $request->get_param('nonExistentParam'));
+assertType('string|null', $request->get_param('stringParam'));
+assertType('int|null', $request->get_param('intParam'));
+assertType('bool|null', $request->get_param('boolParam'));
+assertType('bool|int|string|null', $request->get_param('nonExistentParam'));
 
-assertType('string', $request['stringParam']);
-assertType('int', $request['intParam']);
-assertType('bool', $request['boolParam']);
-assertType('null', $request['nonExistentParam']);
+assertType('string|null', $request['stringParam']);
+assertType('int|null', $request['intParam']);
+assertType('bool|null', $request['boolParam']);
+assertType('bool|int|string|null', $request['nonExistentParam']);
 
 assertType('array{stringParam: string, intParam: int, boolParam: bool}', $request->get_params());
 

wordpress-stubs.php

@@ -68946,7 +68946,7 @@ protected function get_parameter_order()
          * @return mixed|null Value if set, null otherwise.
          * @phpstan-template TOffset of key-of<T>
          * @phpstan-param TOffset $key
-         * @phpstan-return ($key is TOffset ? T[TOffset] : null)
+         * @phpstan-return T[TOffset]|null
          */
         public function get_param($key)
         {
@@ -69261,7 +69261,7 @@ public function offsetExists($offset)
          * @return mixed|null Value if set, null otherwise.
          * @phpstan-template TOffset of key-of<T>
          * @phpstan-param TOffset $offset
-         * @phpstan-return ($offset is TOffset ? T[TOffset] : null)
+         * @phpstan-return T[TOffset]|null
          */
         #[\ReturnTypeWillChange]
         public function offsetGet($offset)