breaking: migrate to php 80, for the src/Obj

Author: inhere

src/Obj/AbstractMap.php

@@ -55,7 +55,7 @@ public function load(array $data): void
      * @param string $key
      * @param mixed  $value
      */
-    public function setValue(string $key, $value): void
+    public function setValue(string $key, mixed $value): void
     {
         ObjectHelper::init($this, [$key => $value]);
     }

src/Obj/ObjectHelper.php

@@ -283,7 +283,7 @@ public static function buildReflectCallArgs(ReflectionFunctionAbstract $rftFunc,
      * @return mixed
      * @throws ReflectionException
      */
-    public static function create(string $class)
+    public static function create(string $class): mixed
     {
         try {
             $reflection = new ReflectionClass($class);

src/Obj/Traits/ArrayAccessByGetterSetterTrait.php

@@ -47,7 +47,7 @@ public function offsetExists($offset): bool
      *
      * @return  mixed  The array value if it exists, null otherwise.
      */
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         $getter = 'get' . ucfirst($offset);
 

src/Obj/Traits/ArrayAccessByPropertyTrait.php

@@ -31,7 +31,7 @@ trait ArrayAccessByPropertyTrait
      *
      * @return  boolean  True if the offset exists, false otherwise.
      */
-    public function offsetExists($offset): bool
+    public function offsetExists(mixed $offset): bool
     {
         return property_exists($this, $offset);
     }
@@ -43,7 +43,7 @@ public function offsetExists($offset): bool
      *
      * @return  mixed  The array value if it exists, null otherwise.
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return $this->$offset;
     }
@@ -56,7 +56,7 @@ public function offsetGet($offset)
      *
      * @return  void
      */
-    public function offsetSet($offset, $value): void
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         $this->$offset = $value;
     }
@@ -68,7 +68,7 @@ public function offsetSet($offset, $value): void
      *
      * @return  void
      */
-    public function offsetUnset($offset): void
+    public function offsetUnset(mixed $offset): void
     {
         // unset($this->$offset);
     }

src/Obj/Traits/NameAliasTrait.php

@@ -13,16 +13,16 @@ trait NameAliasTrait
     /**
      * @var array
      */
-    private $aliases = [];
+    private array $aliases = [];
 
     /**
      * set name alias(es)
      *
      * @param string       $name
-     * @param string|array $alias
+     * @param array|string $alias
      * @param bool         $validate
      */
-    public function setAlias(string $name, $alias, bool $validate = false): void
+    public function setAlias(string $name, array|string $alias, bool $validate = false): void
     {
         foreach ((array)$alias as $aliasName) {
             if (!isset($this->aliases[$aliasName])) {

src/Obj/Traits/ObjectPoolTrait.php

@@ -27,14 +27,14 @@ trait ObjectPoolTrait
     /**
      * @var SplStack[] [class => \SplStack]
      */
-    private static $pool = [];
+    private static array $pool = [];
 
     /**
      * @param string $class
      *
      * @return mixed
      */
-    public static function get(string $class)
+    public static function get(string $class): mixed
     {
         $stack = self::getStack($class);
 
@@ -46,9 +46,9 @@ public static function get(string $class)
     }
 
     /**
-     * @param stdClass|string $object
+     * @param string|stdClass $object
      */
-    public static function put($object): void
+    public static function put(string|stdClass $object): void
     {
         if (is_string($object)) {
             $object = new $object;
@@ -63,7 +63,7 @@ public static function put($object): void
      *
      * @return mixed
      */
-    public static function use(string $class, Closure $handler)
+    public static function use(string $class, Closure $handler): mixed
     {
         $obj = self::get($class);
         $ret = $handler($obj);
@@ -77,7 +77,7 @@ public static function use(string $class, Closure $handler)
      *
      * @return SplStack
      */
-    public static function getStack($class): SplStack
+    public static function getStack(string|stdClass $class): SplStack
     {
         $class = is_string($class) ? $class : get_class($class);
 

src/Obj/Traits/PropertyAccessByGetterSetterTrait.php

@@ -44,9 +44,9 @@ public function __set($name, $value): void
         if (method_exists($this, $setter)) {
             $this->$setter($value);
         } elseif (method_exists($this, 'get' . ucfirst($name))) {
-            throw new SetPropertyException('Setting a Read-only property! ' . get_class($this) . "::{$name}");
+            throw new SetPropertyException('Setting a Read-only property! ' . get_class($this) . "::$name");
         } else {
-            throw new SetPropertyException('Setting a Unknown property! ' . get_class($this) . "::{$name}");
+            throw new SetPropertyException('Setting a Unknown property! ' . get_class($this) . "::$name");
         }
     }
 
@@ -67,10 +67,10 @@ public function __get($name)
         }
 
         if (method_exists($this, 'set' . ucfirst($name))) {
-            throw new GetPropertyException('Getting a Write-only property! ' . get_class($this) . "::{$name}");
+            throw new GetPropertyException('Getting a Write-only property! ' . get_class($this) . "::$name");
         }
 
-        throw new GetPropertyException('Getting a Unknown property! ' . get_class($this) . "::{$name}");
+        throw new GetPropertyException('Getting a Unknown property! ' . get_class($this) . "::$name");
     }
 
     /**

src/Obj/Traits/SingletonPoolTrait.php

@@ -19,14 +19,14 @@ trait SingletonPoolTrait
     /**
      * @var array
      */
-    private static $singletons = [];
+    private static array $singletons = [];
 
     /**
      * @param string $class
      *
      * @return mixed
      */
-    public static function singleton(string $class)
+    public static function singleton(string $class): mixed
     {
         if (!isset(self::$singletons[$class])) {
             self::$singletons[$class] = new $class;
@@ -40,7 +40,7 @@ public static function singleton(string $class)
      *
      * @return mixed
      */
-    public static function factory(string $class)
+    public static function factory(string $class): mixed
     {
         if (!isset(self::$singletons[$class])) {
             self::$singletons[$class] = new $class;

src/Obj/Traits/SingletonTrait.php

@@ -21,7 +21,7 @@ trait SingletonTrait
     /**
      * @return mixed
      */
-    public static function new()
+    public static function new(): mixed
     {
         return Obj::singleton(static::class);
     }

src/Obj/Traits/StdObjectTrait.php

@@ -97,21 +97,21 @@ public function __call(string $method, array $args)
         //     return call_user_func_array( array($this, $method), (array) $args);
         // }
 
-        throw new InvalidArgumentException('Called a Unknown method! ' . get_class($this) . "->{$method}()");
+        throw new InvalidArgumentException('Called a Unknown method: ' . get_class($this) . "->$method()");
     }
 
     /**
      * @param string $method
-     * @param array  $args
+     * @param array $args
      *
      * @return mixed
      */
-    public static function __callStatic(string $method, $args)
+    public static function __callStatic(string $method, array $args)
     {
         if (method_exists(self::class, $method)) {
-            return call_user_func_array([self::class, $method], (array)$args);
+            return call_user_func_array([self::class, $method], $args);
         }
 
-        throw new InvalidArgumentException('Called a Unknown static method! [ ' . self::class . "::{$method}()]");
+        throw new InvalidArgumentException('Called a Unknown static method:  ' . self::class . "::$method()");
     }
 }