Skip to content
Snippets Groups Projects
Commit cca39b2b authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Fix PossiblyUndefinedArrayOffset (4x)

parent 5df25ae6
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,7 @@ use PHPUnit\Framework\TestCase; ...@@ -8,6 +8,7 @@ use PHPUnit\Framework\TestCase;
use SimpleSAML\Test\Utils\ClearStateTestCase; use SimpleSAML\Test\Utils\ClearStateTestCase;
use SimpleSAML\Utils\HTTP; use SimpleSAML\Utils\HTTP;
use SimpleSAML\Configuration; use SimpleSAML\Configuration;
use Webmozart\Assert\Assert;
class HTTPTest extends ClearStateTestCase class HTTPTest extends ClearStateTestCase
{ {
...@@ -19,10 +20,15 @@ class HTTPTest extends ClearStateTestCase ...@@ -19,10 +20,15 @@ class HTTPTest extends ClearStateTestCase
*/ */
private function setupEnvFromURL(string $url) private function setupEnvFromURL(string $url)
{ {
$addr = parse_url($url); $scheme = parse_url($url, PHP_URL_SCHEME);
$_SERVER['HTTP_HOST'] = $addr['host']; $host = parse_url($url, PHP_URL_HOST);
$_SERVER['SERVER_NAME'] = $addr['host']; $port = parse_url($url, PHP_URL_PORT);
if ($addr['scheme'] === 'https') { $path = parse_url($url, PHP_URL_PATH);
$query = parse_url($url, PHP_URL_QUERY);
$_SERVER['HTTP_HOST'] = $host;
$_SERVER['SERVER_NAME'] = $host;
if ($scheme === 'https') {
$_SERVER['HTTPS'] = 'on'; $_SERVER['HTTPS'] = 'on';
$default_port = '443'; $default_port = '443';
} else { } else {
...@@ -30,10 +36,10 @@ class HTTPTest extends ClearStateTestCase ...@@ -30,10 +36,10 @@ class HTTPTest extends ClearStateTestCase
$default_port = '80'; $default_port = '80';
} }
$_SERVER['SERVER_PORT'] = $default_port; $_SERVER['SERVER_PORT'] = $default_port;
if (isset($addr['port']) && strval($addr['port']) !== $default_port) { if (isset($port) && strval($port) !== $default_port) {
$_SERVER['SERVER_PORT'] = strval($addr['port']); $_SERVER['SERVER_PORT'] = strval($port);
} }
$_SERVER['REQUEST_URI'] = $addr['path'] . '?' . $addr['query']; $_SERVER['REQUEST_URI'] = $path . '?' . $query;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment