Commit d592891

committed

up: update some for data and stream helper

1 parent c3a38a2 commit d592891Copy full SHA for d592891

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@`
`9`	`9`
`10`	`10`	`namespace Toolkit\Stdlib\Helper;`
`11`	`11`
	`12`	`+use Toolkit\Stdlib\Json;`
`12`	`13`	`use function filter_var;`
`13`	`14`	`use function gettype;`
`14`	`15`	`use function is_array;`
`15`	`16`	`use function is_bool;`
`16`	`17`	`use function is_object;`
`17`	`18`	`use function is_scalar;`
`18`	`19`	`use function is_string;`
`19`		`-use function json_encode;`
`20`	`20`	`use function method_exists;`
`21`	`21`	`use const FILTER_NULL_ON_FAILURE;`
`22`	`22`	`use const FILTER_VALIDATE_BOOLEAN;`
`@@ -59,13 +59,17 @@ public static function toBool(mixed $val, bool $nullAsFalse = false): bool`
`59`	`59`
`60`	`60`	`/**`
`61`	`61`	`* @param mixed $val`
	`62`	`+ * @param bool $simpleBool`
`62`	`63`	`*`
`63`	`64`	`* @return string`
`64`	`65`	`*/`
`65`		`- public static function toString(mixed $val): string`
	`66`	`+ public static function toString(mixed $val, bool$simpleBool = false): string`
`66`	`67`	`{`
`67`	`68`	`if (is_scalar($val)) {`
`68`	`69`	`if (is_bool($val)) {`
	`70`	`+ if ($simpleBool) {`
	`71`	`+ return $val ? 'TRUE' : 'FALSE';`
	`72`	`+ }`
`69`	`73`	`return $val ? 'bool(TRUE)' : 'bool(FALSE)';`
`70`	`74`	`}`
`71`	`75`
`@@ -78,7 +82,7 @@ public static function toString(mixed $val): string`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`if (is_array($val)) {`
`81`		`- return json_encode($val);`
	`85`	`+ return Json::enc($val);`
`82`	`86`	`}`
`83`	`87`
`84`	`88`	`if (is_object($val)) {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function map(callable $mapper): static`
`45`	`45`
`46`	`46`	`/**`
`47`	`47`	`* @param callable(mixed): mixed $func`
	`48`	`+ * @param array $map`
`48`	`49`	`*`
`49`	`50`	`* @return array<string, mixed>`
`50`	`51`	`*/`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,15 @@ public function testIsBool(): void`
`36`	`36`	`$this->assertFalse(Str::isBool('abc'));`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ public function testIsVarName(): void`
	`40`	`+ {`
	`41`	`+ $this->assertTrue(Str::isVarName('true'));`
	`42`	`+ $this->assertTrue(Str::isVarName('abc'));`
	`43`	`+ $this->assertTrue(Str::isVarName('some_name'));`
	`44`	`+ $this->assertFalse(Str::isVarName('some-name'));`
	`45`	`+ $this->assertFalse(Str::isVarName('some_name()'));`
	`46`	`+ }`
	`47`	`+`
`39`	`48`	`public function testToTyped(): void`
`40`	`49`	`{`
`41`	`50`	`$tests = [`

Comments

(0)