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

Commit dd593d0

Browse files
heiglandreasmichalbundyra
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 e383d13 commit dd593d0

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

@@ -12,43 +12,47 @@
1212

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

4347
$headers = [
44-
"HTTP_COOKIE" => '',
45-
"HTTP_ACCEPT_LANGUAGE" => "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7",
46-
"HTTP_ACCEPT_ENCODING" => "gzip, deflate, br",
47-
"HTTP_REFERER" => "http://localhost:8080/index.html",
48-
"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",
49-
"HTTP_ACCEPT" => "application/json,*/*",
50-
"HTTP_CONNECTION" => "keep-alive",
51-
"HTTP_HOST" => "localhost:8080",
48+
'HTTP_COOKIE' => '',
49+
'HTTP_ACCEPT_LANGUAGE' => 'de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7',
50+
'HTTP_ACCEPT_ENCODING' => 'gzip, deflate, br',
51+
'HTTP_REFERER' => 'http://localhost:8080/index.html',
52+
'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',
53+
'HTTP_ACCEPT' => 'application/json,*/*',
54+
'HTTP_CONNECTION' => 'keep-alive',
55+
'HTTP_HOST' => 'localhost:8080',
5256
];
5357

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

0 commit comments

Comments
 (0)