removal of unnecessary file, and composer update
This commit is contained in:
6
vendor/symfony/http-foundation/HeaderBag.php
vendored
6
vendor/symfony/http-foundation/HeaderBag.php
vendored
@@ -101,9 +101,9 @@ class HeaderBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Returns a header value by name.
|
||||
*
|
||||
* @param string $key The header name
|
||||
* @param string|string[]|null $default The default value
|
||||
* @param bool $first Whether to return the first value or all header values
|
||||
* @param string $key The header name
|
||||
* @param string|null $default The default value
|
||||
* @param bool $first Whether to return the first value or all header values
|
||||
*
|
||||
* @return string|string[]|null The first header value or default value if $first is true, an array of values otherwise
|
||||
*/
|
||||
|
||||
2
vendor/symfony/http-foundation/LICENSE
vendored
2
vendor/symfony/http-foundation/LICENSE
vendored
@@ -1,4 +1,4 @@
|
||||
Copyright (c) 2004-2018 Fabien Potencier
|
||||
Copyright (c) 2004-2019 Fabien Potencier
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
24
vendor/symfony/http-foundation/Request.php
vendored
24
vendor/symfony/http-foundation/Request.php
vendored
@@ -1699,15 +1699,23 @@ class Request
|
||||
} elseif ($this->server->has('REQUEST_URI')) {
|
||||
$requestUri = $this->server->get('REQUEST_URI');
|
||||
|
||||
// HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path, only use URL path
|
||||
$uriComponents = parse_url($requestUri);
|
||||
if ('' !== $requestUri && '/' === $requestUri[0]) {
|
||||
// To only use path and query remove the fragment.
|
||||
if (false !== $pos = strpos($requestUri, '#')) {
|
||||
$requestUri = substr($requestUri, 0, $pos);
|
||||
}
|
||||
} else {
|
||||
// HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path,
|
||||
// only use URL path.
|
||||
$uriComponents = parse_url($requestUri);
|
||||
|
||||
if (isset($uriComponents['path'])) {
|
||||
$requestUri = $uriComponents['path'];
|
||||
}
|
||||
if (isset($uriComponents['path'])) {
|
||||
$requestUri = $uriComponents['path'];
|
||||
}
|
||||
|
||||
if (isset($uriComponents['query'])) {
|
||||
$requestUri .= '?'.$uriComponents['query'];
|
||||
if (isset($uriComponents['query'])) {
|
||||
$requestUri .= '?'.$uriComponents['query'];
|
||||
}
|
||||
}
|
||||
} elseif ($this->server->has('ORIG_PATH_INFO')) {
|
||||
// IIS 5.0, PHP as CGI
|
||||
@@ -1908,7 +1916,7 @@ class Request
|
||||
private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
|
||||
{
|
||||
if (self::$requestFactory) {
|
||||
$request = \call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
|
||||
$request = (self::$requestFactory)($query, $request, $attributes, $cookies, $files, $server, $content);
|
||||
|
||||
if (!$request instanceof self) {
|
||||
throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
|
||||
|
||||
@@ -153,7 +153,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
if (null !== $this->emulateSameSite) {
|
||||
$originalCookie = SessionUtils::popSessionCookie(session_name(), session_id());
|
||||
if (null !== $originalCookie) {
|
||||
header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite));
|
||||
header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite), false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ class NativeSessionStorage implements SessionStorageInterface
|
||||
if (null !== $this->emulateSameSite) {
|
||||
$originalCookie = SessionUtils::popSessionCookie(session_name(), session_id());
|
||||
if (null !== $originalCookie) {
|
||||
header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite));
|
||||
header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite), false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ class StreamedResponse extends Response
|
||||
throw new \LogicException('The Response callback must not be null.');
|
||||
}
|
||||
|
||||
\call_user_func($this->callback);
|
||||
($this->callback)();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -283,6 +283,55 @@ class RequestTest extends TestCase
|
||||
$this->assertEquals('http://test.com/foo', $request->getUri());
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider getRequestUriData
|
||||
*/
|
||||
public function testGetRequestUri($serverRequestUri, $expected, $message)
|
||||
{
|
||||
$request = new Request();
|
||||
$request->server->add(array(
|
||||
'REQUEST_URI' => $serverRequestUri,
|
||||
|
||||
// For having http://test.com
|
||||
'SERVER_NAME' => 'test.com',
|
||||
'SERVER_PORT' => 80,
|
||||
));
|
||||
|
||||
$this->assertSame($expected, $request->getRequestUri(), $message);
|
||||
$this->assertSame($expected, $request->server->get('REQUEST_URI'), 'Normalize the request URI.');
|
||||
}
|
||||
|
||||
public function getRequestUriData()
|
||||
{
|
||||
$message = 'Do not modify the path.';
|
||||
yield array('/foo', '/foo', $message);
|
||||
yield array('//bar/foo', '//bar/foo', $message);
|
||||
yield array('///bar/foo', '///bar/foo', $message);
|
||||
|
||||
$message = 'Handle when the scheme, host are on REQUEST_URI.';
|
||||
yield array('http://test.com/foo?bar=baz', '/foo?bar=baz', $message);
|
||||
|
||||
$message = 'Handle when the scheme, host and port are on REQUEST_URI.';
|
||||
yield array('http://test.com:80/foo', '/foo', $message);
|
||||
yield array('https://test.com:8080/foo', '/foo', $message);
|
||||
yield array('https://test.com:443/foo', '/foo', $message);
|
||||
|
||||
$message = 'Fragment should not be included in the URI';
|
||||
yield array('http://test.com/foo#bar', '/foo', $message);
|
||||
yield array('/foo#bar', '/foo', $message);
|
||||
}
|
||||
|
||||
public function testGetRequestUriWithoutRequiredHeader()
|
||||
{
|
||||
$expected = '';
|
||||
|
||||
$request = new Request();
|
||||
|
||||
$message = 'Fallback to empty URI when headers are missing.';
|
||||
$this->assertSame($expected, $request->getRequestUri(), $message);
|
||||
$this->assertSame($expected, $request->server->get('REQUEST_URI'), 'Normalize the request URI.');
|
||||
}
|
||||
|
||||
public function testCreateCheckPrecedence()
|
||||
{
|
||||
// server is used by default
|
||||
|
||||
@@ -390,7 +390,7 @@ class MockPdo extends \PDO
|
||||
public function prepare($statement, $driverOptions = array())
|
||||
{
|
||||
return \is_callable($this->prepareResult)
|
||||
? \call_user_func($this->prepareResult, $statement, $driverOptions)
|
||||
? ($this->prepareResult)($statement, $driverOptions)
|
||||
: $this->prepareResult;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user