Commit beb436a

committed

up: fix some error for run in php8.4

1 parent 1f06a0f commit beb436aCopy full SHA for beb436a

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ jobs:`
`10`	`10`	`strategy:`
`11`	`11`	`fail-fast: true`
`12`	`12`	`matrix:`
`13`		`- php: [8.1, 8.2, 8.3]`
	`13`	`+ php: [8.1, 8.2, 8.3, 8.4]`
`14`	`14`	`# os: [ubuntu-latest, macOS-latest] # windows-latest,`
`15`	`15`
`16`	`16`	`steps:`

Lines changed: 1 addition & 1 deletion

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public static function after(string $s, string $sub, string $fallback = ''): str`
`128`	`128`	`*`
`129`	`129`	`* @return bool\|string`
`130`	`130`	`*/`
`131`		`- public static function substr(string $str, int $start, int $length = null, string $encoding = 'utf-8'): bool\|string`
	`131`	`+ public static function substr(string $str, int $start, int\|null $length = null, string $encoding = 'utf-8'): bool\|string`
`132`	`132`	`{`
`133`	`133`	`if (function_exists('mb_substr')) {`
`134`	`134`	`return mb_substr($str, $start, $length ?? self::strlen($str), $encoding);`
`@@ -147,7 +147,7 @@ public static function substr(string $str, int $start, int $length = null, strin`
`147`	`147`	`*`
`148`	`148`	`* @return string`
`149`	`149`	`*/`
`150`		`- public static function utf8SubStr(string $str, int $start = 0, int $length = null): string`
	`150`	`+ public static function utf8SubStr(string $str, int $start = 0, int\|null $length = null): string`
`151`	`151`	`{`
`152`	`152`	`if (empty($str)) {`
`153`	`153`	`return '';`
`@@ -241,7 +241,7 @@ public static function truncate(string $str, int $maxLength, string $suffix = '.`
`241`	`241`	`*`
`242`	`242`	`* @return string`
`243`	`243`	`*/`
`244`		`- public static function truncate2(string $str, int $start, int $length = null): string`
	`244`	`+ public static function truncate2(string $str, int $start, ?int $length = null): string`
`245`	`245`	`{`
`246`	`246`	`if (!$length) {`
`247`	`247`	`$length = $start;`

Comments

(0)