voku / Arrayy

src/StaticArrayy.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         }
 
         if (!isset(static::$methodArgs[$name])) {
-            throw new \BadMethodCallException($name . ' is not a valid method');
+            throw new \BadMethodCallException($name.' is not a valid method');
         }
 
         $numArgs = \count($arguments);

src/TypeCheck/TypeCheckPhpDoc.php

Spacing +4 added lines, -4 removed lines

@@ -90,9 +90,9 @@ 
         }
 
         if ($type instanceof \phpDocumentor\Reflection\Types\Array_) {
-            $valueTypeTmp = $type->getValueType() . '';
+            $valueTypeTmp = $type->getValueType().'';
             if ($valueTypeTmp !== 'mixed') {
-                return $valueTypeTmp . '[]';
+                return $valueTypeTmp.'[]';
             }
 
             return 'array';
@@ -138,7 +138,7 @@ 
             return 'resource';
         }
 
-        return $type . '';
+        return $type.'';
     }
 
     /**
@@ -150,6 +150,6 @@ 
      */
     public function throwException($expectedTypes, $value, $type): \Throwable
     {
-        throw new \TypeError("Invalid type: expected \"{$this->property_name}\" to be of type {{$expectedTypes}}, instead got value \"" . $this->valueToString($value) . '" (' . \print_r($value, true) . ") with type {{$type}}.");
+        throw new \TypeError("Invalid type: expected \"{$this->property_name}\" to be of type {{$expectedTypes}}, instead got value \"".$this->valueToString($value).'" ('.\print_r($value, true).") with type {{$type}}.");
     }
 }

src/TypeCheck/AbstractTypeCheck.php

Spacing +2 added lines, -2 removed lines

@@ -111,11 +111,11 @@
 
         // resource
         if (\is_resource($value)) {
-            return \get_resource_type($value) . ' resource #' . (int) $value;
+            return \get_resource_type($value).' resource #'.(int) $value;
         }
 
         if (\is_object($value)) {
-            return \get_class($value) . ' Object';
+            return \get_class($value).' Object';
         }
 
         return '';

Indentation +10 added lines, -10 removed lines

@@ -82,32 +82,32 @@
                \gettype($value) === (self::$typeMapping[$type] ?? $type)
                ||
                (
-                   $type === 'scalar'
+                    $type === 'scalar'
                     &&
                     \is_scalar($value)
-               )
+                )
                ||
                (
-                   $type === 'callable'
+                    $type === 'callable'
                    &&
                    \is_callable($value)
-               )
+                )
                ||
                (
-                   $type === 'numeric'
+                    $type === 'numeric'
                    &&
                    (
-                       \is_float($value)
+                        \is_float($value)
                        ||
                        \is_int($value)
-                   )
-               )
+                    )
+                )
                ||
                (
-                   $type === 'resource'
+                    $type === 'resource'
                    &&
                    \is_resource($value)
-               );
+                );
     }
 
     /**

src/TypeCheck/TypeCheckSimple.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      */
     public function throwException($expectedTypes, $value, $type): \Throwable
     {
-        throw new \TypeError("Invalid type: expected to be of type {{$expectedTypes}}, instead got value `" . \print_r($value, true) . "` with type {{$type}}.");
+        throw new \TypeError("Invalid type: expected to be of type {{$expectedTypes}}, instead got value `".\print_r($value, true)."` with type {{$type}}.");
     }
 
     /**

src/Collection/CollectionInterface.php

Doc Comments +1 added lines

@@ -50,6 +50,7 @@
      * Merge current items and items of given collections into a new one.
      *
      * @param CollectionInterface ...$collections The collections to merge.
+     * @param CollectionInterface[] $collections
      *
      * @throws \InvalidArgumentException if any of the given collections are not of the same type
      *

src/Create.php

Doc Comments +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
             /**
              * @param array<mixed> $array
              *
-             * @return int|string|null
+             * @return integer|null
              */
             function array_key_first(array $array)
             {
@@ -45,7 +45,7 @@ 
             /**
              * @param array<mixed> $array
              *
-             * @return int|string|null
+             * @return null|integer
              */
             function array_key_last(array $array)
             {

src/Arrayy.php

Doc Comments +6 added lines, -6 removed lines

@@ -1565,7 +1565,7 @@ 
      *
      * @param float|int|string $low  <p>First value of the sequence.</p>
      * @param float|int|string $high <p>The sequence is ended upon reaching the end value.</p>
-     * @param float|int        $step <p>Used as the increment between elements in the sequence.</p>
+     * @param integer        $step <p>Used as the increment between elements in the sequence.</p>
      *
      * @return static
      *                <p>(Immutable) Returns an new instance of the Arrayy object.</p>
@@ -2162,7 +2162,7 @@ 
     /**
      * Get the first key from the current array.
      *
-     * @return mixed
+     * @return integer|null
      *               <p>Return null if there wasn't a element.</p>
      * @psalm-mutation-free
      */
@@ -3230,7 +3230,7 @@ 
     /**
      * Get the last key from the current array.
      *
-     * @return mixed|null
+     * @return null|integer
      *                    <p>Return null if there wasn't a element.</p>
      * @psalm-mutation-free
      */
@@ -3622,7 +3622,7 @@ 
     /**
      * Get the most used value from the array.
      *
-     * @return mixed|null
+     * @return integer|null
      *                    <p>(Immutable) Return null if there wasn't a element.</p>
      * @psalm-mutation-free
      */
@@ -5874,7 +5874,7 @@ 
     }
 
     /**
-     * @param mixed      $path
+     * @param string      $path
      * @param callable   $callable
      * @param array|null $currentOffset
      *
@@ -6065,7 +6065,7 @@ 
     }
 
     /**
-     * @param mixed $glue
+     * @param string $glue
      * @param mixed $pieces
      * @param bool  $useKeys
      *

Indentation +9 added lines, -9 removed lines

@@ -1525,11 +1525,11 @@ 
             ),
             \COUNT_NORMAL
         )
-               ===
-               \count(
-                   $needles,
-                   \COUNT_NORMAL
-               );
+                ===
+                \count(
+                    $needles,
+                    \COUNT_NORMAL
+                );
     }
 
     /**
@@ -3459,15 +3459,15 @@ 
 
         if ($recursive === true) {
             return $this->array_keys_recursive($this->toArray())
-                   ===
-                   \range(0, \count($this->toArray(), \COUNT_RECURSIVE) - 1);
+                    ===
+                    \range(0, \count($this->toArray(), \COUNT_RECURSIVE) - 1);
         }
 
         // non recursive
 
         return \array_keys($this->toArray())
-               ===
-               \range(0, \count($this->toArray(), \COUNT_NORMAL) - 1);
+                ===
+                \range(0, \count($this->toArray(), \COUNT_NORMAL) - 1);
     }
 
     /**

Spacing +51 added lines, -51 removed lines

@@ -307,7 +307,7 @@ 
      */
     public function appendImmutable($value, $key = null): self
     {
-        $generator = function () use ($key, $value): \Generator {
+        $generator = function() use ($key, $value): \Generator {
             if ($this->properties !== []) {
                 $this->checkType($key, $value);
             }
@@ -688,7 +688,7 @@ 
                  */
                 $this->callAtPath(
                     $containerPath,
-                    static function ($container) use ($lastOffset, &$offsetExists) {
+                    static function($container) use ($lastOffset, &$offsetExists) {
                         $offsetExists = \array_key_exists($lastOffset, $container);
                     }
                 );
@@ -791,7 +791,7 @@ 
                  */
                 $this->callAtPath(
                     \implode($this->pathSeparator, $path),
-                    static function (&$offset) use ($pathToUnset) {
+                    static function(&$offset) use ($pathToUnset) {
                         if (\is_array($offset)) {
                             unset($offset[$pathToUnset]);
                         } else {
@@ -841,7 +841,7 @@ 
         }
 
         if (\strpos($iteratorClass, '\\') === 0) {
-            $iteratorClass = '\\' . $iteratorClass;
+            $iteratorClass = '\\'.$iteratorClass;
             if (\class_exists($iteratorClass)) {
                 /**
                  * @psalm-suppress PropertyTypeCoercion
@@ -852,7 +852,7 @@ 
             }
         }
 
-        throw new \InvalidArgumentException('The iterator class does not exist: ' . $iteratorClass);
+        throw new \InvalidArgumentException('The iterator class does not exist: '.$iteratorClass);
     }
 
     /**
@@ -1022,13 +1022,13 @@ 
 
         foreach ($this->getGenerator() as $key => $item) {
             if ($item instanceof self) {
-                $result[$prefix . $key] = $item->appendToEachKey($prefix);
+                $result[$prefix.$key] = $item->appendToEachKey($prefix);
             } elseif (\is_array($item) === true) {
-                $result[$prefix . $key] = self::create($item, $this->iteratorClass, false)
+                $result[$prefix.$key] = self::create($item, $this->iteratorClass, false)
                     ->appendToEachKey($prefix)
                     ->toArray();
             } else {
-                $result[$prefix . $key] = $item;
+                $result[$prefix.$key] = $item;
             }
         }
 
@@ -1059,7 +1059,7 @@ 
             } elseif (\is_object($item) === true) {
                 $result[$key] = $item;
             } else {
-                $result[$key] = $prefix . $item;
+                $result[$key] = $prefix.$item;
             }
         }
 
@@ -1267,7 +1267,7 @@ 
     public function clean(): self
     {
         return $this->filter(
-            static function ($value) {
+            static function($value) {
                 return (bool) $value;
             }
         );
@@ -1598,9 +1598,9 @@ 
 
         foreach ($items as $key => $value) {
             if (\is_array($value) && !empty($value)) {
-                $flatten[] = $this->flatten($delimiter, $prepend . $key . $delimiter, $value);
+                $flatten[] = $this->flatten($delimiter, $prepend.$key.$delimiter, $value);
             } else {
-                $flatten[] = [$prepend . $key => $value];
+                $flatten[] = [$prepend.$key => $value];
             }
         }
 
@@ -1778,7 +1778,7 @@ 
          */
         \array_walk(
             $array,
-            static function (&$val) {
+            static function(&$val) {
                 if ((string) $val === $val) {
                     $val = \trim($val);
                 }
@@ -2316,40 +2316,40 @@ 
         }
 
         $ops = [
-            'eq' => static function ($item, $prop, $value): bool {
+            'eq' => static function($item, $prop, $value): bool {
                 return $item[$prop] === $value;
             },
-            'gt' => static function ($item, $prop, $value): bool {
+            'gt' => static function($item, $prop, $value): bool {
                 return $item[$prop] > $value;
             },
-            'ge' => static function ($item, $prop, $value): bool {
+            'ge' => static function($item, $prop, $value): bool {
                 return $item[$prop] >= $value;
             },
-            'gte' => static function ($item, $prop, $value): bool {
+            'gte' => static function($item, $prop, $value): bool {
                 return $item[$prop] >= $value;
             },
-            'lt' => static function ($item, $prop, $value): bool {
+            'lt' => static function($item, $prop, $value): bool {
                 return $item[$prop] < $value;
             },
-            'le' => static function ($item, $prop, $value): bool {
+            'le' => static function($item, $prop, $value): bool {
                 return $item[$prop] <= $value;
             },
-            'lte' => static function ($item, $prop, $value): bool {
+            'lte' => static function($item, $prop, $value): bool {
                 return $item[$prop] <= $value;
             },
-            'ne' => static function ($item, $prop, $value): bool {
+            'ne' => static function($item, $prop, $value): bool {
                 return $item[$prop] !== $value;
             },
-            'contains' => static function ($item, $prop, $value): bool {
+            'contains' => static function($item, $prop, $value): bool {
                 return \in_array($item[$prop], (array) $value, true);
             },
-            'notContains' => static function ($item, $prop, $value): bool {
+            'notContains' => static function($item, $prop, $value): bool {
                 return !\in_array($item[$prop], (array) $value, true);
             },
-            'newer' => static function ($item, $prop, $value): bool {
+            'newer' => static function($item, $prop, $value): bool {
                 return \strtotime($item[$prop]) > \strtotime($value);
             },
-            'older' => static function ($item, $prop, $value): bool {
+            'older' => static function($item, $prop, $value): bool {
                 return \strtotime($item[$prop]) < \strtotime($value);
             },
         ];
@@ -2357,7 +2357,7 @@ 
         $result = \array_values(
             \array_filter(
                 $this->toArray(false, true),
-                static function ($item) use (
+                static function($item) use (
                     $property,
                     $value,
                     $ops,
@@ -2540,7 +2540,7 @@ 
      */
     public function flip(): self
     {
-        $generator = function (): \Generator {
+        $generator = function(): \Generator {
             foreach ($this->getGenerator() as $key => $value) {
                 yield (string) $value => $key;
             }
@@ -2789,9 +2789,9 @@ 
         $jsonObject = \json_decode($json, false);
 
         $mapper = new \Arrayy\Mapper\Json();
-        $mapper->undefinedPropertyHandler = static function ($object, $key, $jsonValue) use ($class) {
+        $mapper->undefinedPropertyHandler = static function($object, $key, $jsonValue) use ($class) {
             if ($class->checkPropertiesMismatchInConstructor) {
-                throw new \TypeError('Property mismatch - input: ' . \print_r(['key' => $key, 'jsonValue' => $jsonValue], true) . ' for object: ' . \get_class($object));
+                throw new \TypeError('Property mismatch - input: '.\print_r(['key' => $key, 'jsonValue' => $jsonValue], true).' for object: '.\get_class($object));
             }
         };
 
@@ -3152,7 +3152,7 @@ 
      */
     public function implode(string $glue = '', string $prefix = ''): string
     {
-        return $prefix . $this->implode_recursive($glue, $this->toArray(), false);
+        return $prefix.$this->implode_recursive($glue, $this->toArray(), false);
     }
 
     /**
@@ -3253,7 +3253,7 @@ 
                 \array_uintersect(
                     $this->toArray(),
                     $search,
-                    static function ($a, $b) {
+                    static function($a, $b) {
                         return $a === $b ? 0 : -1;
                     }
                 ),
@@ -3550,13 +3550,13 @@ 
         // non recursive
 
         if ($search_values === null) {
-            $arrayFunction = function (): \Generator {
+            $arrayFunction = function(): \Generator {
                 foreach ($this->getGenerator() as $key => $value) {
                     yield $key;
                 }
             };
         } else {
-            $arrayFunction = function () use ($search_values, $strict): \Generator {
+            $arrayFunction = function() use ($search_values, $strict): \Generator {
                 $is_array_tmp = \is_array($search_values);
 
                 /** @noinspection PhpParameterByRefIsNotUsedAsReferenceInspection */
@@ -3801,7 +3801,7 @@ 
         $useArguments = \func_num_args() > 2;
 
         return static::create(
-            function () use ($useArguments, $callable, $useKeyAsSecondParameter, $arguments) {
+            function() use ($useArguments, $callable, $useKeyAsSecondParameter, $arguments) {
                 foreach ($this->getGenerator() as $key => $value) {
                     if ($useArguments) {
                         if ($useKeyAsSecondParameter) {
@@ -4223,7 +4223,7 @@ 
      */
     public function nth(int $step, int $offset = 0): self
     {
-        $arrayFunction = function () use ($step, $offset): \Generator {
+        $arrayFunction = function() use ($step, $offset): \Generator {
             $position = 0;
             foreach ($this->getGenerator() as $key => $value) {
                 if ($position++ % $step !== $offset) {
@@ -4257,7 +4257,7 @@ 
     {
         $keys = \array_flip($keys);
 
-        $generator = function () use ($keys): \Generator {
+        $generator = function() use ($keys): \Generator {
             foreach ($this->getGenerator() as $key => $value) {
                 if (isset($keys[$key])) {
                     yield $key => $value;
@@ -4387,7 +4387,7 @@ 
      */
     public function prependImmutable($value, $key = null)
     {
-        $generator = function () use ($key, $value): \Generator {
+        $generator = function() use ($key, $value): \Generator {
             if ($this->properties !== []) {
                 $this->checkType($key, $value);
             }
@@ -4438,7 +4438,7 @@ 
                 )->prependToEachKey($suffix)
                     ->toArray();
             } else {
-                $result[$key . $suffix] = $item;
+                $result[$key.$suffix] = $item;
             }
         }
 
@@ -4478,7 +4478,7 @@ 
             } elseif (\is_object($item) === true) {
                 $result[$key] = $item;
             } else {
-                $result[$key] = $item . $suffix;
+                $result[$key] = $item.$suffix;
             }
         }
 
@@ -5170,7 +5170,7 @@ 
          * @psalm-suppress MissingClosureParamType
          */
         return $this->each(
-            static function ($value) use ($search, $replacement) {
+            static function($value) use ($search, $replacement) {
                 return \str_replace($search, $replacement, $value);
             }
         );
@@ -5797,7 +5797,7 @@ 
              * @psalm-suppress MissingClosureParamType
              */
             $results = $arrayy->each(
-                function ($value) use ($sorter) {
+                function($value) use ($sorter) {
                     if (\is_callable($sorter) === true) {
                         return $sorter($value);
                     }
@@ -5895,7 +5895,7 @@ 
     public function stripEmpty(): self
     {
         return $this->filter(
-            static function ($item) {
+            static function($item) {
                 if ($item === null) {
                     return false;
                 }
@@ -6087,7 +6087,7 @@ 
          * @psalm-suppress MissingClosureParamType
          */
         $this->array = $this->reduce(
-            static function ($resultArray, $value) {
+            static function($resultArray, $value) {
                 if (!\in_array($value, $resultArray, true)) {
                     $resultArray[] = $value;
                 }
@@ -6122,7 +6122,7 @@ 
          */
         $this->array = \array_reduce(
             \array_keys($array),
-            static function ($resultArray, $key) use ($array) {
+            static function($resultArray, $key) use ($array) {
                 if (!\in_array($array[$key], $resultArray, true)) {
                     $resultArray[$key] = $array[$key];
                 }
@@ -6202,7 +6202,7 @@ 
     public function values(): self
     {
         return static::create(
-            function () {
+            function() {
                 /** @noinspection YieldFromCanBeUsedInspection */
                 foreach ($this->getGenerator() as $value) {
                     yield $value;
@@ -6268,7 +6268,7 @@ 
     public function where(string $keyOrPropertyOrMethod, $value): self
     {
         return $this->filter(
-            function ($item) use ($keyOrPropertyOrMethod, $value) {
+            function($item) use ($keyOrPropertyOrMethod, $value) {
                 $accessorValue = $this->extractValue(
                     $item,
                     $keyOrPropertyOrMethod
@@ -6558,7 +6558,7 @@ 
     protected function getPropertiesFromPhpDoc()
     {
         static $PROPERTY_CACHE = [];
-        $cacheKey = 'Class::' . static::class;
+        $cacheKey = 'Class::'.static::class;
 
         if (isset($PROPERTY_CACHE[$cacheKey])) {
             return $PROPERTY_CACHE[$cacheKey];
@@ -6841,7 +6841,7 @@ 
         if ($array === null) {
             $array = [];
         } elseif (!\is_array($array)) {
-            throw new \RuntimeException('Can not set value at this path "' . $key . '" because (' . \gettype($array) . ')"' . \print_r($array, true) . '" is not an array.');
+            throw new \RuntimeException('Can not set value at this path "'.$key.'" because ('.\gettype($array).')"'.\print_r($array, true).'" is not an array.');
         }
 
         $array[$key] = $value;
@@ -6913,7 +6913,7 @@ 
                 &&
                 \count(\array_diff_key($properties, $data)) > 0
             ) {
-                throw new \TypeError('Property mismatch - input: ' . \print_r(\array_keys($data), true) . ' | expected: ' . \print_r(\array_keys($properties), true));
+                throw new \TypeError('Property mismatch - input: '.\print_r(\array_keys($data), true).' | expected: '.\print_r(\array_keys($properties), true));
             }
 
             foreach ($data as $key => &$valueInner) {
@@ -7026,7 +7026,7 @@ 
              *
              * @return void
              */
-            static function (&$item) {
+            static function(&$item) {
                 if ($item instanceof self) {
                     $item = $item->getArray();
                 }
@@ -7051,7 +7051,7 @@ 
             &&
             $this->checkPropertiesMismatch === true
         ) {
-            throw new \TypeError('The key ' . $key . ' does not exists in "properties". Maybe because @property was not used for the class (' . \get_class($this) . ').');
+            throw new \TypeError('The key '.$key.' does not exists in "properties". Maybe because @property was not used for the class ('.\get_class($this).').');
         }
 
         if (isset($this->properties[self::ARRAYY_HELPER_TYPES_FOR_ALL_PROPERTIES])) {

src/Collection/AbstractCollection.php

Spacing +2 added lines, -2 removed lines

@@ -290,9 +290,9 @@
         $return = static::create();
         $jsonObject = \json_decode($json, false);
         $mapper = new \Arrayy\Mapper\Json();
-        $mapper->undefinedPropertyHandler = static function ($object, $key, $jsonValue) use ($return) {
+        $mapper->undefinedPropertyHandler = static function($object, $key, $jsonValue) use ($return) {
             if ($return->checkForMissingPropertiesInConstructor) {
-                throw new \TypeError('Property mismatch - input: ' . \print_r(['key' => $key, 'jsonValue' => $jsonValue], true) . ' for object: ' . \get_class($object));
+                throw new \TypeError('Property mismatch - input: '.\print_r(['key' => $key, 'jsonValue' => $jsonValue], true).' for object: '.\get_class($object));
             }
         };
 

src/Mapper/Json.php

Spacing +9 added lines, -9 removed lines

@@ -65,7 +65,7 @@ 
 
         if (!\is_object($object)) {
             throw new \InvalidArgumentException(
-                'JsonMapper::map() requires second argument to be an object, ' . \gettype($object) . ' given.'
+                'JsonMapper::map() requires second argument to be an object, '.\gettype($object).' given.'
             );
         }
 
@@ -114,7 +114,7 @@ 
                 $type = $this->removeNullable($type);
             } elseif ($jsonValue === null) {
                 throw new \InvalidArgumentException(
-                    'JSON property "' . $key . '" in class "' . $strClassName . '" must not be NULL'
+                    'JSON property "'.$key.'" in class "'.$strClassName.'" must not be NULL'
                 );
             }
 
@@ -141,7 +141,7 @@ 
             if ($this->isSimpleType($type)) {
                 if ($type === 'string' && \is_object($jsonValue)) {
                     throw new \InvalidArgumentException(
-                        'JSON property "' . $key . '" in class "' . $strClassName . '" is an object and cannot be converted to a string'
+                        'JSON property "'.$key.'" in class "'.$strClassName.'" is an object and cannot be converted to a string'
                     );
                 }
 
@@ -162,7 +162,7 @@ 
 
             if ($type === '') {
                 throw new \InvalidArgumentException(
-                    'Empty type at property "' . $strClassName . '::$' . $key . '"'
+                    'Empty type at property "'.$strClassName.'::$'.$key.'"'
                 );
             }
 
@@ -196,7 +196,7 @@ 
                     $this->isScalarType(\gettype($jsonValue))
                 ) {
                     throw new \InvalidArgumentException(
-                        'JSON property "' . $key . '" must be an array, ' . \gettype($jsonValue) . ' given'
+                        'JSON property "'.$key.'" must be an array, '.\gettype($jsonValue).' given'
                     );
                 }
 
@@ -273,7 +273,7 @@ 
                 }
             } elseif ($this->isScalarType($class)) {
                 throw new \InvalidArgumentException(
-                    'JSON property "' . ($parent_key ?: '?') . '" is an array of type "' . $class . '" but contained a value of type "' . \gettype($jsonValue) . '"'
+                    'JSON property "'.($parent_key ?: '?').'" is an array of type "'.$class.'" but contained a value of type "'.\gettype($jsonValue).'"'
                 );
             } elseif (\is_a($class, \ArrayObject::class, true)) {
                 /** @noinspection PhpSillyAssignmentInspection - phpstan helper */
@@ -329,7 +329,7 @@ 
         }
 
         //create a full qualified namespace
-        return '\\' . $strNs . '\\' . $type;
+        return '\\'.$strNs.'\\'.$type;
     }
 
     /**
@@ -633,7 +633,7 @@ 
      */
     private function isNullable($type): bool
     {
-        return \stripos('|' . $type . '|', '|null|') !== false;
+        return \stripos('|'.$type.'|', '|null|') !== false;
     }
 
     /**
@@ -650,7 +650,7 @@ 
         }
 
         return \substr(
-            \str_ireplace('|null|', '|', '|' . $type . '|'),
+            \str_ireplace('|null|', '|', '|'.$type.'|'),
             1,
             -1
         );