增加PHP7.1依赖

Author: liu21st

README.md

@@ -1,10 +1,11 @@
-# thinkphp5 常用的一些扩展类库
+# thinkphp6 常用的一些扩展类库
 
-> 更新完善中
+基于PHP7.1+
 
 > 以下类库都在`\\think\\helper`命名空间下
 
 ## Str
+
 > 字符串操作
 
 ```

composer.json

@@ -8,6 +8,9 @@
             "email": "448901948@qq.com"
         }
     ],
+    "require": {
+        "php": ">=7.1.0"
+    },    
     "autoload": {
         "psr-4": {
             "think\\": "src"

src/Collection.php

@@ -623,7 +623,7 @@ public function jsonSerialize()
      * @param integer $options json参数
      * @return string
      */
-    public function toJson($options = JSON_UNESCAPED_UNICODE)
+    public function toJson(int $options = JSON_UNESCAPED_UNICODE): string
     {
         return json_encode($this->toArray(), $options);
     }

src/contract/Arrayable.php

@@ -4,5 +4,5 @@
 
 interface Arrayable
 {
-    public function toArray();
+    public function toArray(): array;
 }

src/contract/Jsonable.php

@@ -4,5 +4,5 @@
 
 interface Jsonable
 {
-    public function toJson($options = 0);
+    public function toJson(int $options = JSON_UNESCAPED_UNICODE): string;
 }

src/helper.php

@@ -132,7 +132,7 @@ function data_get($target, $key, $default = null)
         $key = is_array($key) ? $key : explode('.', $key);
 
         while (!is_null($segment = array_shift($key))) {
-            if ($segment === '*') {
+            if ('*' === $segment) {
                 if ($target instanceof Collection) {
                     $target = $target->all();
                 } elseif (!is_array($target)) {

src/helper/Str.php

@@ -25,10 +25,10 @@ class Str
      * @param string|array $needles
      * @return bool
      */
-    public static function contains($haystack, $needles)
+    public static function contains(string $haystack, $needles): bool
     {
         foreach ((array) $needles as $needle) {
-            if ($needle != '' && mb_strpos($haystack, $needle) !== false) {
+            if ('' != $needle && mb_strpos($haystack, $needle) !== false) {
                 return true;
             }
         }
@@ -43,7 +43,7 @@ public static function contains($haystack, $needles)
      * @param  string|array $needles
      * @return bool
      */
-    public static function endsWith($haystack, $needles)
+    public static function endsWith(string $haystack, $needles): bool
     {
         foreach ((array) $needles as $needle) {
             if ((string) $needle === static::substr($haystack, -static::length($needle))) {
@@ -61,10 +61,10 @@ public static function endsWith($haystack, $needles)
      * @param  string|array $needles
      * @return bool
      */
-    public static function startsWith($haystack, $needles)
+    public static function startsWith(string $haystack, $needles): bool
     {
         foreach ((array) $needles as $needle) {
-            if ($needle != '' && mb_strpos($haystack, $needle) === 0) {
+            if ('' != $needle && mb_strpos($haystack, $needle) === 0) {
                 return true;
             }
         }
@@ -78,7 +78,7 @@ public static function startsWith($haystack, $needles)
      * @param  int $length
      * @return string
      */
-    public static function random($length = 16)
+    public static function random(int $length = 16): string
     {
         $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
@@ -91,7 +91,7 @@ public static function random($length = 16)
      * @param  string $value
      * @return string
      */
-    public static function lower($value)
+    public static function lower(string $value): string
     {
         return mb_strtolower($value, 'UTF-8');
     }
@@ -102,7 +102,7 @@ public static function lower($value)
      * @param  string $value
      * @return string
      */
-    public static function upper($value)
+    public static function upper(string $value): string
     {
         return mb_strtoupper($value, 'UTF-8');
     }
@@ -113,7 +113,7 @@ public static function upper($value)
      * @param  string $value
      * @return int
      */
-    public static function length($value)
+    public static function length(string $value): string
     {
         return mb_strlen($value);
     }
@@ -126,7 +126,7 @@ public static function length($value)
      * @param  int|null $length
      * @return string
      */
-    public static function substr($string, $start, $length = null)
+    public static function substr(string $string, int $start, int $length = null): string
     {
         return mb_substr($string, $start, $length, 'UTF-8');
     }
@@ -138,7 +138,7 @@ public static function substr($string, $start, $length = null)
      * @param  string $delimiter
      * @return string
      */
-    public static function snake($value, $delimiter = '_')
+    public static function snake(string $value, string $delimiter = '_'): string
     {
         $key = $value;
 
@@ -161,7 +161,7 @@ public static function snake($value, $delimiter = '_')
      * @param  string $value
      * @return string
      */
-    public static function camel($value)
+    public static function camel(string $value): string
     {
         if (isset(static::$camelCache[$value])) {
             return static::$camelCache[$value];
@@ -176,7 +176,7 @@ public static function camel($value)
      * @param  string $value
      * @return string
      */
-    public static function studly($value)
+    public static function studly(string $value): string
     {
         $key = $value;
 
@@ -195,8 +195,8 @@ public static function studly($value)
      * @param  string $value
      * @return string
      */
-    public static function title($value)
+    public static function title(string $value): string
     {
         return mb_convert_case($value, MB_CASE_TITLE, 'UTF-8');
     }
-}
+}