default services conflit ?
This commit is contained in:
armansansd
@@ -0,0 +1,248 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Bridge\PsrHttpMessage\Factory;
|
||||
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Psr\Http\Message\StreamInterface;
|
||||
use Psr\Http\Message\UploadedFileInterface;
|
||||
use Psr\Http\Message\UriInterface;
|
||||
use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
|
||||
use Symfony\Component\HttpFoundation\Cookie;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*
|
||||
* @author Kévin Dunglas <dunglas@gmail.com>
|
||||
*/
|
||||
class HttpFoundationFactory implements HttpFoundationFactoryInterface
|
||||
{
|
||||
/**
|
||||
* @var int The maximum output buffering size for each iteration when sending the response
|
||||
*/
|
||||
private $responseBufferMaxLength;
|
||||
|
||||
public function __construct(int $responseBufferMaxLength = 16372)
|
||||
{
|
||||
$this->responseBufferMaxLength = $responseBufferMaxLength;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function createRequest(ServerRequestInterface $psrRequest, bool $streamed = false)
|
||||
{
|
||||
$server = [];
|
||||
$uri = $psrRequest->getUri();
|
||||
|
||||
if ($uri instanceof UriInterface) {
|
||||
$server['SERVER_NAME'] = $uri->getHost();
|
||||
$server['SERVER_PORT'] = $uri->getPort() ?: ('https' === $uri->getScheme() ? 443 : 80);
|
||||
$server['REQUEST_URI'] = $uri->getPath();
|
||||
$server['QUERY_STRING'] = $uri->getQuery();
|
||||
|
||||
if ('' !== $server['QUERY_STRING']) {
|
||||
$server['REQUEST_URI'] .= '?'.$server['QUERY_STRING'];
|
||||
}
|
||||
|
||||
if ('https' === $uri->getScheme()) {
|
||||
$server['HTTPS'] = 'on';
|
||||
}
|
||||
}
|
||||
|
||||
$server['REQUEST_METHOD'] = $psrRequest->getMethod();
|
||||
|
||||
$server = array_replace($psrRequest->getServerParams(), $server);
|
||||
|
||||
$parsedBody = $psrRequest->getParsedBody();
|
||||
$parsedBody = \is_array($parsedBody) ? $parsedBody : [];
|
||||
|
||||
$request = new Request(
|
||||
$psrRequest->getQueryParams(),
|
||||
$parsedBody,
|
||||
$psrRequest->getAttributes(),
|
||||
$psrRequest->getCookieParams(),
|
||||
$this->getFiles($psrRequest->getUploadedFiles()),
|
||||
$server,
|
||||
$streamed ? $psrRequest->getBody()->detach() : $psrRequest->getBody()->__toString()
|
||||
);
|
||||
$request->headers->add($psrRequest->getHeaders());
|
||||
|
||||
return $request;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts to the input array to $_FILES structure.
|
||||
*/
|
||||
private function getFiles(array $uploadedFiles): array
|
||||
{
|
||||
$files = [];
|
||||
|
||||
foreach ($uploadedFiles as $key => $value) {
|
||||
if ($value instanceof UploadedFileInterface) {
|
||||
$files[$key] = $this->createUploadedFile($value);
|
||||
} else {
|
||||
$files[$key] = $this->getFiles($value);
|
||||
}
|
||||
}
|
||||
|
||||
return $files;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates Symfony UploadedFile instance from PSR-7 ones.
|
||||
*/
|
||||
private function createUploadedFile(UploadedFileInterface $psrUploadedFile): UploadedFile
|
||||
{
|
||||
return new UploadedFile($psrUploadedFile, function () { return $this->getTemporaryPath(); });
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a temporary file path.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function getTemporaryPath()
|
||||
{
|
||||
return tempnam(sys_get_temp_dir(), uniqid('symfony', true));
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function createResponse(ResponseInterface $psrResponse, bool $streamed = false)
|
||||
{
|
||||
$cookies = $psrResponse->getHeader('Set-Cookie');
|
||||
$psrResponse = $psrResponse->withoutHeader('Set-Cookie');
|
||||
|
||||
if ($streamed) {
|
||||
$response = new StreamedResponse(
|
||||
$this->createStreamedResponseCallback($psrResponse->getBody()),
|
||||
$psrResponse->getStatusCode(),
|
||||
$psrResponse->getHeaders()
|
||||
);
|
||||
} else {
|
||||
$response = new Response(
|
||||
$psrResponse->getBody()->__toString(),
|
||||
$psrResponse->getStatusCode(),
|
||||
$psrResponse->getHeaders()
|
||||
);
|
||||
}
|
||||
|
||||
$response->setProtocolVersion($psrResponse->getProtocolVersion());
|
||||
|
||||
foreach ($cookies as $cookie) {
|
||||
$response->headers->setCookie($this->createCookie($cookie));
|
||||
}
|
||||
|
||||
return $response;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a Cookie instance from a cookie string.
|
||||
*
|
||||
* Some snippets have been taken from the Guzzle project: https://github.com/guzzle/guzzle/blob/5.3/src/Cookie/SetCookie.php#L34
|
||||
*
|
||||
* @throws \InvalidArgumentException
|
||||
*/
|
||||
private function createCookie(string $cookie): Cookie
|
||||
{
|
||||
foreach (explode(';', $cookie) as $part) {
|
||||
$part = trim($part);
|
||||
|
||||
$data = explode('=', $part, 2);
|
||||
$name = $data[0];
|
||||
$value = isset($data[1]) ? trim($data[1], " \n\r\t\0\x0B\"") : null;
|
||||
|
||||
if (!isset($cookieName)) {
|
||||
$cookieName = $name;
|
||||
$cookieValue = $value;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ('expires' === strtolower($name) && null !== $value) {
|
||||
$cookieExpire = new \DateTime($value);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ('path' === strtolower($name) && null !== $value) {
|
||||
$cookiePath = $value;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ('domain' === strtolower($name) && null !== $value) {
|
||||
$cookieDomain = $value;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ('secure' === strtolower($name)) {
|
||||
$cookieSecure = true;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ('httponly' === strtolower($name)) {
|
||||
$cookieHttpOnly = true;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if ('samesite' === strtolower($name) && null !== $value) {
|
||||
$samesite = $value;
|
||||
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($cookieName)) {
|
||||
throw new \InvalidArgumentException('The value of the Set-Cookie header is malformed.');
|
||||
}
|
||||
|
||||
return new Cookie(
|
||||
$cookieName,
|
||||
$cookieValue,
|
||||
isset($cookieExpire) ? $cookieExpire : 0,
|
||||
isset($cookiePath) ? $cookiePath : '/',
|
||||
isset($cookieDomain) ? $cookieDomain : null,
|
||||
isset($cookieSecure),
|
||||
isset($cookieHttpOnly),
|
||||
true,
|
||||
isset($samesite) ? $samesite : null
|
||||
);
|
||||
}
|
||||
|
||||
private function createStreamedResponseCallback(StreamInterface $body): callable
|
||||
{
|
||||
return function () use ($body) {
|
||||
if ($body->isSeekable()) {
|
||||
$body->rewind();
|
||||
}
|
||||
|
||||
if (!$body->isReadable()) {
|
||||
echo $body;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
while (!$body->eof()) {
|
||||
echo $body->read($this->responseBufferMaxLength);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,171 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Bridge\PsrHttpMessage\Factory;
|
||||
|
||||
use Psr\Http\Message\ResponseFactoryInterface;
|
||||
use Psr\Http\Message\ServerRequestFactoryInterface;
|
||||
use Psr\Http\Message\StreamFactoryInterface;
|
||||
use Psr\Http\Message\UploadedFileFactoryInterface;
|
||||
use Psr\Http\Message\UploadedFileInterface;
|
||||
use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
|
||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
use Symfony\Component\HttpFoundation\File\UploadedFile;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
||||
/**
|
||||
* Builds Psr\HttpMessage instances using a PSR-17 implementation.
|
||||
*
|
||||
* @author Antonio J. García Lagar <aj@garcialagar.es>
|
||||
*/
|
||||
class PsrHttpFactory implements HttpMessageFactoryInterface
|
||||
{
|
||||
private $serverRequestFactory;
|
||||
private $streamFactory;
|
||||
private $uploadedFileFactory;
|
||||
private $responseFactory;
|
||||
|
||||
public function __construct(ServerRequestFactoryInterface $serverRequestFactory, StreamFactoryInterface $streamFactory, UploadedFileFactoryInterface $uploadedFileFactory, ResponseFactoryInterface $responseFactory)
|
||||
{
|
||||
$this->serverRequestFactory = $serverRequestFactory;
|
||||
$this->streamFactory = $streamFactory;
|
||||
$this->uploadedFileFactory = $uploadedFileFactory;
|
||||
$this->responseFactory = $responseFactory;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function createRequest(Request $symfonyRequest)
|
||||
{
|
||||
$uri = $symfonyRequest->server->get('QUERY_STRING', '');
|
||||
$uri = $symfonyRequest->getSchemeAndHttpHost().$symfonyRequest->getBaseUrl().$symfonyRequest->getPathInfo().('' !== $uri ? '?'.$uri : '');
|
||||
|
||||
$request = $this->serverRequestFactory->createServerRequest(
|
||||
$symfonyRequest->getMethod(),
|
||||
$uri,
|
||||
$symfonyRequest->server->all()
|
||||
);
|
||||
|
||||
foreach ($symfonyRequest->headers->all() as $name => $value) {
|
||||
$request = $request->withHeader($name, $value);
|
||||
}
|
||||
|
||||
$body = $this->streamFactory->createStreamFromResource($symfonyRequest->getContent(true));
|
||||
|
||||
$request = $request
|
||||
->withBody($body)
|
||||
->withUploadedFiles($this->getFiles($symfonyRequest->files->all()))
|
||||
->withCookieParams($symfonyRequest->cookies->all())
|
||||
->withQueryParams($symfonyRequest->query->all())
|
||||
->withParsedBody($symfonyRequest->request->all())
|
||||
;
|
||||
|
||||
foreach ($symfonyRequest->attributes->all() as $key => $value) {
|
||||
$request = $request->withAttribute($key, $value);
|
||||
}
|
||||
|
||||
return $request;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts Symfony uploaded files array to the PSR one.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
private function getFiles(array $uploadedFiles)
|
||||
{
|
||||
$files = [];
|
||||
|
||||
foreach ($uploadedFiles as $key => $value) {
|
||||
if (null === $value) {
|
||||
$files[$key] = $this->uploadedFileFactory->createUploadedFile($this->streamFactory->createStream(), 0, \UPLOAD_ERR_NO_FILE);
|
||||
continue;
|
||||
}
|
||||
if ($value instanceof UploadedFile) {
|
||||
$files[$key] = $this->createUploadedFile($value);
|
||||
} else {
|
||||
$files[$key] = $this->getFiles($value);
|
||||
}
|
||||
}
|
||||
|
||||
return $files;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a PSR-7 UploadedFile instance from a Symfony one.
|
||||
*
|
||||
* @return UploadedFileInterface
|
||||
*/
|
||||
private function createUploadedFile(UploadedFile $symfonyUploadedFile)
|
||||
{
|
||||
return $this->uploadedFileFactory->createUploadedFile(
|
||||
$this->streamFactory->createStreamFromFile(
|
||||
$symfonyUploadedFile->getRealPath()
|
||||
),
|
||||
(int) $symfonyUploadedFile->getSize(),
|
||||
$symfonyUploadedFile->getError(),
|
||||
$symfonyUploadedFile->getClientOriginalName(),
|
||||
$symfonyUploadedFile->getClientMimeType()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function createResponse(Response $symfonyResponse)
|
||||
{
|
||||
$response = $this->responseFactory->createResponse($symfonyResponse->getStatusCode(), Response::$statusTexts[$symfonyResponse->getStatusCode()] ?? '');
|
||||
|
||||
if ($symfonyResponse instanceof BinaryFileResponse && !$symfonyResponse->headers->has('Content-Range')) {
|
||||
$stream = $this->streamFactory->createStreamFromFile(
|
||||
$symfonyResponse->getFile()->getPathname()
|
||||
);
|
||||
} else {
|
||||
$stream = $this->streamFactory->createStreamFromFile('php://temp', 'wb+');
|
||||
if ($symfonyResponse instanceof StreamedResponse || $symfonyResponse instanceof BinaryFileResponse) {
|
||||
ob_start(function ($buffer) use ($stream) {
|
||||
$stream->write($buffer);
|
||||
|
||||
return '';
|
||||
});
|
||||
|
||||
$symfonyResponse->sendContent();
|
||||
ob_end_clean();
|
||||
} else {
|
||||
$stream->write($symfonyResponse->getContent());
|
||||
}
|
||||
}
|
||||
|
||||
$response = $response->withBody($stream);
|
||||
|
||||
$headers = $symfonyResponse->headers->all();
|
||||
$cookies = $symfonyResponse->headers->getCookies();
|
||||
if (!empty($cookies)) {
|
||||
$headers['Set-Cookie'] = [];
|
||||
|
||||
foreach ($cookies as $cookie) {
|
||||
$headers['Set-Cookie'][] = $cookie->__toString();
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($headers as $name => $value) {
|
||||
$response = $response->withHeader($name, $value);
|
||||
}
|
||||
|
||||
$protocolVersion = $symfonyResponse->getProtocolVersion();
|
||||
$response = $response->withProtocolVersion($protocolVersion);
|
||||
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Bridge\PsrHttpMessage\Factory;
|
||||
|
||||
use Psr\Http\Message\UploadedFileInterface;
|
||||
use Symfony\Component\HttpFoundation\File\Exception\FileException;
|
||||
use Symfony\Component\HttpFoundation\File\File;
|
||||
use Symfony\Component\HttpFoundation\File\UploadedFile as BaseUploadedFile;
|
||||
|
||||
/**
|
||||
* @author Nicolas Grekas <p@tchwork.com>
|
||||
*/
|
||||
class UploadedFile extends BaseUploadedFile
|
||||
{
|
||||
private $psrUploadedFile;
|
||||
private $test = false;
|
||||
|
||||
public function __construct(UploadedFileInterface $psrUploadedFile, callable $getTemporaryPath)
|
||||
{
|
||||
$error = $psrUploadedFile->getError();
|
||||
$path = '';
|
||||
|
||||
if (\UPLOAD_ERR_NO_FILE !== $error) {
|
||||
$path = $psrUploadedFile->getStream()->getMetadata('uri') ?? '';
|
||||
|
||||
if ($this->test = !\is_string($path) || !is_uploaded_file($path)) {
|
||||
$path = $getTemporaryPath();
|
||||
$psrUploadedFile->moveTo($path);
|
||||
}
|
||||
}
|
||||
|
||||
parent::__construct(
|
||||
$path,
|
||||
(string) $psrUploadedFile->getClientFilename(),
|
||||
$psrUploadedFile->getClientMediaType(),
|
||||
$psrUploadedFile->getError(),
|
||||
$this->test
|
||||
);
|
||||
|
||||
$this->psrUploadedFile = $psrUploadedFile;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function move($directory, $name = null): File
|
||||
{
|
||||
if (!$this->isValid() || $this->test) {
|
||||
return parent::move($directory, $name);
|
||||
}
|
||||
|
||||
$target = $this->getTargetFile($directory, $name);
|
||||
|
||||
try {
|
||||
$this->psrUploadedFile->moveTo($target);
|
||||
} catch (\RuntimeException $e) {
|
||||
throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, $e->getMessage()), 0, $e);
|
||||
}
|
||||
|
||||
@chmod($target, 0666 & ~umask());
|
||||
|
||||
return $target;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user