feat: add more array and string uril methods

Author: inhere

src/Arr/ArrayHelper.php

@@ -12,6 +12,7 @@
 use ArrayAccess;
 use ArrayObject;
 use stdClass;
+use Toolkit\Stdlib\Helper\DataHelper;
 use Traversable;
 use function array_change_key_case;
 use function array_diff;
@@ -29,6 +30,7 @@
 use function explode;
 use function get_class;
 use function gettype;
+use function implode;
 use function in_array;
 use function is_array;
 use function is_numeric;
@@ -212,7 +214,7 @@ public static function valueExistsAll($check, array $sampleArr): bool
         // 以逗号分隔的会被拆开，组成数组
         if (is_string($check)) {
             $check = trim($check, ', ');
-            $check = strpos($check, ',') !== false ? (array)explode(',', $check) : [$check];
+            $check = str_contains($check, ',') ? explode(',', $check) : [$check];
         }
 
         return !array_diff((array)$check, $sampleArr);
@@ -232,7 +234,7 @@ public static function valueExistsOne($check, array $sampleArr): bool
         // 以逗号分隔的会被拆开，组成数组
         if (is_string($check)) {
             $check = trim($check, ', ');
-            $check = strpos($check, ',') !== false ? (array)explode(',', $check) : [$check];
+            $check = str_contains($check, ',') ? explode(',', $check) : [$check];
         }
 
         return (bool)array_intersect((array)$check, $sampleArr);
@@ -254,7 +256,7 @@ public static function existsAll($need, $arr, bool $type = false)
             foreach ((array)$need as $v) {
                 self::existsAll($v, $arr, $type);
             }
-        } elseif (strpos($need, ',') !== false) {
+        } elseif (str_contains($need, ',')) {
             $need = explode(',', $need);
             self::existsAll($need, $arr, $type);
         } else {
@@ -289,7 +291,7 @@ public static function existsOne($need, $arr, bool $type = false): bool
                 }
             }
         } else {
-            if (strpos($need, ',') !== false) {
+            if (str_contains($need, ',')) {
                 $need = explode(',', $need);
 
                 return self::existsOne($need, $arr, $type);
@@ -514,7 +516,7 @@ public static function flatten(array $array, int $depth = INF): array
      *
      * @return void
      */
-    public static function forget(&$array, $keys): void
+    public static function forget(array &$array, $keys): void
     {
         $original = &$array;
         $keys     = (array)$keys;
@@ -787,7 +789,7 @@ public static function toStringNoKey(
      *
      * @return string
      */
-    public static function toFormatString($array, int $length = 400): string
+    public static function toFormatString(array $array, int $length = 400): string
     {
         $string = var_export($array, true);
 
@@ -834,7 +836,23 @@ public static function toLimitOut($array): array
         }
 
         // $num++;
-
         return $array;
     }
+
+    /**
+     * @param array $data
+     * @param string $kvSep
+     * @param string $lineSep
+     *
+     * @return string
+     */
+    public static function toKVString(array $data, string $kvSep = '=', string $lineSep = "\n"): string
+    {
+        $lines = [];
+        foreach ($data as $key => $val) {
+            $lines = $key . $kvSep . DataHelper::toString($val);
+        }
+
+        return implode($lineSep, $lines);
+    }
 }

src/Helper/DataHelper.php

@@ -38,7 +38,7 @@ class DataHelper
      *
      * @return bool
      */
-    public static function boolean($val, $nullAsFalse = false): bool
+    public static function boolean($val, bool $nullAsFalse = false): bool
     {
         if ($val !== null && !is_scalar($val)) {
             return (bool)$val;
@@ -55,7 +55,7 @@ public static function boolean($val, $nullAsFalse = false): bool
      *
      * @return bool
      */
-    public static function toBool($val, $nullAsFalse = false): bool
+    public static function toBool($val, bool $nullAsFalse = false): bool
     {
         return self::boolean($val, $nullAsFalse);
     }

src/Std.php

@@ -2,11 +2,22 @@
 
 namespace Toolkit\Stdlib;
 
+use Toolkit\Stdlib\Helper\DataHelper;
+
 /**
  * Class Std
  *
  * @package Toolkit\Stdlib
  */
 class Std
 {
+    /**
+     * @param mixed $data
+     *
+     * @return string
+     */
+    public static function toString($data): string
+    {
+        return  DataHelper::toString($data);
+    }
 }

src/Str/StringHelper.php

@@ -349,8 +349,8 @@ public static function wordFormat(string $keyword): string
     public static function deleteStripSpace($fileName, $type = 0)
     {
         $data = trim(file_get_contents($fileName));
-        $data = 0 === strpos($data, '<?php') ? substr($data, 5) : $data;
-        $data = substr($data, -2) === '?>' ? substr($data, 0, -2) : $data;
+        $data = str_starts_with($data, '<?php') ? substr($data, 5) : $data;
+        $data = str_ends_with($data, '?>') ? substr($data, 0, -2) : $data;
 
         //去掉所有注释 换行空白保留
         if ((int)$type === 1) {

src/Str/UrlHelper.php

@@ -95,7 +95,7 @@ public static function simpleCheck(string $url): bool
      */
     public static function isFullUrl(string $url): bool
     {
-        return 0 === strpos($url, 'http:') || 0 === strpos($url, 'https:') || 0 === strpos($url, '//');
+        return str_starts_with($url, 'http:') || str_starts_with($url, 'https:') || str_starts_with($url, '//');
     }
 
     /**

src/Util/AutoLoader.php

@@ -309,7 +309,7 @@ private function findFileWithExtension(string $class)
 
         // PSR-4
         foreach ($this->psr4Map as $prefix => $dir) {
-            if (0 === strpos($class, $prefix)) {
+            if (str_starts_with($class, $prefix)) {
                 $length = strlen($prefix);
 
                 if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
@@ -322,7 +322,7 @@ private function findFileWithExtension(string $class)
         $logicalPathPsr0 = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
 
         foreach ($this->psr0Map as $prefix => $dir) {
-            if (0 === strpos($class, $prefix)) {
+            if (str_starts_with($class, $prefix)) {
                 $file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0;
 
                 if (file_exists($file)) {

src/Util/PhpDotEnv.php

@@ -132,7 +132,7 @@ private function settingEnv(array $data): void
             $name = strtoupper($name);
 
             // don't check existence with getenv() because of thread safety issues
-            $notHttpName = 0 !== strpos($name, 'HTTP_');
+            $notHttpName = !str_starts_with($name, 'HTTP_');
             if ((isset($_ENV[$name]) || (isset($_SERVER[$name]) && $notHttpName)) && !isset($loadedVars[$name])) {
                 continue;
             }