diff --git a/.gitignore b/.gitignore
index 55ce5dd..2fb17b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 91%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index d741d39..e9b256a 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
@@ -17,8 +17,9 @@
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
-        PhpCsFixer\Finder::create()
+        (new PhpCsFixer\Finder())
             ->in(__DIR__)
+            ->exclude('vendor')
             ->name('*.php')
     )
 ;
diff --git a/Tests/Factory/PsrHttpFactoryTest.php b/Tests/Factory/PsrHttpFactoryTest.php
index 1923bf4..a1cd1b1 100644
--- a/Tests/Factory/PsrHttpFactoryTest.php
+++ b/Tests/Factory/PsrHttpFactoryTest.php
@@ -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;
diff --git a/Tests/Functional/CovertTest.php b/Tests/Functional/CovertTest.php
index 3d72b71..cf82f82 100644
--- a/Tests/Functional/CovertTest.php
+++ b/Tests/Functional/CovertTest.php
@@ -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());