From 9efcc24cdd896a6645a48f311de1818c7b542e77 Mon Sep 17 00:00:00 2001 From: Guilhem N Date: Wed, 30 Nov 2016 16:52:13 +0100 Subject: [PATCH] Use PHP-CS-FIXER 2.0 --- .gitignore | 2 ++ .php_cs | 27 -------------------------- .php_cs.dist | 25 ++++++++++++++++++++++++ Tests/Describer/RouteDescriberTest.php | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 .php_cs create mode 100644 .php_cs.dist diff --git a/.gitignore b/.gitignore index d924569..de1143f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ /vendor/ +/composer.phar /composer.lock /.php_cs.cache +/.php_cs /phpunit.xml /Tests/Functional/cache /Tests/Functional/logs diff --git a/.php_cs b/.php_cs deleted file mode 100644 index d8a7553..0000000 --- a/.php_cs +++ /dev/null @@ -1,27 +0,0 @@ -in(__DIR__) -; - -$header = <<level(FixerInterface::SYMFONY_LEVEL) - ->fixers(['header_comment', 'short_array_syntax']) - ->finder($finder) - ->setUsingCache(true) -; diff --git a/.php_cs.dist b/.php_cs.dist new file mode 100644 index 0000000..88ba9fc --- /dev/null +++ b/.php_cs.dist @@ -0,0 +1,25 @@ +in(__DIR__) + ->exclude('tests/Fixtures/app/cache') +; + +return PhpCsFixer\Config::create() + ->setRules([ + '@Symfony' => true, + 'ordered_imports' => true, + 'phpdoc_order' => true, + 'header_comment' => [ + 'header' => <<setFinder($finder) +; diff --git a/Tests/Describer/RouteDescriberTest.php b/Tests/Describer/RouteDescriberTest.php index 8b5b6b0..08e9236 100644 --- a/Tests/Describer/RouteDescriberTest.php +++ b/Tests/Describer/RouteDescriberTest.php @@ -13,11 +13,11 @@ namespace EXSyst\Bundle\ApiDocBundle\Tests\Describer; use EXSyst\Bundle\ApiDocBundle\Describer\RouteDescriber; use EXSyst\Bundle\ApiDocBundle\RouteDescriber\RouteDescriberInterface; +use EXSyst\Component\Swagger\Swagger; use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser; use Symfony\Component\DependencyInjection\Container; use Symfony\Component\Routing\Route; use Symfony\Component\Routing\RouteCollection; -use EXSyst\Component\Swagger\Swagger; class RouteDescriberTest extends AbstractDescriberTest {