Skip to content

Commit e31d26b

Browse files
inhereinhere
committed
style: update and fix some code style
1 parent beb436a commit e31d26b

26 files changed

+73
-73
lines changed

‎src/Arr/ArrayHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static function valueTrim(array $data): array
7575
public static function getKeyMaxWidth(array $data, bool $excludeInt = true): int
7676
{
7777
$maxWidth = 0;
78-
foreach ($data as $key => $value) {
78+
foreach ($data as $key => $_) {
7979
// key is not a integer
8080
if (!$excludeInt || !is_numeric($key)) {
8181
$width = mb_strlen((string)$key, 'UTF-8');

‎src/Arr/Traits/ArrayMergeTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ trait ArrayMergeTrait
3131
*/
3232
public static function replace(array $base, array $replacements): array
3333
{
34-
foreach ($base as $key => $value) {
34+
foreach ($base as $key => $_) {
3535
if (isset($replacements[$key])) {
3636
$base[$key] = $replacements[$key];
3737
}

‎src/Helper/BasePhpTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function tryCatchRun(callable $cb): Throwable
8585
*
8686
* @return void
8787
*/
88-
public function assertException(Throwable $e, string $msg, int $code = null): void
88+
public function assertException(Throwable $e, string $msg, ?int $code = null): void
8989
{
9090
$this->assertEquals($msg, $e->getMessage());
9191

‎src/Helper/DateHelper.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static function isTimestamp(int|string $timestamp): bool
4141
*
4242
* @param string $date 日期
4343
*
44-
* @return boolean
44+
* @return bool
4545
*/
4646
public static function isDate(string $date): bool
4747
{
@@ -54,7 +54,7 @@ public static function isDate(string $date): bool
5454
* @param string $date 日期
5555
* @param string $format 需要检验的格式数组
5656
*
57-
* @return boolean
57+
* @return bool
5858
*/
5959
public static function isDateFormat(string $date, string $format = 'Y-m-d'): bool
6060
{

‎src/Helper/IntHelper.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,26 @@ public static function getMin(int $val1, int $val2): int
4747
// ----- http://cn2.php.net/manual/zh/function.pack.php#119402
4848

4949
/**
50-
* @param $i
50+
* @param int|string $i
5151
*
5252
* @return false|mixed|string
5353
*/
54-
public static function int8($i): mixed
54+
public static function int8(int|string $i): mixed
5555
{
5656
return is_int($i) ? pack('c', $i) : unpack('c', $i)[1];
5757
}
5858

59-
public static function uInt8($i)
59+
public static function uInt8(int|string $i)
6060
{
6161
return is_int($i) ? pack('C', $i) : unpack('C', $i)[1];
6262
}
6363

64-
public static function int16($i)
64+
public static function int16(int|string $i)
6565
{
6666
return is_int($i) ? pack('s', $i) : unpack('s', $i)[1];
6767
}
6868

69-
public static function uint16($i, $endianness = false)
69+
public static function uint16(int|string $i, $endianness = false)
7070
{
7171
$f = is_int($i) ? 'pack' : 'unpack';
7272

‎src/Helper/JsonHelper.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ public static function encodeCN(
8484
}
8585

8686
/**
87-
* @param $data
87+
* @param mixed $data
8888
*
8989
* @return string
9090
*/
91-
public static function pretty($data): string
91+
public static function pretty(mixed $data): string
9292
{
9393
return self::encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
9494
}
@@ -107,21 +107,21 @@ public static function prettyJSON(
107107
}
108108

109109
/**
110-
* @param $data
110+
* @param mixed $data
111111
*
112112
* @return string
113113
*/
114-
public static function unescaped($data): string
114+
public static function unescaped(mixed $data): string
115115
{
116116
return self::encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
117117
}
118118

119119
/**
120-
* @param $data
120+
* @param mixed $data
121121
*
122122
* @return string
123123
*/
124-
public static function unescapedSlashes($data): string
124+
public static function unescapedSlashes(mixed $data): string
125125
{
126126
return self::encode($data, JSON_UNESCAPED_SLASHES);
127127
}

‎src/Helper/NumHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static function roundInt(float|int $value): int
8282
*
8383
* @return int
8484
*/
85-
public static function random(int $min, int $max, int $fallback = null): int
85+
public static function random(int $min, int $max, ?int $fallback = null): int
8686
{
8787
try {
8888
return random_int($min, $max);

‎src/Helper/PhpHelper.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static function reflectMethod(object|string $classOrObj, string $method):
105105
*
106106
* @return Generator
107107
*/
108-
public static function getReflectMethods(ReflectionClass $reflectClass, int $flags = 0, Closure $nameFilter = null): ?Generator
108+
public static function getReflectMethods(ReflectionClass $reflectClass, int $flags = 0, ?Closure $nameFilter = null): ?Generator
109109
{
110110
foreach ($reflectClass->getMethods($flags) as $m) {
111111
$mName = $m->getName();
@@ -119,11 +119,11 @@ public static function getReflectMethods(ReflectionClass $reflectClass, int $fla
119119
}
120120

121121
/**
122-
* @param $value
122+
* @param mixed $value
123123
*
124124
* @return mixed
125125
*/
126-
public static function value($value): mixed
126+
public static function value(mixed $value): mixed
127127
{
128128
if (is_callable($value)) {
129129
return $value();
@@ -376,7 +376,7 @@ public static function lastError2array(): array
376376
*
377377
* @return string
378378
*/
379-
public static function exception2string(Throwable $e, bool $getTrace = true, string $catcher = null): string
379+
public static function exception2string(Throwable $e, bool $getTrace = true, ?string $catcher = null): string
380380
{
381381
return PhpException::toString($e, $getTrace, $catcher);
382382
}
@@ -388,17 +388,17 @@ public static function exception2string(Throwable $e, bool $getTrace = true, str
388388
*
389389
* @return string
390390
*/
391-
public static function exception2html(Throwable $e, bool $getTrace = true, string $catcher = null): string
391+
public static function exception2html(Throwable $e, bool $getTrace = true, ?string $catcher = null): string
392392
{
393393
return PhpException::toHtml($e, $getTrace, $catcher);
394394
}
395395

396396
/**
397-
* @param $anyData
397+
* @param mixed $anyData
398398
*
399399
* @return string
400400
*/
401-
public static function toString($anyData): string
401+
public static function toString(mixed $anyData): string
402402
{
403403
return DataHelper::toString($anyData);
404404
}

‎src/OS.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ public static function getNullDevice(): string
368368
*
369369
* @param int|resource|mixed $fileDescriptor
370370
*
371-
* @return boolean
371+
* @return bool
372372
*/
373373
public static function isInteractive(mixed $fileDescriptor): bool
374374
{

‎src/Obj/DataObject.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public function toArray(): array
268268
public function getKeys(): array
269269
{
270270
$keys = [];
271-
foreach ($this as $key => $val) {
271+
foreach ($this as $key => $_) {
272272
$keys[] = $key;
273273
}
274274

‎src/Obj/ObjectHelper.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ public static function create(string $class): mixed
294294
{
295295
try {
296296
$reflection = new ReflectionClass($class);
297-
} catch (ReflectionException $e) {
297+
} catch (ReflectionException $_) {
298298
return false;
299299
}
300300

@@ -361,7 +361,7 @@ public static function getMethodArgs(ReflectionMethod $method, array $provideArg
361361
$depRftClass = $param->getType();
362362

363363
// If we have a dependency, that means it has been type-hinted.
364-
if ($depRftClass && ($depClass = $depRftClass->getName()) !== Closure::class) {
364+
if ($depRftClass && $depRftClass instanceof ReflectionNamedType && ($depClass = $depRftClass->getName()) !== Closure::class) {
365365
$depObject = self::create($depClass);
366366

367367
if ($depObject instanceof $depClass) {

‎src/Obj/Traits/ArrayAccessByGetterSetterTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ trait ArrayAccessByGetterSetterTrait
3131
*
3232
* @param mixed $offset The array offset.
3333
*
34-
* @return boolean True if the offset exists, false otherwise.
34+
* @return bool True if the offset exists, false otherwise.
3535
*/
3636
public function offsetExists($offset): bool
3737
{

‎src/Obj/Traits/ArrayAccessByPropertyTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ trait ArrayAccessByPropertyTrait
2828
*
2929
* @param mixed $offset The array offset.
3030
*
31-
* @return boolean True if the offset exists, false otherwise.
31+
* @return bool True if the offset exists, false otherwise.
3232
*/
3333
public function offsetExists(mixed $offset): bool
3434
{

‎src/Obj/Traits/PropertyAccessByGetterSetterTrait.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function __set(string $name, mixed $value): void
5151
/**
5252
* @reference yii2 yii\base\Object::__set()
5353
*
54-
* @param $name
54+
* @param string $name
5555
*
5656
* @return mixed
5757
* @throws GetPropertyException
@@ -72,7 +72,7 @@ public function __get(string $name)
7272
}
7373

7474
/**
75-
* @param $name
75+
* @param string $name
7676
*
7777
* @return bool
7878
*/
@@ -88,11 +88,11 @@ public function __isset(string $name)
8888
}
8989

9090
/**
91-
* @param $name
91+
* @param string $name
9292
*
9393
* @throws PropertyException
9494
*/
95-
public function __unset($name): void
95+
public function __unset(string $name): void
9696
{
9797
$setter = 'set' . ucfirst($name);
9898

‎src/Obj/Traits/StdObjectTrait.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final public static function fullName(): string
4141
*
4242
* @return string
4343
*/
44-
final public static function spaceName(string $fullName = null): string
44+
final public static function spaceName(?string $fullName = null): string
4545
{
4646
$fullName = $fullName ?: self::fullName();
4747
$fullName = str_replace('\\', '/', $fullName);
@@ -56,7 +56,7 @@ final public static function spaceName(string $fullName = null): string
5656
*
5757
* @return string
5858
*/
59-
final public static function className(string $fullName = null): string
59+
final public static function className(?string $fullName = null): string
6060
{
6161
$fullName = $fullName ?: self::fullName();
6262
$fullName = str_replace('\\', '/', $fullName);

‎src/Std/Collection.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ public function set(string $key, mixed $value): static
7979

8080
/**
8181
* @param string $name
82-
* @param $value
82+
* @param mixed $value
8383
*
8484
* @return $this
8585
*/
86-
public function add(string $name, $value): static
86+
public function add(string $name, mixed $value): static
8787
{
8888
if (!$this->has($name)) {
8989
$this->set($name, $value);
@@ -514,9 +514,9 @@ public function __get(string $name)
514514

515515
/**
516516
* @param string $name
517-
* @param $value
517+
* @param mixed $value
518518
*/
519-
public function __set(string $name, $value): void
519+
public function __set(string $name, mixed $value): void
520520
{
521521
$this->set($name, $value);
522522
}

‎src/Str/HtmlHelper.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ public static function encodeArray(array $data, string $charset = 'utf-8'): arra
9393
* htmlspecialchars() <--> htmlspecialchars_decode() — 将特殊的 HTML 实体转换回普通字符
9494
* ENT_COMPAT ENT_QUOTES ENT_NOQUOTES ENT_HTML401 ENT_XML1 ENT_XHTML ENT_HTML5
9595
*
96-
* @param $data
96+
* @param string|array $data
9797
* @param int $type
9898
* @param string $encoding
9999
*
100100
* @return array|string
101101
*/
102-
public static function escape($data, int $type = 0, string $encoding = 'UTF-8'): array|string
102+
public static function escape(string|array $data, int $type = 0, string $encoding = 'UTF-8'): array|string
103103
{
104104
if (is_array($data)) {
105-
foreach ($data as $k => $v) {
105+
foreach ($data as $k => $_) {
106106
$data[$k] = self::escape($data, $type, $encoding);
107107
}
108108

@@ -136,7 +136,7 @@ public static function escape($data, int $type = 0, string $encoding = 'UTF-8'):
136136
public static function unescap(array|string $data, int $type = 0, string $encoding = 'UTF-8'): array|string
137137
{
138138
if (is_array($data)) {
139-
foreach ($data as $k => $v) {
139+
foreach ($data as $k => $_) {
140140
$data[$k] = self::unescap($data, $type, $encoding);
141141
}
142142
} elseif (!$type) {// 默认使用 htmlspecialchars_decode()

‎src/Str/Traits/StringCaseHelperTrait.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,21 @@ public static function upFirst(int|string $str): string
142142
}
143143

144144
/**
145-
* @param $str
145+
* @param string $str
146146
*
147147
* @return string
148148
*/
149-
public static function ucfirst($str): string
149+
public static function ucfirst(string $str): string
150150
{
151151
return self::upFirst($str);
152152
}
153153

154154
/**
155-
* @param $str
155+
* @param string $str
156156
*
157157
* @return string
158158
*/
159-
public static function ucwords($str): string
159+
public static function ucwords(string $str): string
160160
{
161161
return function_exists('mb_convert_case') ?
162162
mb_convert_case((string)$str, MB_CASE_TITLE) :

‎src/Str/Traits/StringCheckHelperTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ public static function pregMatch(string $pattern, string $str): bool
514514
*
515515
* @param string $value 要验证的数据
516516
* @param string $rule 验证规则 require email url currency number integer english
517-
* @return boolean
517+
* @return bool
518518
*/
519519
public static function match(string $value, string $rule): bool
520520
{

‎src/Str/Traits/StringOtherHelperTrait.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ trait StringOtherHelperTrait
3030
/**
3131
* format description
3232
*
33-
* @param $str
33+
* @param string $str input
3434
* @param array $replaceParams 用于 str_replace('search','replace',$str )
3535
* @param array $pregParams 用于 preg_replace('pattern','replace',$str)
3636
*
@@ -54,7 +54,7 @@ trait StringOtherHelperTrait
5454
* ['yy','yy2'], //'replace'
5555
* ]
5656
*/
57-
public static function format($str, array $replaceParams = [], array $pregParams = []): string
57+
public static function format(string $str, array $replaceParams = [], array $pregParams = []): string
5858
{
5959
if (!is_string($str) || !$str || (!$replaceParams && !$pregParams)) {
6060
return $str;

0 commit comments

Comments
 (0)