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

Commit

Permalink
Apply changes to comply with CodeReview
Browse files Browse the repository at this point in the history
This modifies the copyright-date, adds some spaces before and after the
arrow, replaces double quotes with single quotes and modifies a function
docBlock.
  • Loading branch information
heiglandreas authored and michalbundyra committed Jul 11, 2019
1 parent e383d13 commit dd593d0
Showing 1 changed file with 36 additions and 32 deletions.
68 changes: 36 additions & 32 deletions test/functions/MarshalUriFromSapiTest.php
@@ -1,7 +1,7 @@
<?php
/**
* @see https://github.com/zendframework/zend-diactoros for the canonical source repository
* @copyright Copyright (c) 2018 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2019 Zend Technologies USA Inc. (http://www.zend.com)
* @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
*/

Expand All @@ -12,43 +12,47 @@

class MarshalUriFromSapiTest extends TestCase
{
/** @dataProvider returnsUrlWithCorrectHttpSchemeFromArraysProvider */
/**
* @param string $httpsValue
* @param string $expectedScheme
* @dataProvider returnsUrlWithCorrectHttpSchemeFromArraysProvider
*/
public function testReturnsUrlWithCorrectHttpSchemeFromArrays(string $httpsValue, string $expectedScheme) : void
{
$server = [
"HTTPS" => $httpsValue,
"SERVER_NAME"=> "localhost",
"SERVER_PORT"=>"80",
"SERVER_ADDR"=> "172.22.0.4",
"REMOTE_PORT"=> "36852",
"REMOTE_ADDR" => "172.22.0.1",
"SERVER_SOFTWARE" => "nginx/1.11.8",
"GATEWAY_INTERFACE" => "CGI/1.1",
"SERVER_PROTOCOL" => "HTTP/1.1",
"DOCUMENT_ROOT" => "/var/www/public",
"DOCUMENT_URI" => "/index.php",
"REQUEST_URI" => "/api/messagebox-schema",
"PATH_TRANSLATED" => "/var/www/public",
"PATH_INFO" => "",
"SCRIPT_NAME" => "/index.php",
"CONTENT_LENGTH" => "",
"CONTENT_TYPE" => "",
"REQUEST_METHOD" => "GET",
"QUERY_STRING" => "",
"SCRIPT_FILENAME" => "/var/www/public/index.php",
"FCGI_ROLE" => "RESPONDER",
"PHP_SELF" => "/index.php",
'HTTPS' => $httpsValue,
'SERVER_NAME' => 'localhost',
'SERVER_PORT'=>'80',
'SERVER_ADDR' => '172.22.0.4',
'REMOTE_PORT' => '36852',
'REMOTE_ADDR' => '172.22.0.1',
'SERVER_SOFTWARE' => 'nginx/1.11.8',
'GATEWAY_INTERFACE' => 'CGI/1.1',
'SERVER_PROTOCOL' => 'HTTP/1.1',
'DOCUMENT_ROOT' => '/var/www/public',
'DOCUMENT_URI' => '/index.php',
'REQUEST_URI' => '/api/messagebox-schema',
'PATH_TRANSLATED' => '/var/www/public',
'PATH_INFO' => '',
'SCRIPT_NAME' => '/index.php',
'CONTENT_LENGTH' => '',
'CONTENT_TYPE' => '',
'REQUEST_METHOD' => 'GET',
'QUERY_STRING' => '',
'SCRIPT_FILENAME' => '/var/www/public/index.php',
'FCGI_ROLE' => 'RESPONDER',
'PHP_SELF' => '/index.php',
];

$headers = [
"HTTP_COOKIE" => '',
"HTTP_ACCEPT_LANGUAGE" => "de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7",
"HTTP_ACCEPT_ENCODING" => "gzip, deflate, br",
"HTTP_REFERER" => "http://localhost:8080/index.html",
"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",
"HTTP_ACCEPT" => "application/json,*/*",
"HTTP_CONNECTION" => "keep-alive",
"HTTP_HOST" => "localhost:8080",
'HTTP_COOKIE' => '',
'HTTP_ACCEPT_LANGUAGE' => 'de-DE,de;q=0.9,en-US;q=0.8,en;q=0.7',
'HTTP_ACCEPT_ENCODING' => 'gzip, deflate, br',
'HTTP_REFERER' => 'http://localhost:8080/index.html',
'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',
'HTTP_ACCEPT' => 'application/json,*/*',
'HTTP_CONNECTION' => 'keep-alive',
'HTTP_HOST' => 'localhost:8080',
];

$url = marshalUriFromSapi($server, $headers);
Expand Down

0 comments on commit dd593d0

Please sign in to comment.