Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit 8d5aca5

Browse files
heiglandreasweierophinney
authored andcommitted
Apply changes to comply with CodeReview
This modifies the copyright-date, adds some spaces before and after the arrow, replaces double quotes with single quotes and modifies a function docBlock.
1 parent 46dbee3 commit 8d5aca5

File tree

1 file changed

+36
-32
lines changed

1 file changed

+36
-32
lines changed

test/functions/MarshalUriFromSapiTest.php

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @see https://github.com/zendframework/zend-diactoros for the canonical source repository
4-
* @copyright Copyright (c) 2018 Zend Technologies USA Inc. (http://www.zend.com)
4+
* @copyright Copyright (c) 2019 Zend Technologies USA Inc. (http://www.zend.com)
55
* @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
66
*/
77

@@ -14,43 +14,47 @@
1414

1515
class MarshalUriFromSapiTest extends TestCase
1616
{
17-
/** @dataProvider returnsUrlWithCorrectHttpSchemeFromArraysProvider */
17+
/**
18+
* @param string $httpsValue
19+
* @param string $expectedScheme
20+
* @dataProvider returnsUrlWithCorrectHttpSchemeFromArraysProvider
21+
*/
1822
public function testReturnsUrlWithCorrectHttpSchemeFromArrays(string $httpsValue, string $expectedScheme) : void
1923
{
2024
$server = [
21-
"HTTPS" => $httpsValue,
22-
"SERVER_NAME"=> "localhost",
23-
"SERVER_PORT"=>"80",
24-
"SERVER_ADDR"=> "172.22.0.4",
25-
"REMOTE_PORT"=> "36852",
26-
"REMOTE_ADDR" => "172.22.0.1",
27-
"SERVER_SOFTWARE" => "nginx/1.11.8",
28-
"GATEWAY_INTERFACE" => "CGI/1.1",
29-
"SERVER_PROTOCOL" => "HTTP/1.1",
30-
"DOCUMENT_ROOT" => "/var/www/public",
31-
"DOCUMENT_URI" => "/index.php",
32-
"REQUEST_URI" => "/api/messagebox-schema",
33-
"PATH_TRANSLATED" => "/var/www/public",
34-
"PATH_INFO" => "",
35-
"SCRIPT_NAME" => "/index.php",
36-
"CONTENT_LENGTH" => "",
37-
"CONTENT_TYPE" => "",
38-
"REQUEST_METHOD" => "GET",
39-
"QUERY_STRING" => "",
40-
"SCRIPT_FILENAME" => "/var/www/public/index.php",
41-
"FCGI_ROLE" => "RESPONDER",
42-
"PHP_SELF" => "/index.php",
25+
'HTTPS' => $httpsValue,
26+
'SERVER_NAME' => 'localhost',
27+
'SERVER_PORT'=>'80',
28+
'SERVER_ADDR' => '172.22.0.4',
29+
'REMOTE_PORT' => '36852',
30+
'REMOTE_ADDR' => '172.22.0.1',
31+
'SERVER_SOFTWARE' => 'nginx/1.11.8',
32+
'GATEWAY_INTERFACE' => 'CGI/1.1',
33+
'SERVER_PROTOCOL' => 'HTTP/1.1',
34+
'DOCUMENT_ROOT' => '/var/www/public',
35+
'DOCUMENT_URI' => '/index.php',
36+
'REQUEST_URI' => '/api/messagebox-schema',
37+
'PATH_TRANSLATED' => '/var/www/public',
38+
'PATH_INFO' => '',
39+
'SCRIPT_NAME' => '/index.php',
40+
'CONTENT_LENGTH' => '',
41+
'CONTENT_TYPE' => '',
42+
'REQUEST_METHOD' => 'GET',
43+
'QUERY_STRING' => '',
44+
'SCRIPT_FILENAME' => '/var/www/public/index.php',
45+
'FCGI_ROLE' => 'RESPONDER',
46+
'PHP_SELF' => '/index.php',
4347
];
4448

4549
$headers = [
46-
"HTTP_COOKIE" => '',
47-
"HTTP_ACCEPT_LANGUAGE" => "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7",
48-
"HTTP_ACCEPT_ENCODING" => "gzip, deflate, br",
49-
"HTTP_REFERER" => "http://localhost:8080/index.html",
50-
"HTTP_USER_AGENT" => "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/67.0.3396.99 Chrome/67.0.3396.99 Safari/537.36",
51-
"HTTP_ACCEPT" => "application/json,*/*",
52-
"HTTP_CONNECTION" => "keep-alive",
53-
"HTTP_HOST" => "localhost:8080",
50+
'HTTP_COOKIE' => '',
51+
'HTTP_ACCEPT_LANGUAGE' => 'de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7',
52+
'HTTP_ACCEPT_ENCODING' => 'gzip, deflate, br',
53+
'HTTP_REFERER' => 'http://localhost:8080/index.html',
54+
'HTTP_USER_AGENT' => 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/67.0.3396.99 Chrome/67.0.3396.99 Safari/537.36',
55+
'HTTP_ACCEPT' => 'application/json,*/*',
56+
'HTTP_CONNECTION' => 'keep-alive',
57+
'HTTP_HOST' => 'localhost:8080',
5458
];
5559

5660
$url = marshalUriFromSapi($server, $headers);

0 commit comments

Comments
 (0)