fix return type of WP_REST_Request::get_param

php-stubs · Jul 14, 2024 · d707624 · d707624
1 parent 0e17158
commit d707624
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/functionMap.php b/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' => ['T[TOffset]', '@phpstan-template' => 'TOffset of key-of<T>', 'offset' => 'TOffset'],
+    'WP_REST_Request::offsetGet' => ['($offset is TOffset ? 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' => ['T[TOffset]', '@phpstan-template' => 'TOffset of key-of<T>', 'key' => '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_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>'],

diff --git a/wordpress-stubs.php b/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 T[TOffset]
+         * @phpstan-return ($key is TOffset ? 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 T[TOffset]
+         * @phpstan-return ($offset is TOffset ? T[TOffset] : null)
          */
         #[\ReturnTypeWillChange]
         public function offsetGet($offset)