Commit 23fea3e

committed

2 parents 632527f + 5461eb8 commit 23fea3eCopy full SHA for 23fea3e

File tree

+17

-6

lines changed

+17

-6

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,16 +4,23 @@`
`4`	`4`
`5`	`5`	`use Francerz\Http\Utils\UriHelper;`
`6`	`6`
`7`		`-if (!function_exists('\Francerz\Http\Utils\siteUrl')) {`
	`7`	`+if (!function_exists(__NAMESPACE__ . '\siteUrl')) {`
`8`	`8`	`function siteUrl(?string $path = null, array $sapiVars = [], bool $cached = true)`
`9`	`9`	`{`
`10`	`10`	`return UriHelper::getSiteUrl($path, $sapiVars, $cached);`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`14`		`-if (!function_exists('\Francerz\Http\Utils\baseUrl')) {`
	`14`	`+if (!function_exists(__NAMESPACE__ . '\baseUrl')) {`
`15`	`15`	`function baseUrl(?string $path = null, array $sapiVars = [], bool $cached = true)`
`16`	`16`	`{`
`17`	`17`	`return UriHelper::getBaseUrl($path, $sapiVars, $cached);`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+if (!function_exists(__NAMESPACE__ . '\currentUrl')) {`
	`22`	`+ function currentUrl(array $sapiVars = [], bool $cached = true)`
	`23`	`+ {`
	`24`	`+ return UriHelper::getCurrentString($sapiVars, $cached);`
	`25`	`+ }`
	`26`	`+}`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public static function getBaseUrl(?string $path = null, array $sapiVars = [], bo`
`224`	`224`	`return static::getSiteUrl($path, $sapiVars, $cached);`
`225`	`225`	`}`
`226`	`226`
`227`		`- private static function getCurrentString(array $sapiVars = [], bool $cached = true)`
	`227`	`+ public static function getCurrentString(array $sapiVars = [], bool $cached = true)`
`228`	`228`	`{`
`229`	`229`	`static $uri;`
`230`	`230`	`if ($cached && isset($uri)) {`
`@@ -276,8 +276,12 @@ private static function mapReplaceString(string $uri, array $replaces, bool $enc`
`276`	`276`	`return $uri;`
`277`	`277`	`}`
`278`	`278`
`279`		`- public static function mapReplace(UriFactoryInterface $uriFactory, $uri, array $replaces, bool $encode_values = true): UriInterface`
`280`		`- {`
	`279`	`+ public static function mapReplace(`
	`280`	`+ UriFactoryInterface $uriFactory,`
	`281`	`+ $uri,`
	`282`	`+ array $replaces,`
	`283`	`+ bool $encode_values = true`
	`284`	`+ ): UriInterface {`
`281`	`285`	`$uriStr = $uri;`
`282`	`286`	`if ($uri instanceof UriInterface) {`
`283`	`287`	`$uriStr = (string) $uri;`
`@@ -326,7 +330,7 @@ public static function base64Encode(string $data)`
`326`	`330`	`public static function base64Decode(string $base64, bool $strict = false)`
`327`	`331`	`{`
`328`	`332`	`return base64_decode(`
`329`		`- strtr($base64, '-_', '+/'),`
	`333`	`+ strtr($base64, '-_', '+/') .`
`330`	`334`	`str_repeat('=', - strlen($base64) & 3),`
`331`	`335`	`$strict`
`332`	`336`	`);`

Comments

(0)