Merge pull request #41 from matthieu88160/master

PHP cs fixer V2.0.0 compatibility
janephp · Dec 28, 2016 · 1c6d46c · 1c6d46c
2 parents 92072d3 + 372cfb6
commit 1c6d46c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
+dist: trusty
+
 language: php
 
 sudo: false
@@ -11,7 +13,7 @@ php:
     - 5.5
     - 5.6
     - 7.0
-    - hhvm
+    - hhvm-3.9
 
 env:
     global:

diff --git a/composer.json b/composer.json
@@ -36,15 +36,15 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.7",
-        "friendsofphp/php-cs-fixer": "v2.0.0-alpha",
+        "friendsofphp/php-cs-fixer": "v2.0@stable",
         "sllh/php-cs-fixer-styleci-bridge": "^2.1"
     },
-    "conflict": {
-        "friendsofphp/php-cs-fixer": "<2.0.0-alpha|>2.0.0-alpha"
-    },
     "suggest": {
         "friendsofphp/php-cs-fixer": "To have a nice formatting of the generated files"
     },
+    "config": {
+        "process-timeout": 1200
+    },
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"

diff --git a/src/JaneOpenApi.php b/src/JaneOpenApi.php
@@ -24,14 +24,15 @@
 use PhpCsFixer\Differ\NullDiffer;
 use PhpCsFixer\Error\ErrorsManager;
 use PhpCsFixer\Finder;
-use PhpCsFixer\Linter\NullLinter;
 use PhpCsFixer\Runner\Runner;
 use PhpParser\PrettyPrinter\Standard as StandardPrettyPrinter;
 use PhpParser\PrettyPrinterAbstract;
 use Symfony\Component\Serializer\Encoder\JsonDecode;
 use Symfony\Component\Serializer\Encoder\JsonEncode;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Serializer;
+use PhpCsFixer\Cache\NullCacheManager;
+use PhpCsFixer\Linter\Linter;
 
 class JaneOpenApi
 {
@@ -192,32 +193,35 @@ protected function fix($directory)
         if (null === $fixerConfig) {
             $fixerConfig = Config::create()
                 ->setRiskyAllowed(true)
-                ->setRules(array(
-                    '@Symfony' => true,
-                    'simplified_null_return' => false,
-                    'concat_without_spaces' => false,
-                    'double_arrow_multiline_whitespaces' => false,
-                    'unalign_equals' => false,
-                    'unalign_double_arrow' => false,
-                    'align_double_arrow' => true,
-                    'align_equals' => true,
-                    'concat_with_spaces' => true,
-                    'ordered_imports' => true,
-                    'phpdoc_order' => true,
-                    'short_array_syntax' => true,
-                ))
-            ;
-
-            $resolver = new ConfigurationResolver();
-            $resolver->setDefaultConfig($fixerConfig);
-            $resolver->resolve();
+                ->setRules(
+                    array(
+                        '@Symfony' => true,
+                        'array_syntax' => array('syntax' => 'short'),
+                        'simplified_null_return' => false,
+                        'ordered_imports' => true,
+                        'phpdoc_order' => true,
+                        'binary_operator_spaces' => array('align_equals'=>true),
+                        'concat_space' => false
+                    )
+                );
         }
+        $resolverOptions = array('allow-risky' => true);
+        $resolver = new ConfigurationResolver($fixerConfig, $resolverOptions, $directory);
 
         $finder = new Finder();
         $finder->in($directory);
-        $fixerConfig->finder($finder);
+        $fixerConfig->setFinder($finder);
 
-        $runner = new Runner($fixerConfig, new NullDiffer(), null, new ErrorsManager(), new NullLinter(), false);
+        $runner = new Runner(
+            $resolver->getConfig()->getFinder(),
+            $resolver->getFixers(),
+            new NullDiffer(),
+            null,
+            new ErrorsManager(),
+            new Linter(),
+            false,
+            new NullCacheManager()
+        );
 
         return $runner->fix();
     }

diff --git a/tests/JaneOpenApiResourceTest.php b/tests/JaneOpenApiResourceTest.php
@@ -3,7 +3,6 @@
 namespace Joli\Jane\OpenApi\Tests;
 
 use Joli\Jane\OpenApi\Command\GenerateCommand;
-use Joli\Jane\OpenApi\JaneOpenApi;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Filesystem\Filesystem;