csfixed

hiqdev · Dec 26, 2016 · 4554fdd · 4554fdd
1 parent 333717a
commit 4554fdd
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 55 deletions.
diff --git a/.php_cs b/.php_cs
@@ -9,47 +9,46 @@ Composer plugin for config assembling
 @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
 EOF;
 
-Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
-
-return Symfony\CS\Config\Config::create()
+return PhpCsFixer\Config::create()
     ->setUsingCache(true)
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers([
-        'header_comment',                        /// Add, replace or remove header comment
-        '-long_array_syntax',                    /// Arrays should use the long syntax
-        '-php4_constructor',                     /// Convert PHP4-style constructors to __construct. Warning! This could change code behavior
-        '-phpdoc_var_to_type',                   /// @var should always be written as @type
-        '-align_double_arrow',                   /// Align double arrow symbols in consecutive lines
-        '-unalign_double_arrow',                 /// Unalign double arrow symbols in consecutive lines
-        '-align_equals',                         /// Align equals symbols in consecutive lines
-        '-unalign_equals',                       /// Unalign equals symbols in consecutive lines
-        '-phpdoc_no_empty_return',               /// @return void and @return null annotations should be omitted from phpdocs
-        '-empty_return',                         /// A return statement wishing to return nothing should be simply "return"
-        '-blank_line_before_return',             /// n empty line feed should precede a return statement
-        '-phpdoc_align',                         /// All items of the @param, @throws, @return, @var, and @type phpdoc tags must be aligned vertically
-        '-phpdoc_params',                        /// All items of the @param, @throws, @return, @var, and @type phpdoc tags must be aligned vertically
-        '-phpdoc_scalar',                        /// Scalar types should always be written in the same form. "int", not "integer"; "bool", not "boolean"
-        '-phpdoc_separation',                    /// Annotations of a different type are separated by a single blank line
-        '-phpdoc_to_comment',                    /// Docblocks should only be used on structural elements
-        '-method_argument_space',                /// In method arguments and method call, there MUST NOT be a space before each comma and there MUST be one space after each comma
-        '-concat_without_spaces',                /// Concatenation should be used without spaces
-        'concat_with_spaces',                    /// Concatenation should be used with at least one whitespace around
-        'ereg_to_preg',                          /// Replace deprecated ereg regular expression functions with preg. Warning! This could change code behavior
-        'blank_line_after_opening_tag',          /// Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
-        'single_blank_line_before_namespace',    /// There should be no blank lines before a namespace declaration
-        'ordered_imports',                       /// Ordering use statements
-        'phpdoc_order',                          /// Annotations in phpdocs should be ordered so that @param come first, then @throws, then @return
-        'pre_increment',                         /// Pre incrementation/decrementation should be used if possible
-        'short_array_syntax',                    /// PHP arrays should use the PHP 5.4 short-syntax
-        'strict_comparison',                     /// Comparison should be strict. (Risky fixer!)
-        'strict_param',                          /// Functions should be used with $strict param. Warning! This could change code behavior
-        'no_multiline_whitespace_before_semicolons', /// Multi-line whitespace before closing semicolon are prohibited
-    ])
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@Symfony' => true,
+        'header_comment'                             =>  [
+            'header'        => $header,
+            'separate'      => 'bottom',
+            'location'      => 'after_declare_strict',
+            'commentType'   => 'PHPDoc',
+        ],
+        'binary_operator_spaces'                     =>  [
+            'align_double_arrow' => null,
+            'align_equals'       => null,
+        ],
+        'concat_space'                               =>  ['spacing' => 'one'],
+        'array_syntax'                               =>  ['syntax' => 'short'],
+        'empty_return'                               =>  false,
+        'blank_line_before_return'                   =>  false,
+        'phpdoc_align'                               =>  false,
+        'phpdoc_params'                              =>  false,
+        'phpdoc_scalar'                              =>  false,
+        'phpdoc_separation'                          =>  false,
+        'phpdoc_to_comment'                          =>  false,
+        'method_argument_space'                      =>  false,
+        'ereg_to_preg'                               =>  true,
+        'blank_line_after_opening_tag'               =>  true,
+        'single_blank_line_before_namespace'         =>  true,
+        'ordered_imports'                            =>  true,
+        'phpdoc_order'                               =>  true,
+        'pre_increment'                              =>  true,
+        'strict_comparison'                          =>  true,
+        'strict_param'                               =>  true,
+        'no_multiline_whitespace_before_semicolons'  =>  true,
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
             ->in(__DIR__)
             ->notPath('vendor')
             ->notPath('runtime')
             ->notPath('web/assets')
-    )
+        )
 ;
diff --git a/src/Builder.php b/src/Builder.php
@@ -1,6 +1,5 @@
 <?php
-
-/*
+/**
  * Composer plugin for config assembling
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
@@ -84,7 +83,7 @@ public function saveFiles()
 
     public static function rebuild($outputDir)
     {
-        $builder = new Builder([], $outputDir);
+        $builder = new self([], $outputDir);
         $builder->loadFiles();
         $builder->buildConfigs();
     }
@@ -109,7 +108,7 @@ public static function path($filename)
     }
 
     /**
-     * Builds configs by given files list
+     * Builds configs by given files list.
      * @param null|array $files files to process: config name => list of files
      */
     public function buildConfigs($files = null)

diff --git a/src/Helper.php b/src/Helper.php
@@ -1,6 +1,5 @@
 <?php
-
-/*
+/**
  * Composer plugin for config assembling
  *
  * @link      https://github.com/hiqdev/composer-config-plugin

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -1,6 +1,5 @@
 <?php
-
-/*
+/**
  * Composer plugin for config assembling
  *
  * @link      https://github.com/hiqdev/composer-config-plugin
@@ -14,8 +13,8 @@
 use Composer\Composer;
 use Composer\EventDispatcher\EventSubscriberInterface;
 use Composer\IO\IOInterface;
-use Composer\Package\PackageInterface;
 use Composer\Package\CompletePackageInterface;
+use Composer\Package\PackageInterface;
 use Composer\Package\RootPackageInterface;
 use Composer\Plugin\PluginInterface;
 use Composer\Script\Event;
@@ -220,8 +219,7 @@ public function preparePath(PackageInterface $package, $path)
         if (!$this->getFilesystem()->isAbsolutePath($path)) {
             $prefix = $package instanceof RootPackageInterface
                 ? $this->getBaseDir()
-                : $this->getVendorDir() . '/' . $package->getPrettyName()
-            ;
+                : $this->getVendorDir() . '/' . $package->getPrettyName();
             $path = $prefix . '/' . $path;
         }
 
@@ -257,7 +255,7 @@ public function getPackages()
     protected $plainList = [];
 
     /**
-     * Ordered list of package. Order @see findPackages
+     * Ordered list of package. Order @see findPackages.
      */
     protected $orderedList = [];
 
@@ -277,7 +275,7 @@ public function findPackages()
         $this->orderedList = [];
         $this->iteratePackage($root, true);
 
-        if ($this->io->isVerbose())  {
+        if ($this->io->isVerbose()) {
             $indent = ' - ';
             $packages = $indent . implode("\n$indent", $this->orderedList);
             $this->io->writeError($packages);

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
@@ -1,6 +1,5 @@
 <?php
-
-/*
+/**
  * Composer plugin for config assembling
  *
  * @link      https://github.com/hiqdev/composer-config-plugin

diff --git a/tests/unit/PluginTest.php b/tests/unit/PluginTest.php
@@ -1,6 +1,5 @@
 <?php
-
-/*
+/**
  * Composer plugin for config assembling
  *
  * @link      https://github.com/hiqdev/composer-config-plugin