Merge pull request #75 from samsonasik/apply-php80-syntax

Apply PHP 8.0 Syntax and constructor promotion

src/ArrayObject.php

@@ -18,7 +18,7 @@
 use function asort;
 use function class_exists;
 use function count;
-use function get_class;
+use function get_debug_type;
 use function get_object_vars;
 use function gettype;
 use function in_array;
@@ -31,7 +31,7 @@
 use function natsort;
 use function serialize;
 use function sprintf;
-use function strpos;
+use function str_starts_with;
 use function uasort;
 use function uksort;
 use function unserialize;
@@ -85,10 +85,9 @@ public function __construct($input = [], $flags = self::STD_PROP_LIST, $iterator
     /**
      * Returns whether the requested key exists
      *
-     * @param  mixed $key
      * @return bool
      */
-    public function __isset($key)
+    public function __isset(mixed $key)
     {
         if ($this->flag === self::ARRAY_AS_PROPS) {
             return $this->offsetExists($key);
@@ -104,11 +103,9 @@ public function __isset($key)
     /**
      * Sets the value at the specified key to value
      *
-     * @param  mixed $key
-     * @param  mixed $value
      * @return void
      */
-    public function __set($key, $value)
+    public function __set(mixed $key, mixed $value)
     {
         if ($this->flag === self::ARRAY_AS_PROPS) {
             $this->offsetSet($key, $value);
@@ -125,10 +122,9 @@ public function __set($key, $value)
     /**
      * Unsets the value at the specified key
      *
-     * @param  mixed $key
      * @return void
      */
-    public function __unset($key)
+    public function __unset(mixed $key)
     {
         if ($this->flag === self::ARRAY_AS_PROPS) {
             $this->offsetUnset($key);
@@ -145,10 +141,9 @@ public function __unset($key)
     /**
      * Returns the value at the specified key by reference
      *
-     * @param  mixed $key
      * @return mixed
      */
-    public function &__get($key)
+    public function &__get(mixed $key)
     {
         if ($this->flag === self::ARRAY_AS_PROPS) {
             $ret = &$this->offsetGet($key);
@@ -166,10 +161,9 @@ public function &__get($key)
     /**
      * Appends the value
      *
-     * @param  mixed $value
      * @return void
      */
-    public function append($value)
+    public function append(mixed $value)
     {
         $this->storage[] = $value;
     }
@@ -299,23 +293,21 @@ public function natsort()
     /**
      * Returns whether the requested key exists
      *
-     * @param  mixed $key
      * @return bool
      */
     #[ReturnTypeWillChange]
-    public function offsetExists($key)
+    public function offsetExists(mixed $key)
     {
         return isset($this->storage[$key]);
     }
 
     /**
      * Returns the value at the specified key
      *
-     * @param  mixed $key
      * @return mixed
      */
     #[ReturnTypeWillChange]
-    public function &offsetGet($key)
+    public function &offsetGet(mixed $key)
     {
         $ret = null;
         if (! $this->offsetExists($key)) {
@@ -329,24 +321,21 @@ public function &offsetGet($key)
     /**
      * Sets the value at the specified key to value
      *
-     * @param  mixed $key
-     * @param  mixed $value
      * @return void
      */
     #[ReturnTypeWillChange]
-    public function offsetSet($key, $value)
+    public function offsetSet(mixed $key, mixed $value)
     {
         $this->storage[$key] = $value;
     }
 
     /**
      * Unsets the value at the specified key
      *
-     * @param  mixed $key
      * @return void
      */
     #[ReturnTypeWillChange]
-    public function offsetUnset($key)
+    public function offsetUnset(mixed $key)
     {
         if ($this->offsetExists($key)) {
             unset($this->storage[$key]);
@@ -398,7 +387,7 @@ public function setIteratorClass($class)
             return;
         }
 
-        if (strpos($class, '\\') === 0) {
+        if (str_starts_with($class, '\\')) {
             $class = '\\' . $class;
             if (class_exists($class)) {
                 $this->iteratorClass = $class;
@@ -488,9 +477,7 @@ public function __unserialize($data)
                 throw new UnexpectedValueException(sprintf(
                     'Cannot deserialize %s instance: invalid iteratorClass; expected string, received %s',
                     self::class,
-                    is_object($data['iteratorClass'])
-                        ? get_class($data['iteratorClass'])
-                        : gettype($data['iteratorClass'])
+                    get_debug_type($data['iteratorClass'])
                 ));
             }
             $this->setIteratorClass($data['iteratorClass']);

src/ArraySerializableInterface.php

@@ -9,7 +9,6 @@ interface ArraySerializableInterface
     /**
      * Exchange internal values from provided array
      *
-     * @param  array $array
      * @return void
      */
     public function exchangeArray(array $array);

src/ArrayUtils.php

@@ -46,11 +46,10 @@ abstract class ArrayUtils
     /**
      * Test whether an array contains one or more string keys
      *
-     * @param  mixed $value
      * @param  bool  $allowEmpty    Should an empty array() return true
      * @return bool
      */
-    public static function hasStringKeys($value, $allowEmpty = false)
+    public static function hasStringKeys(mixed $value, $allowEmpty = false)
     {
         if (! is_array($value)) {
             return false;
@@ -66,11 +65,10 @@ public static function hasStringKeys($value, $allowEmpty = false)
     /**
      * Test whether an array contains one or more integer keys
      *
-     * @param  mixed $value
      * @param  bool  $allowEmpty    Should an empty array() return true
      * @return bool
      */
-    public static function hasIntegerKeys($value, $allowEmpty = false)
+    public static function hasIntegerKeys(mixed $value, $allowEmpty = false)
     {
         if (! is_array($value)) {
             return false;
@@ -93,11 +91,10 @@ public static function hasIntegerKeys($value, $allowEmpty = false)
      * - a float: 2.2120, -78.150999
      * - a string with float:  '4000.99999', '-10.10'
      *
-     * @param  mixed $value
      * @param  bool  $allowEmpty    Should an empty array() return true
      * @return bool
      */
-    public static function hasNumericKeys($value, $allowEmpty = false)
+    public static function hasNumericKeys(mixed $value, $allowEmpty = false)
     {
         if (! is_array($value)) {
             return false;
@@ -126,11 +123,10 @@ public static function hasNumericKeys($value, $allowEmpty = false)
      * );
      * </code>
      *
-     * @param  mixed $value
      * @param  bool  $allowEmpty    Is an empty list a valid list?
      * @return bool
      */
-    public static function isList($value, $allowEmpty = false)
+    public static function isList(mixed $value, $allowEmpty = false)
     {
         if (! is_array($value)) {
             return false;
@@ -168,11 +164,10 @@ public static function isList($value, $allowEmpty = false)
      * );
      * </code>
      *
-     * @param  mixed $value
      * @param  bool  $allowEmpty    Is an empty array() a valid hash table?
      * @return bool
      */
-    public static function isHashTable($value, $allowEmpty = false)
+    public static function isHashTable(mixed $value, $allowEmpty = false)
     {
         if (! is_array($value)) {
             return false;
@@ -193,12 +188,11 @@ public static function isHashTable($value, $allowEmpty = false)
      * non-strict check is implemented. if $strict = -1, the default in_array
      * non-strict behaviour is used.
      *
-     * @param mixed $needle
      * @param array $haystack
      * @param int|bool $strict
      * @return bool
      */
-    public static function inArray($needle, array $haystack, $strict = false)
+    public static function inArray(mixed $needle, array $haystack, $strict = false)
     {
         if (! $strict) {
             if (is_int($needle) || is_float($needle)) {
@@ -318,7 +312,6 @@ public static function merge(array $a, array $b, $preserveNumericKeys = false)
     /**
      * @deprecated Since 3.2.0; use the native array_filter methods
      *
-     * @param array $data
      * @param callable $callback
      * @param null|int $flag
      * @return array

src/ArrayUtils/MergeReplaceKey.php

@@ -6,15 +6,8 @@
 
 final class MergeReplaceKey implements MergeReplaceKeyInterface
 {
-    /** @var mixed */
-    protected $data;
-
-    /**
-     * @param mixed $data
-     */
-    public function __construct($data)
+    public function __construct(protected mixed $data)
     {
-        $this->data = $data;
     }
 
     /**

src/FastPriorityQueue.php

@@ -112,11 +112,10 @@ public function __unserialize(array $data): void
     /**
      * Insert an element in the queue with a specified priority
      *
-     * @param mixed $value
      * @param int $priority
      * @return void
      */
-    public function insert($value, $priority)
+    public function insert(mixed $value, $priority)
     {
         if (! is_int($priority)) {
             throw new Exception\InvalidArgumentException('The priority must be an integer');
@@ -155,10 +154,9 @@ public function extract()
      * the same item has been added multiple times, it will not remove other
      * instances.
      *
-     * @param  mixed $datum
      * @return bool False if the item was not found, true otherwise.
      */
-    public function remove($datum)
+    public function remove(mixed $datum)
     {
         $currentIndex    = $this->index;
         $currentSubIndex = $this->subIndex;
@@ -356,15 +354,10 @@ public function unserialize($data)
      */
     public function setExtractFlags($flag)
     {
-        switch ($flag) {
-            case self::EXTR_DATA:
-            case self::EXTR_PRIORITY:
-            case self::EXTR_BOTH:
-                $this->extractFlag = $flag;
-                break;
-            default:
-                throw new Exception\InvalidArgumentException("The extract flag specified is not valid");
-        }
+        $this->extractFlag = match ($flag) {
+            self::EXTR_DATA, self::EXTR_PRIORITY, self::EXTR_BOTH => $flag,
+            default => throw new Exception\InvalidArgumentException("The extract flag specified is not valid"),
+        };
     }
 
     /**
@@ -380,10 +373,9 @@ public function isEmpty()
     /**
      * Does the queue contain the given datum?
      *
-     * @param  mixed $datum
      * @return bool
      */
-    public function contains($datum)
+    public function contains(mixed $datum)
     {
         foreach ($this->values as $values) {
             if (in_array($datum, $values)) {

src/Guard/ArrayOrTraversableGuardTrait.php

@@ -8,10 +8,8 @@
 use Laminas\Stdlib\Exception\InvalidArgumentException;
 use Traversable;
 
-use function get_class;
-use function gettype;
+use function get_debug_type;
 use function is_array;
-use function is_object;
 use function sprintf;
 
 /**
@@ -29,15 +27,15 @@ trait ArrayOrTraversableGuardTrait
      * @throws Exception
      */
     protected function guardForArrayOrTraversable(
-        $data,
+        mixed $data,
         $dataName = 'Argument',
         $exceptionClass = InvalidArgumentException::class
     ) {
         if (! is_array($data) && ! $data instanceof Traversable) {
             $message = sprintf(
                 "%s must be an array or Traversable, [%s] given",
                 $dataName,
-                is_object($data) ? get_class($data) : gettype($data)
+                get_debug_type($data)
             );
             throw new $exceptionClass($message);
         }

src/Guard/EmptyGuardTrait.php

@@ -24,7 +24,7 @@ trait EmptyGuardTrait
      * @throws Exception
      */
     protected function guardAgainstEmpty(
-        $data,
+        mixed $data,
         $dataName = 'Argument',
         $exceptionClass = InvalidArgumentException::class
     ) {

src/Guard/NullGuardTrait.php

@@ -24,7 +24,7 @@ trait NullGuardTrait
      * @throws Exception
      */
     protected function guardAgainstNull(
-        $data,
+        mixed $data,
         $dataName = 'Argument',
         $exceptionClass = InvalidArgumentException::class
     ) {

src/Message.php

@@ -7,10 +7,8 @@
 use Traversable;
 
 use function array_key_exists;
-use function get_class;
-use function gettype;
+use function get_debug_type;
 use function is_array;
-use function is_object;
 use function is_scalar;
 use function sprintf;
 
@@ -42,7 +40,7 @@ public function setMetadata($spec, $value = null)
         if (! is_array($spec) && ! $spec instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Expected a string, array, or Traversable argument in first position; received "%s"',
-                is_object($spec) ? get_class($spec) : gettype($spec)
+                get_debug_type($spec)
             ));
         }
         foreach ($spec as $key => $value) {