Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
vendor/
composer.lock
phpunit.xml
.php_cs.cache
.php-cs-fixer.cache
.php-cs-fixer.php
.phpunit.result.cache
/Tests/Fixtures/App/var
5 changes: 3 additions & 2 deletions .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
Expand All @@ -17,8 +17,9 @@
])
->setRiskyAllowed(true)
->setFinder(
PhpCsFixer\Finder::create()
(new PhpCsFixer\Finder())
->in(__DIR__)
->exclude('vendor')
->name('*.php')
)
;
2 changes: 1 addition & 1 deletion Tests/Factory/PsrHttpFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

namespace Symfony\Bridge\PsrHttpMessage\Tests\Factory;

use PHPUnit\Framework\TestCase;
use Nyholm\Psr7\Factory\Psr17Factory;
use PHPUnit\Framework\TestCase;
use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
Expand Down
2 changes: 1 addition & 1 deletion Tests/Functional/CovertTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function testConvertRequestMultipleTimes($request, $firstFactory, $second
$this->assertEquals((array) $request->getParsedBody(), (array) $finalRequest->getParsedBody());
$this->assertEquals($request->getQueryParams(), $finalRequest->getQueryParams());
// PSR7 does not define a "withServerParams" so this is impossible to implement without knowing the PSR7 implementation.
//$this->assertEquals($request->getServerParams(), $finalRequest->getServerParams());
// $this->assertEquals($request->getServerParams(), $finalRequest->getServerParams());
$this->assertEquals($request->getUploadedFiles(), $finalRequest->getUploadedFiles());
$this->assertEquals($request->getMethod(), $finalRequest->getMethod());
$this->assertEquals($request->getRequestTarget(), $finalRequest->getRequestTarget());
Expand Down