Skip to content

Commit cc67247

Browse files
committed
Remove support for by-reference server
1 parent c13b209 commit cc67247

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/ProxyAwareSchemer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ class ProxyAwareSchemer {
4040
*/
4141
public function __construct(
4242
?array $proxyServerValues = null,
43-
?array &$server = null
43+
?array $server = null
4444
) {
4545
$this->proxyServerValues = $proxyServerValues ?? self::HTTPS_EXPECTED_SERVER_VALUES;
4646

4747
if( is_array($server) ) {
48-
$this->server =& $server;
48+
$this->server = $server;
4949
} else {
50-
$this->server =& $_SERVER;
50+
$this->server = $_SERVER;
5151
}
5252
}
5353

test/ProxyAwareSchemerTest.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ class ProxyAwareSchemerTest extends TestCase {
1414
public function test_withDetectedScheme_https( string $key, string $value ) : void {
1515
$request = new ServerRequest('GET', 'http://localhost');
1616

17-
$server = [$key => $value];
17+
$server = [ $key => $value ];
1818
$schemerManuallyPassed = new ProxyAwareSchemer(null, $server);
1919
$this->assertSame('https', $schemerManuallyPassed->withUriWithDetectedScheme($request)->getUri()->getScheme());
2020

21-
$schemerPre = new ProxyAwareSchemer;
2221
$_SERVER = [ $key => $value ];
2322
$schemerPost = new ProxyAwareSchemer;
2423

25-
$this->assertSame('https', $schemerPre->withUriWithDetectedScheme($request)->getUri()->getScheme());
2624
$this->assertSame('https', $schemerPost->withUriWithDetectedScheme($request)->getUri()->getScheme());
2725
}
2826

@@ -33,11 +31,9 @@ public function test_withDetectedScheme_http() : void {
3331
$schemerManuallyPassed = new ProxyAwareSchemer(null, $server);
3432
$this->assertSame('http', $schemerManuallyPassed->withUriWithDetectedScheme($request)->getUri()->getScheme());
3533

36-
$schemerPre = new ProxyAwareSchemer;
3734
$_SERVER = [];
3835
$schemerPost = new ProxyAwareSchemer;
3936

40-
$this->assertSame('http', $schemerPre->withUriWithDetectedScheme($request)->getUri()->getScheme());
4137
$this->assertSame('http', $schemerPost->withUriWithDetectedScheme($request)->getUri()->getScheme());
4238
}
4339

0 commit comments

Comments
 (0)