Make CS fixer working again

Author: dunglas

src/SchemaOrgModel/TypesGenerator.php

@@ -11,6 +11,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\CS\Config\Config;
+use Symfony\CS\ConfigurationResolver;
 use Symfony\CS\Fixer;
 
 /**
@@ -374,6 +375,7 @@ public function generate($config)
 
             $path = sprintf('%s%s.php', $classDir, $className);
             $generatedFiles[] = $path;
+
             file_put_contents(
                 $path,
                 $this->twig->render('class.php.twig', [
@@ -708,20 +710,31 @@ private function namespaceToDir($config, $namespace)
      */
     private function fixCs(array $files)
     {
+        $config = new Config();
         $fixer = new Fixer();
         $fixer->registerBuiltInConfigs();
         $fixer->registerBuiltInFixers();
 
-        $config = new Config();
-        $config->fixers($fixer->getFixers());
+        $resolver = new ConfigurationResolver();
+        $resolver
+            ->setAllFixers($fixer->getFixers())
+            ->setConfig($config)
+            ->setOptions(array(
+                'level'     => 'symfony',
+                'fixers'    => null,
+                'progress'  => false,
+            ))
+            ->resolve()
+        ;
+
+        $config->fixers($resolver->getFixers());
 
         $finder = [];
         foreach ($files as $file) {
             $finder[] = new \SplFileInfo($file);
         }
 
         $config->finder(new \ArrayIterator($finder));
-
         $fixer->fix($config);
     }
 }

tests/run-tests.sh

@@ -14,5 +14,5 @@ bin/schema generate-types build/full/
 # Check code CS
 vendor/bin/php-cs-fixer --dry-run --diff -vvv fix src/
 
-# Check generated models' CS
+# Check CS of generated models CS
 vendor/bin/php-cs-fixer --dry-run --diff -vvv fix build/