Commit dc440e5

committed

FIX UriHelper::buildStringFromParts single slash when path and scheme exists but empty authority

1 parent 2feff9e commit dc440e5Copy full SHA for dc440e5

File tree

1 file changed

+20

-7

lines changed

src/utils
- UriHelper.php

1 file changed

+20

-7

lines changed

`‎src/utils/UriHelper.php‎`

Lines changed: 20 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -210,14 +210,9 @@ public static function getPathInfo(?string $requestUri = null, ?string $scriptNa`
`210`	`210`	`return '/' . ltrim($pathInfo, '/');`
`211`	`211`	`}`
`212`	`212`
`213`		`- public static function buildStringFromParts(array $uriParts): string`
	`213`	`+ private static function buildAuthorityStringFromParts(array $uriParts): string`
`214`	`214`	`{`
`215`		`- $scheme = '';`
`216`		`- $join = [];`
`217`		`- if (!empty($uriParts['scheme'])) {`
`218`		`- $join[] = $scheme = $uriParts['scheme'];`
`219`		`- $join[] = '://';`
`220`		`- }`
	`215`	`+ $scheme = $uriParts['scheme'];`
`221`	`216`	`if (!empty($uriParts['user'])) {`
`222`	`217`	`$join[] = $uriParts['user'];`
`223`	`218`	`if (!empty($uriParts['pass'])) {`
`@@ -235,6 +230,24 @@ public static function buildStringFromParts(array $uriParts): string`
`235`	`230`	`$join[] = ":{$port}";`
`236`	`231`	`}`
`237`	`232`	`}`
	`233`	`+ return join('', $join);`
	`234`	`+ }`
	`235`	`+`
	`236`	`+ public static function buildStringFromParts(array $uriParts): string`
	`237`	`+ {`
	`238`	`+ $scheme = '';`
	`239`	`+ $join = [];`
	`240`	`+ if (!empty($uriParts['scheme'])) {`
	`241`	`+ $join[] = $scheme = $uriParts['scheme'];`
	`242`	`+ $join[] = ':';`
	`243`	`+ }`
	`244`	`+ $authority = static::buildAuthorityStringFromParts($uriParts);`
	`245`	`+ if (!empty($authority)) {`
	`246`	`+ if (!empty($scheme)) {`
	`247`	`+ $join[] = '//';`
	`248`	`+ }`
	`249`	`+ $join[] = $authority;`
	`250`	`+ }`
`238`	`251`	`if (!empty($uriParts['path'])) {`
`239`	`252`	`if (count($join)) {`
`240`	`253`	`$join[] = '/';`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit dc440e5

File tree

1 file changed

1 file changed

`‎src/utils/UriHelper.php‎`

0 commit comments