Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663

This commit is contained in:
Greg Anderson 2015-10-08 11:40:12 -07:00
parent eb34d130a8
commit f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions

View file

@ -0,0 +1,43 @@
language: php
sudo: false
matrix:
include:
- php: 5.3
- php: 5.4
- php: 5.5
- php: 5.6
- php: 5.3
env: deps=low
- php: 5.6
env: deps=high
- php: nightly
- php: hhvm
allow_failures:
- php: nightly
- php: hhvm
fast_finish: true
env:
global:
- deps=no
- SYMFONY_DEPRECATIONS_HELPER=weak
before_install:
- composer self-update
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
- if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then php -i; fi;
# Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
- if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
install:
- if [[ "$TRAVIS_PHP_VERSION" != "5.3" ]] && [[ "$TRAVIS_PHP_VERSION" != "5.4" ]]; then composer require --no-update zendframework/zend-diactoros; fi;
- if [ "$deps" = "no" ]; then export SYMFONY_DEPRECATIONS_HELPER=strict; fi;
- if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
- if [ "$deps" = "high" ]; then composer --prefer-source update; fi;
- if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest --prefer-stable update; fi;
script:
- phpunit

View file

@ -0,0 +1,7 @@
CHANGELOG
=========
2.8.0
-----
* added the component

View file

@ -0,0 +1,164 @@
<?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 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;
use Zend\Diactoros\Response as DiactorosResponse;
use Zend\Diactoros\ServerRequest;
use Zend\Diactoros\ServerRequestFactory as DiactorosRequestFactory;
use Zend\Diactoros\Stream as DiactorosStream;
use Zend\Diactoros\UploadedFile as DiactorosUploadedFile;
/**
* Builds Psr\HttpMessage instances using the Zend Diactoros implementation.
*
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class DiactorosFactory implements HttpMessageFactoryInterface
{
public function __construct()
{
if (!class_exists('Zend\Diactoros\ServerRequestFactory')) {
throw new \RuntimeException('Zend Diactoros must be installed to use the DiactorosFactory.');
}
}
/**
* {@inheritdoc}
*/
public function createRequest(Request $symfonyRequest)
{
$server = DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all());
$headers = $symfonyRequest->headers->all();
try {
$body = new DiactorosStream($symfonyRequest->getContent(true));
} catch (\LogicException $e) {
$body = new DiactorosStream('php://temp', 'wb+');
$body->write($symfonyRequest->getContent());
}
$request = new ServerRequest(
$server,
DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all())),
$symfonyRequest->getUri(),
$symfonyRequest->getMethod(),
$body,
$headers
);
$request = $request
->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.
*
* @param array $uploadedFiles
*
* @return array
*/
private function getFiles(array $uploadedFiles)
{
$files = array();
foreach ($uploadedFiles as $key => $value) {
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.
*
* @param UploadedFile $symfonyUploadedFile
*
* @return UploadedFileInterface
*/
private function createUploadedFile(UploadedFile $symfonyUploadedFile)
{
return new DiactorosUploadedFile(
$symfonyUploadedFile->getRealPath(),
$symfonyUploadedFile->getSize(),
$symfonyUploadedFile->getError(),
$symfonyUploadedFile->getClientOriginalName(),
$symfonyUploadedFile->getClientMimeType()
);
}
/**
* {@inheritdoc}
*/
public function createResponse(Response $symfonyResponse)
{
if ($symfonyResponse instanceof BinaryFileResponse) {
$stream = new DiactorosStream($symfonyResponse->getFile()->getPathname(), 'r');
} else {
$stream = new DiactorosStream('php://temp', 'wb+');
if ($symfonyResponse instanceof StreamedResponse) {
ob_start(function ($buffer) use ($stream) {
$stream->write($buffer);
return false;
});
$symfonyResponse->sendContent();
ob_end_clean();
} else {
$stream->write($symfonyResponse->getContent());
}
}
$headers = $symfonyResponse->headers->all();
$cookies = $symfonyResponse->headers->getCookies();
if (!empty($cookies)) {
$headers['Set-Cookie'] = array();
foreach ($cookies as $cookie) {
$headers['Set-Cookie'][] = $cookie->__toString();
}
}
$response = new DiactorosResponse(
$stream,
$symfonyResponse->getStatusCode(),
$headers
);
$protocolVersion = $symfonyResponse->getProtocolVersion();
if ('1.1' !== $protocolVersion) {
$response = $response->withProtocolVersion($protocolVersion);
}
return $response;
}
}

View file

@ -0,0 +1,199 @@
<?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\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\UploadedFileInterface;
use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
* {@inheritdoc}
*
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class HttpFoundationFactory implements HttpFoundationFactoryInterface
{
/**
* {@inheritdoc}
*/
public function createRequest(ServerRequestInterface $psrRequest)
{
$parsedBody = $psrRequest->getParsedBody();
$parsedBody = is_array($parsedBody) ? $parsedBody : array();
$request = new Request(
$psrRequest->getQueryParams(),
$parsedBody,
$psrRequest->getAttributes(),
$psrRequest->getCookieParams(),
$this->getFiles($psrRequest->getUploadedFiles()),
$psrRequest->getServerParams(),
$psrRequest->getBody()->__toString()
);
$request->headers->replace($psrRequest->getHeaders());
return $request;
}
/**
* Converts to the input array to $_FILES structure.
*
* @param array $uploadedFiles
*
* @return array
*/
private function getFiles(array $uploadedFiles)
{
$files = array();
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.
*
* @param UploadedFileInterface $psrUploadedFile
*
* @return UploadedFile
*/
private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
{
$temporaryPath = $this->getTemporaryPath();
$psrUploadedFile->moveTo($temporaryPath);
$clientFileName = $psrUploadedFile->getClientFilename();
return new UploadedFile(
$temporaryPath,
null === $clientFileName ? '' : $clientFileName,
$psrUploadedFile->getClientMediaType(),
$psrUploadedFile->getSize(),
$psrUploadedFile->getError(),
true
);
}
/**
* 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)
{
$response = new Response(
$psrResponse->getBody()->__toString(),
$psrResponse->getStatusCode(),
$psrResponse->getHeaders()
);
$response->setProtocolVersion($psrResponse->getProtocolVersion());
foreach ($psrResponse->getHeader('Set-Cookie') 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
*
* @param string $cookie
*
* @return Cookie
*
* @throws \InvalidArgumentException
*/
private function createCookie($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 (!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)
);
}
}

View file

@ -0,0 +1,43 @@
<?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;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
* Creates Symfony Request and Response instances from PSR-7 ones.
*
* @author Kévin Dunglas <dunglas@gmail.com>
*/
interface HttpFoundationFactoryInterface
{
/**
* Creates a Symfony Request instance from a PSR-7 one.
*
* @param ServerRequestInterface $psrRequest
*
* @return Request
*/
public function createRequest(ServerRequestInterface $psrRequest);
/**
* Creates a Symfony Response instance from a PSR-7 one.
*
* @param ResponseInterface $psrResponse
*
* @return Response
*/
public function createResponse(ResponseInterface $psrResponse);
}

View file

@ -0,0 +1,43 @@
<?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;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
* Creates PSR HTTP Request and Response instances from Symfony ones.
*
* @author Kévin Dunglas <dunglas@gmail.com>
*/
interface HttpMessageFactoryInterface
{
/**
* Creates a PSR-7 Request instance from a Symfony one.
*
* @param Request $symfonyRequest
*
* @return ServerRequestInterface
*/
public function createRequest(Request $symfonyRequest);
/**
* Creates a PSR-7 Response instance from a Symfony one.
*
* @param Response $symfonyResponse
*
* @return ResponseInterface
*/
public function createResponse(Response $symfonyResponse);
}

View file

@ -0,0 +1,19 @@
Copyright (c) 2004-2015 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
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

View file

@ -0,0 +1,14 @@
PSR-7 Bridge
============
Provides integration for PSR7.
Resources
---------
If you want to run the unit tests, install dev dependencies before
running PHPUnit:
$ cd path/to/Symfony/Bridge/PsrHttpMessage/
$ composer.phar install
$ phpunit

View file

@ -0,0 +1,164 @@
<?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\Tests\Factory;
use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
/**
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class DiactorosFactoryTest extends \PHPUnit_Framework_TestCase
{
private $factory;
private $tmpDir;
public function setup()
{
if (!class_exists('Zend\Diactoros\ServerRequestFactory')) {
$this->markTestSkipped('Zend Diactoros is not installed.');
}
$this->factory = new DiactorosFactory();
$this->tmpDir = sys_get_temp_dir();
}
public function testCreateRequest()
{
$stdClass = new \stdClass();
$request = new Request(
array(
'foo' => '1',
'bar' => array('baz' => '42'),
),
array(
'twitter' => array(
'@dunglas' => 'Kévin Dunglas',
'@coopTilleuls' => 'Les-Tilleuls.coop',
),
'baz' => '2',
),
array(
'a1' => $stdClass,
'a2' => array('foo' => 'bar'),
),
array(
'c1' => 'foo',
'c2' => array('c3' => 'bar'),
),
array(
'f1' => $this->createUploadedFile('F1', 'f1.txt', 'text/plain', UPLOAD_ERR_OK),
'foo' => array('f2' => $this->createUploadedFile('F2', 'f2.txt', 'text/plain', UPLOAD_ERR_OK)),
),
array(
'REQUEST_METHOD' => 'POST',
'HTTP_HOST' => 'dunglas.fr',
'HTTP_X_SYMFONY' => '2.8',
),
'Content'
);
$psrRequest = $this->factory->createRequest($request);
$this->assertEquals('Content', $psrRequest->getBody()->__toString());
$queryParams = $psrRequest->getQueryParams();
$this->assertEquals('1', $queryParams['foo']);
$this->assertEquals('42', $queryParams['bar']['baz']);
$parsedBody = $psrRequest->getParsedBody();
$this->assertEquals('Kévin Dunglas', $parsedBody['twitter']['@dunglas']);
$this->assertEquals('Les-Tilleuls.coop', $parsedBody['twitter']['@coopTilleuls']);
$this->assertEquals('2', $parsedBody['baz']);
$attributes = $psrRequest->getAttributes();
$this->assertEquals($stdClass, $attributes['a1']);
$this->assertEquals('bar', $attributes['a2']['foo']);
$cookies = $psrRequest->getCookieParams();
$this->assertEquals('foo', $cookies['c1']);
$this->assertEquals('bar', $cookies['c2']['c3']);
$uploadedFiles = $psrRequest->getUploadedFiles();
$this->assertEquals('F1', $uploadedFiles['f1']->getStream()->__toString());
$this->assertEquals('f1.txt', $uploadedFiles['f1']->getClientFilename());
$this->assertEquals('text/plain', $uploadedFiles['f1']->getClientMediaType());
$this->assertEquals(UPLOAD_ERR_OK, $uploadedFiles['f1']->getError());
$this->assertEquals('F2', $uploadedFiles['foo']['f2']->getStream()->__toString());
$this->assertEquals('f2.txt', $uploadedFiles['foo']['f2']->getClientFilename());
$this->assertEquals('text/plain', $uploadedFiles['foo']['f2']->getClientMediaType());
$this->assertEquals(UPLOAD_ERR_OK, $uploadedFiles['foo']['f2']->getError());
$serverParams = $psrRequest->getServerParams();
$this->assertEquals('POST', $serverParams['REQUEST_METHOD']);
$this->assertEquals('2.8', $serverParams['HTTP_X_SYMFONY']);
$this->assertEquals('POST', $psrRequest->getMethod());
$this->assertEquals(array('2.8'), $psrRequest->getHeader('X-Symfony'));
}
private function createUploadedFile($content, $originalName, $mimeType, $error)
{
$path = tempnam($this->tmpDir, uniqid());
file_put_contents($path, $content);
return new UploadedFile($path, $originalName, $mimeType, filesize($path), $error, true);
}
public function testCreateResponse()
{
$response = new Response(
'Response content.',
202,
array('X-Symfony' => array('2.8'))
);
$response->headers->setCookie(new Cookie('city', 'Lille', new \DateTime('Wed, 13 Jan 2021 22:23:01 GMT')));
$psrResponse = $this->factory->createResponse($response);
$this->assertEquals('Response content.', $psrResponse->getBody()->__toString());
$this->assertEquals(202, $psrResponse->getStatusCode());
$this->assertEquals(array('2.8'), $psrResponse->getHeader('X-Symfony'));
$this->assertEquals(array('city=Lille; expires=Wed, 13-Jan-2021 22:23:01 GMT; path=/; httponly'), $psrResponse->getHeader('Set-Cookie'));
}
public function testCreateResponseFromStreamed()
{
$response = new StreamedResponse(function () {
echo "Line 1\n";
flush();
echo "Line 2\n";
flush();
});
$psrResponse = $this->factory->createResponse($response);
$this->assertEquals("Line 1\nLine 2\n", $psrResponse->getBody()->__toString());
}
public function testCreateResponseFromBinaryFile()
{
$path = tempnam($this->tmpDir, uniqid());
file_put_contents($path, 'Binary');
$response = new BinaryFileResponse($path);
$psrResponse = $this->factory->createResponse($response);
$this->assertEquals('Binary', $psrResponse->getBody()->__toString());
}
}

View file

@ -0,0 +1,211 @@
<?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\Tests\Factory;
use Psr\Http\Message\UploadedFileInterface;
use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;
use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\Response;
use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\ServerRequest;
use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\Stream;
use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\UploadedFile;
/**
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class HttpFoundationFactoryTest extends \PHPUnit_Framework_TestCase
{
private $factory;
private $tmpDir;
public function setup()
{
$this->factory = new HttpFoundationFactory();
$this->tmpDir = sys_get_temp_dir();
}
public function testCreateRequest()
{
$stdClass = new \stdClass();
$serverRequest = new ServerRequest(
'1.1',
array(
'X-Dunglas-API-Platform' => '1.0',
'X-data' => array('a', 'b'),
),
new Stream('The body'),
'/about/kevin',
'GET',
'http://les-tilleuls.coop/about/kevin',
array('country' => 'France'),
array('city' => 'Lille'),
array('url' => 'http://les-tilleuls.coop'),
array(
'doc1' => $this->createUploadedFile('Doc 1', UPLOAD_ERR_OK, 'doc1.txt', 'text/plain'),
'nested' => array(
'docs' => array(
$this->createUploadedFile('Doc 2', UPLOAD_ERR_OK, 'doc2.txt', 'text/plain'),
$this->createUploadedFile('Doc 3', UPLOAD_ERR_OK, 'doc3.txt', 'text/plain'),
),
),
),
array('url' => 'http://dunglas.fr'),
array('custom' => $stdClass)
);
$symfonyRequest = $this->factory->createRequest($serverRequest);
$this->assertEquals('http://les-tilleuls.coop', $symfonyRequest->query->get('url'));
$this->assertEquals('doc1.txt', $symfonyRequest->files->get('doc1')->getClientOriginalName());
$this->assertEquals('doc2.txt', $symfonyRequest->files->get('nested[docs][0]', null, true)->getClientOriginalName());
$this->assertEquals('doc3.txt', $symfonyRequest->files->get('nested[docs][1]', null, true)->getClientOriginalName());
$this->assertEquals('http://dunglas.fr', $symfonyRequest->request->get('url'));
$this->assertEquals($stdClass, $symfonyRequest->attributes->get('custom'));
$this->assertEquals('Lille', $symfonyRequest->cookies->get('city'));
$this->assertEquals('France', $symfonyRequest->server->get('country'));
$this->assertEquals('The body', $symfonyRequest->getContent());
$this->assertEquals('1.0', $symfonyRequest->headers->get('X-Dunglas-API-Platform'));
$this->assertEquals(array('a', 'b'), $symfonyRequest->headers->get('X-data', null, false));
}
public function testCreateRequestWithNullParsedBody()
{
$serverRequest = new ServerRequest(
'1.1',
array(),
new Stream(),
'/',
'GET',
null,
array(),
array(),
array(),
array(),
null,
array()
);
$this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
}
public function testCreateRequestWithObjectParsedBody()
{
$serverRequest = new ServerRequest(
'1.1',
array(),
new Stream(),
'/',
'GET',
null,
array(),
array(),
array(),
array(),
new \stdClass(),
array()
);
$this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
}
public function testCreateUploadedFile()
{
$uploadedFile = $this->createUploadedFile('An uploaded file.', UPLOAD_ERR_OK, 'myfile.txt', 'text/plain');
$symfonyUploadedFile = $this->callCreateUploadedFile($uploadedFile);
$uniqid = uniqid();
$symfonyUploadedFile->move($this->tmpDir, $uniqid);
$this->assertEquals($uploadedFile->getSize(), $symfonyUploadedFile->getClientSize());
$this->assertEquals(UPLOAD_ERR_OK, $symfonyUploadedFile->getError());
$this->assertEquals('myfile.txt', $symfonyUploadedFile->getClientOriginalName());
$this->assertEquals('txt', $symfonyUploadedFile->getClientOriginalExtension());
$this->assertEquals('text/plain', $symfonyUploadedFile->getClientMimeType());
$this->assertEquals('An uploaded file.', file_get_contents($this->tmpDir.'/'.$uniqid));
}
/**
* @expectedException \Symfony\Component\HttpFoundation\File\Exception\FileException
* @expectedExceptionMessage The file "e" could not be written on disk.
*/
public function testCreateUploadedFileWithError()
{
$uploadedFile = $this->createUploadedFile('Error.', UPLOAD_ERR_CANT_WRITE, 'e', 'text/plain');
$symfonyUploadedFile = $this->callCreateUploadedFile($uploadedFile);
$this->assertEquals(UPLOAD_ERR_CANT_WRITE, $symfonyUploadedFile->getError());
$symfonyUploadedFile->move($this->tmpDir, 'shouldFail.txt');
}
private function createUploadedFile($content, $error, $clientFileName, $clientMediaType)
{
$filePath = tempnam($this->tmpDir, uniqid());
file_put_contents($filePath, $content);
return new UploadedFile($filePath, filesize($filePath), $error, $clientFileName, $clientMediaType);
}
private function callCreateUploadedFile(UploadedFileInterface $uploadedFile)
{
$reflection = new \ReflectionClass($this->factory);
$createUploadedFile = $reflection->getMethod('createUploadedFile');
$createUploadedFile->setAccessible(true);
return $createUploadedFile->invokeArgs($this->factory, array($uploadedFile));
}
public function testCreateResponse()
{
$response = new Response(
'1.0',
array(
'X-Symfony' => array('2.8'),
'Set-Cookie' => array(
'theme=light',
'test',
'ABC=AeD; Domain=dunglas.fr; Path=/kevin; Expires=Wed, 13 Jan 2021 22:23:01 GMT; Secure; HttpOnly',
),
),
new Stream('The response body'),
200
);
$symfonyResponse = $this->factory->createResponse($response);
$this->assertEquals('1.0', $symfonyResponse->getProtocolVersion());
$this->assertEquals('2.8', $symfonyResponse->headers->get('X-Symfony'));
$cookies = $symfonyResponse->headers->getCookies();
$this->assertEquals('theme', $cookies[0]->getName());
$this->assertEquals('light', $cookies[0]->getValue());
$this->assertEquals(0, $cookies[0]->getExpiresTime());
$this->assertNull($cookies[0]->getDomain());
$this->assertEquals('/', $cookies[0]->getPath());
$this->assertFalse($cookies[0]->isSecure());
$this->assertFalse($cookies[0]->isHttpOnly());
$this->assertEquals('test', $cookies[1]->getName());
$this->assertNull($cookies[1]->getValue());
$this->assertEquals('ABC', $cookies[2]->getName());
$this->assertEquals('AeD', $cookies[2]->getValue());
$this->assertEquals(strtotime('Wed, 13 Jan 2021 22:23:01 GMT'), $cookies[2]->getExpiresTime());
$this->assertEquals('dunglas.fr', $cookies[2]->getDomain());
$this->assertEquals('/kevin', $cookies[2]->getPath());
$this->assertTrue($cookies[2]->isSecure());
$this->assertTrue($cookies[2]->isHttpOnly());
$this->assertEquals('The response body', $symfonyResponse->getContent());
$this->assertEquals(200, $symfonyResponse->getStatusCode());
}
}

View file

@ -0,0 +1,89 @@
<?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\Tests\Fixtures;
use Psr\Http\Message\MessageInterface;
use Psr\Http\Message\StreamInterface;
/**
* Message.
*
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class Message implements MessageInterface
{
private $version = '1.1';
private $headers = array();
private $body;
public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null)
{
$this->version = $version;
$this->headers = $headers;
$this->body = null === $body ? new Stream() : $body;
}
public function getProtocolVersion()
{
return $this->version;
}
public function withProtocolVersion($version)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getHeaders()
{
return $this->headers;
}
public function hasHeader($name)
{
return isset($this->headers[$name]);
}
public function getHeader($name)
{
return $this->hasHeader($name) ? $this->headers[$name] : array();
}
public function getHeaderLine($name)
{
return $this->hasHeader($name) ? implode(',', $this->headers[$name]) : '';
}
public function withHeader($name, $value)
{
throw new \BadMethodCallException('Not implemented.');
}
public function withAddedHeader($name, $value)
{
throw new \BadMethodCallException('Not implemented.');
}
public function withoutHeader($name)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getBody()
{
return $this->body;
}
public function withBody(StreamInterface $body)
{
throw new \BadMethodCallException('Not implemented.');
}
}

View file

@ -0,0 +1,45 @@
<?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\Tests\Fixtures;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
/**
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class Response extends Message implements ResponseInterface
{
private $statusCode;
public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null, $statusCode = 200)
{
parent::__construct($version, $headers, $body);
$this->statusCode = $statusCode;
}
public function getStatusCode()
{
return $this->statusCode;
}
public function withStatus($code, $reasonPhrase = '')
{
throw new \BadMethodCallException('Not implemented.');
}
public function getReasonPhrase()
{
throw new \BadMethodCallException('Not implemented.');
}
}

View file

@ -0,0 +1,141 @@
<?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\Tests\Fixtures;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Http\Message\UriInterface;
/**
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class ServerRequest extends Message implements ServerRequestInterface
{
private $requestTarget;
private $method;
private $uri;
private $server;
private $cookies;
private $query;
private $uploadedFiles;
private $data;
private $attributes;
public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null, $requestTarget = '/', $method = 'GET', $uri = null, array $server = array(), array $cookies = array(), array $query = array(), array $uploadedFiles = array(), $data = null, array $attributes = array())
{
parent::__construct($version, $headers, $body);
$this->requestTarget = $requestTarget;
$this->method = $method;
$this->uri = $uri;
$this->server = $server;
$this->cookies = $cookies;
$this->query = $query;
$this->uploadedFiles = $uploadedFiles;
$this->data = $data;
$this->attributes = $attributes;
}
public function getRequestTarget()
{
return $this->requestTarget;
}
public function withRequestTarget($requestTarget)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getMethod()
{
return $this->method;
}
public function withMethod($method)
{
}
public function getUri()
{
return $this->uri;
}
public function withUri(UriInterface $uri, $preserveHost = false)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getServerParams()
{
return $this->server;
}
public function getCookieParams()
{
return $this->cookies;
}
public function withCookieParams(array $cookies)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getQueryParams()
{
return $this->query;
}
public function withQueryParams(array $query)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getUploadedFiles()
{
return $this->uploadedFiles;
}
public function withUploadedFiles(array $uploadedFiles)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getParsedBody()
{
return $this->data;
}
public function withParsedBody($data)
{
throw new \BadMethodCallException('Not implemented.');
}
public function getAttributes()
{
return $this->attributes;
}
public function getAttribute($name, $default = null)
{
return isset($this->attributes[$name]) ? $this->attributes[$name] : $default;
}
public function withAttribute($name, $value)
{
throw new \BadMethodCallException('Not implemented.');
}
public function withoutAttribute($name)
{
throw new \BadMethodCallException('Not implemented.');
}
}

View file

@ -0,0 +1,95 @@
<?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\Tests\Fixtures;
use Psr\Http\Message\StreamInterface;
/**
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class Stream implements StreamInterface
{
private $stringContent;
public function __construct($stringContent = '')
{
$this->stringContent = $stringContent;
}
public function __toString()
{
return $this->stringContent;
}
public function close()
{
}
public function detach()
{
}
public function getSize()
{
}
public function tell()
{
return 0;
}
public function eof()
{
return true;
}
public function isSeekable()
{
return false;
}
public function seek($offset, $whence = SEEK_SET)
{
}
public function rewind()
{
}
public function isWritable()
{
return false;
}
public function write($string)
{
}
public function isReadable()
{
return true;
}
public function read($length)
{
return $this->stringContent;
}
public function getContents()
{
return $this->stringContent;
}
public function getMetadata($key = null)
{
}
}

View file

@ -0,0 +1,65 @@
<?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\Tests\Fixtures;
use Psr\Http\Message\UploadedFileInterface;
/**
* @author Kévin Dunglas <dunglas@gmail.com>
*/
class UploadedFile implements UploadedFileInterface
{
private $filePath;
private $size;
private $error;
private $clientFileName;
private $clientMediaType;
public function __construct($filePath, $size = null, $error = UPLOAD_ERR_OK, $clientFileName = null, $clientMediaType = null)
{
$this->filePath = $filePath;
$this->size = $size;
$this->error = $error;
$this->clientFileName = $clientFileName;
$this->clientMediaType = $clientMediaType;
}
public function getStream()
{
throw new \RuntimeException('No stream is available.');
}
public function moveTo($targetPath)
{
rename($this->filePath, $targetPath);
}
public function getSize()
{
return $this->size;
}
public function getError()
{
return $this->error;
}
public function getClientFilename()
{
return $this->clientFileName;
}
public function getClientMediaType()
{
return $this->clientMediaType;
}
}

View file

@ -0,0 +1,33 @@
{
"name": "symfony/psr-http-message-bridge",
"type": "symfony-bridge",
"description": "PSR HTTP message bridge",
"keywords": ["http", "psr-7", "http-message"],
"homepage": "http://symfony.com",
"license": "MIT",
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"require": {
"php": ">=5.3.3",
"psr/http-message": "~1.0",
"symfony/http-foundation": "~2.3|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"suggest": {
"zendframework/zend-diactoros": "To use the Zend Diactoros factory"
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" }
},
"minimum-stability": "dev"
}

View file

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="vendor/autoload.php"
>
<testsuites>
<testsuite name="Symfony PSR-7 HTTP message Bridge Test Suite">
<directory>./Tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>./</directory>
<exclude>
<directory>./Resources</directory>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
</filter>
</phpunit>