Commit bb6b6b2

committed

ADD baseUrl() and siteUrl() shorthands

1 parent 8efde82 commit bb6b6b2Copy full SHA for bb6b6b2

File tree

+25

-2

lines changed

+25

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`"autoload": {`
	`19`	`+ "files": [ "src/functions.php" ],`
`19`	`20`	`"psr-4": {`
`20`	`21`	`"Francerz\\Http\\Utils\\": "src/utils",`
`21`	`22`	`"Francerz\\Http\\Utils\\Headers\\": "src/headers",`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,19 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+namespace Francerz\Http\Utils;`
	`4`	`+`
	`5`	`+use Francerz\Http\Utils\UriHelper;`
	`6`	`+`
	`7`	`+if (!function_exists('siteUrl')) {`
	`8`	`+ function siteUrl(?string $path = null, array $sapiVars = [])`
	`9`	`+ {`
	`10`	`+ return UriHelper::getSiteUrl($path, $sapiVars);`
	`11`	`+ }`
	`12`	`+}`
	`13`	`+`
	`14`	`+if (!function_exists('baseUrl')) {`
	`15`	`+ function baseUrl(?string $path = null, array $sapiVars = [])`
	`16`	`+ {`
	`17`	`+ return UriHelper::getBaseUrl($path, $sapiVars);`
	`18`	`+ }`
	`19`	`+}`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`	`use Francerz\Http\Utils\UriHelper;`
`4`	`4`	`use PHPUnit\Framework\TestCase;`
`5`	`5`
	`6`	`+use function Francerz\Http\Utils\baseUrl;`
	`7`	`+use function Francerz\Http\Utils\siteUrl;`
	`8`	`+`
`6`	`9`	`class UriHelperTest extends TestCase`
`7`	`10`	`{`
`8`	`11`	`private static function callPrivateStatic($obj, string $method, ...$args)`
`@@ -55,7 +58,7 @@ public function testGetBaseUrl()`
`55`	`58`	`{`
`56`	`59`	`$this->assertEquals(`
`57`	`60`	`'http://localhost/assets/css/style.css',`
`58`		`- UriHelper::getBaseUrl('/assets/css/style.css', [`
	`61`	`+ baseUrl('/assets/css/style.css', [`
`59`	`62`	`'HTTP_HOST' => 'localhost',`
`60`	`63`	`'SCRIPT_NAME' => '/index.php'`
`61`	`64`	`])`
`@@ -100,7 +103,7 @@ public function testGetSiteUrl()`
`100`	`103`	`{`
`101`	`104`	`$this->assertEquals(`
`102`	`105`	`'https://localhost:3000/public/index.php/some/path',`
`103`		`- UriHelper::getSiteUrl('/some/path', [`
	`106`	`+ siteUrl('/some/path', [`
`104`	`107`	`'HTTPS' => 'on',`
`105`	`108`	`'SERVER_NAME' => 'localhost',`
`106`	`109`	`'SERVER_PORT' => 3000,`

Comments

(0)