fix

Author: fureev

src/Global/base.php

@@ -5,18 +5,10 @@
 use Php\Support\Structures\Collections\ReadableCollection;
 
 if (!function_exists('value')) {
-    /**
-     * Return the default value of the given value.
-     *
-     * @param mixed $value
-     * @param mixed ...$args
-     *
-     * @return mixed
-     */
-    function value(mixed $value, mixed ...$args): mixed
+    function value(mixed $value, mixed ...$params): mixed
     {
         return $value instanceof Closure || (is_object($value) && is_callable($value))
-            ? $value(...$args)
+            ? $value(...$params)
             : $value;
     }
 }
@@ -76,6 +68,14 @@ function dataGet(mixed $target, string|array|int|null $key, mixed $default = nul
 
 
 if (!function_exists('mapValue')) {
+    /**
+     * @template TKey of array-key
+     * @template TValue
+     * @param callable $fn
+     * @param iterable<TKey, TValue> $collection
+     * @param mixed ...$args
+     * @return array<TKey, TValue>
+     */
     function mapValue(callable $fn, iterable $collection, mixed ...$args): array
     {
         $result = [];
@@ -89,6 +89,14 @@ function mapValue(callable $fn, iterable $collection, mixed ...$args): array
 }
 
 if (!function_exists('eachValue')) {
+    /**
+     * @template TKey of array-key
+     * @template TValue
+     * @param callable $fn
+     * @param iterable<TKey, TValue> $collection
+     * @param mixed ...$args
+     * @return void
+     */
     function eachValue(callable $fn, iterable $collection, mixed ...$args): void
     {
         foreach ($collection as $key => $value) {
@@ -100,14 +108,8 @@ function eachValue(callable $fn, iterable $collection, mixed ...$args): void
 if (!function_exists('when')) {
     /**
      * Returns a value when a condition is truthy.
-     *
-     * @param mixed|bool|\Closure $condition
-     * @param mixed|\Closure $value
-     * @param mixed|\Closure|null $default
-     *
-     * @return mixed
      */
-    function when($condition, $value, $default = null)
+    function when(mixed $condition, mixed $value, mixed $default = null): mixed
     {
         if ($result = value($condition)) {
             return $value instanceof Closure ? $value($result) : $value;
@@ -118,12 +120,7 @@ function when($condition, $value, $default = null)
 }
 
 if (!function_exists('classNamespace')) {
-    /**
-     * @param object|string $class
-     *
-     * @return string
-     */
-    function classNamespace($class): string
+    function classNamespace(object|string $class): string
     {
         if (is_object($class)) {
             $class = get_class($class);
@@ -136,13 +133,8 @@ function classNamespace($class): string
 if (!function_exists('isTrue')) {
     /**
      * Returns bool value of a value
-     *
-     * @param mixed $val
-     * @param bool $return_null
-     *
-     * @return bool|null
      */
-    function isTrue($val, bool $return_null = false): ?bool
+    function isTrue(mixed $val, bool $return_null = false): ?bool
     {
         if ($val === null && $return_null) {
             return null;
@@ -157,12 +149,13 @@ function isTrue($val, bool $return_null = false): ?bool
 
 if (!function_exists('instance')) {
     /**
-     * @param string|object $instance
+     * @phpstan-param T|class-string<T>|null $instance
      * @param mixed ...$params
+     * @phpstan-return T|null
      *
-     * @return mixed
+     * @template T as object
      */
-    function instance($instance, ...$params): mixed
+    function instance(string|object|null $instance, mixed ...$params): ?object
     {
         if (is_object($instance)) {
             return $instance;
@@ -179,12 +172,8 @@ function instance($instance, ...$params): mixed
 if (!function_exists('class_basename')) {
     /**
      * Get the class "basename" of the given object / class.
-     *
-     * @param string|object $class
-     *
-     * @return string
      */
-    function class_basename($class)
+    function class_basename(string|object $class): string
     {
         $class = is_object($class) ? get_class($class) : $class;
 
@@ -196,17 +185,15 @@ function class_basename($class)
     /**
      * Returns all traits used by a trait and its traits.
      *
-     * @param string $trait
-     *
-     * @return array
+     * @return string[]
      */
     function trait_uses_recursive(string $trait): array
     {
         if (!$traits = class_uses($trait)) {
             return [];
         }
 
-        foreach ((array)$traits as $trt) {
+        foreach ($traits as $trt) {
             $traits += trait_uses_recursive($trt);
         }
 
@@ -215,12 +202,6 @@ function trait_uses_recursive(string $trait): array
 }
 
 if (!function_exists('does_trait_use')) {
-    /**
-     * @param string $class
-     * @param string $trait
-     *
-     * @return bool
-     */
     function does_trait_use(string $class, string $trait): bool
     {
         return isset(trait_uses_recursive($class)[$trait]);
@@ -231,14 +212,12 @@ function does_trait_use(string $class, string $trait): bool
     /**
      * Returns all traits used by a class, its parent classes and trait of their traits.
      *
-     * @param object|string $class
-     *
-     * @return array
+     * @return string[]
      */
-    function class_uses_recursive($class): array
+    function class_uses_recursive(object|string $class): array
     {
         if (is_object($class)) {
-            $class = get_class($class);
+            $class = $class::class;
         }
 
         $results = [];
@@ -262,10 +241,7 @@ function remoteStaticCall(object|string|null $class, string $method, mixed ...$p
             return null;
         }
 
-        if (
-            (is_object($class) || (is_string($class) && class_exists($class))) &&
-            method_exists($class, $method)
-        ) {
+        if ((is_object($class) || class_exists($class)) && method_exists($class, $method)) {
             return $class::$method(...$params);
         }
 
@@ -283,10 +259,7 @@ function remoteStaticCallOrTrow(object|string|null $class, string $method, mixed
             throw new RuntimeException('Target Class is absent');
         }
 
-        if (
-            (is_object($class) || (is_string($class) && class_exists($class))) &&
-            method_exists($class, $method)
-        ) {
+        if ((is_object($class) || class_exists($class)) && method_exists($class, $method)) {
             return $class::$method(...$params);
         }
 
@@ -346,6 +319,19 @@ function findGetterMethod(object $instance, string $attribute): ?string
     }
 }
 
+if (!function_exists('findSetterMethodByProp')) {
+    /**
+     * Returns getter-method's name or null by an attribute
+     */
+    function findSetterMethodByProp(object $instance, string $attribute): ?string
+    {
+        if (method_exists($instance, $method = attributeToSetterMethod($attribute))) {
+            return $method;
+        }
+
+        return null;
+    }
+}
 
 if (!function_exists('public_property_exists')) {
     /**