opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
web/vendor/symfony/psr-http-message-bridge/Factory
HttpFoundationFactory.php

27
web/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php vendored
View file

@ -14,6 +14,7 @@ namespace Symfony\Bridge\PsrHttpMessage\Factory;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\UploadedFileInterface;
use Psr\Http\Message\UriInterface;
use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\File\UploadedFile;
@ -32,6 +33,20 @@ class HttpFoundationFactory implements HttpFoundationFactoryInterface
*/
public function createRequest(ServerRequestInterface $psrRequest)
{
$server = array();
$uri = $psrRequest->getUri();
if ($uri instanceof UriInterface) {
$server['SERVER_NAME'] = $uri->getHost();
$server['SERVER_PORT'] = $uri->getPort();
$server['REQUEST_URI'] = $uri->getPath();
$server['QUERY_STRING'] = $uri->getQuery();
}
$server['REQUEST_METHOD'] = $psrRequest->getMethod();
$server = array_replace($server, $psrRequest->getServerParams());
$parsedBody = $psrRequest->getParsedBody();
$parsedBody = is_array($parsedBody) ? $parsedBody : array();
@ -41,7 +56,7 @@ class HttpFoundationFactory implements HttpFoundationFactoryInterface
$psrRequest->getAttributes(),
$psrRequest->getCookieParams(),
$this->getFiles($psrRequest->getUploadedFiles()),
$psrRequest->getServerParams(),
$server,
$psrRequest->getBody()->__toString()
);
$request->headers->replace($psrRequest->getHeaders());
@ -80,10 +95,14 @@ class HttpFoundationFactory implements HttpFoundationFactoryInterface
*/
private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
{
$temporaryPath = $this->getTemporaryPath();
$psrUploadedFile->moveTo($temporaryPath);
$temporaryPath = '';
$clientFileName = '';
if (UPLOAD_ERR_NO_FILE !== $psrUploadedFile->getError()) {
$temporaryPath = $this->getTemporaryPath();
$psrUploadedFile->moveTo($temporaryPath);
$clientFileName = $psrUploadedFile->getClientFilename();
$clientFileName = $psrUploadedFile->getClientFilename();
}
return new UploadedFile(
$temporaryPath,