Commit 20b2fa3

committed

up: enhance the Str.renderVars, support print array as string

1 parent 0f865a4 commit 20b2fa3Copy full SHA for 20b2fa3

File tree

+44

-2

lines changed

+44

-2

lines changed

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,16 @@`
	`1`	`+<?php declare(strict_types=1);`
	`2`	`+`
	`3`	`+namespace Toolkit\Stdlib;`
	`4`	`+`
	`5`	`+use Toolkit\Stdlib\Helper\DataHelper;`
	`6`	`+`
	`7`	`+/**`
	`8`	`+ * class Any`
	`9`	`+ *`
	`10`	`+ * @author inhere`
	`11`	`+ * @date 2022年12月30日`
	`12`	`+ */`
	`13`	`+final class Any extends DataHelper`
	`14`	`+{`
	`15`	`+`
	`16`	`+}`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`use function gethostname;`
`31`	`31`	`use function hash;`
`32`	`32`	`use function hex2bin;`
	`33`	`+use function is_array;`
`33`	`34`	`use function is_int;`
`34`	`35`	`use function mb_strwidth;`
`35`	`36`	`use function microtime;`
`@@ -309,9 +310,16 @@ public static function renderVars(string $tplCode, array $vars, string $format =`
`309`	`310`	`return $tplCode;`
`310`	`311`	`}`
`311`	`312`
`312`		`- $fmtVars = Arr::flattenMap($vars, Arr::FLAT_DOT_JOIN_INDEX);`
	`313`	`+ $fmtVars = Arr::flattenMap($vars, Arr\ArrConst::FLAT_DOT_JOIN_INDEX);`
`313`	`314`	`$pattern = sprintf('/%s([\w\s.-]+)%s/', preg_quote($left, '/'), preg_quote($right, '/'));`
`314`	`315`
	`316`	`+ // convert array value to string.`
	`317`	`+ foreach ($vars as $name => $val) {`
	`318`	`+ if (is_array($val)) {`
	`319`	`+ $fmtVars[$name] = Arr::toStringV2($val);`
	`320`	`+ }`
	`321`	`+ }`
	`322`	`+`
`315`	`323`	`return preg_replace_callback($pattern, static function (array $match) use ($fmtVars) {`
`316`	`324`	`$var = trim($match[1]);`
`317`	`325`	`if ($var && isset($fmtVars[$var])) {`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -489,6 +489,17 @@ public static function isAlphaNum(string $str): bool`
`489`	`489`	`return preg_match('/^[a-zA-Z0-9]+$/', $str) === 1;`
`490`	`490`	`}`
`491`	`491`
	`492`	`+ /**`
	`493`	`+ * @param string $pattern`
	`494`	`+ * @param string $str`
	`495`	`+ *`
	`496`	`+ * @return bool`
	`497`	`+ */`
	`498`	`+ public static function pregMatch(string $pattern, string $str): bool`
	`499`	`+ {`
	`500`	`+ return preg_match($pattern, $str) === 1;`
	`501`	`+ }`
	`502`	`+`
`492`	`503`	`/**`
`493`	`504`	`* 使用正则验证数据`
`494`	`505`	`*`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public function testBasicStrMethods(): void`
`27`	`27`
`28`	`28`	`$this->assertTrue(Str::isNull('null'));`
`29`	`29`	`$this->assertFalse(Str::isNull('abc'));`
	`30`	`+`
	`31`	`+ $this->assertTrue(Str::isAlphaNum('abc'));`
	`32`	`+ $this->assertTrue(Str::isAlphaNum('abc23'));`
	`33`	`+ $this->assertFalse(Str::isAlphaNum('--'));`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`public function testIsBool(): void`
`@@ -273,7 +277,7 @@ public function testRenderVars(): void`
`273`	`277`	`$vars = [`
`274`	`278`	`'name' => 'inhere',`
`275`	`279`	`'age' => 200,`
`276`		`- 'tags' => ['php'],`
	`280`	`+ 'tags' => ['php', 'java'],`
`277`	`281`	`'top' => [`
`278`	`282`	`'key0' => 'val0',`
`279`	`283`	`]`
`@@ -284,5 +288,8 @@ public function testRenderVars(): void`
`284`	`288`
`285`	`289`	`$text = Str::renderVars('hello ${ name }, age: ${ age}, tags: ${ tags.0 }, key0: ${top.key0 }', $vars, '${%s}');`
`286`	`290`	`$this->assertEquals('hello inhere, age: 200, tags: php, key0: val0', $text);`
	`291`	`+`
	`292`	`+ $text = Str::renderVars('tags: ${ tags }', $vars, '${%s}');`
	`293`	`+ $this->assertEquals('tags: [php, java]', $text);`
`287`	`294`	`}`
`288`	`295`	`}`

Comments

(0)