Merge pull request #134 from overtrue/develop

2.0.0

Author: overtrue

.gitignore

@@ -2,4 +2,5 @@
 /vendor/
 composer.lock
 .php_cs.cache
-/coverage/
+/coverage/
+.phpunit.result.cache

.php_cs

@@ -1,7 +1,7 @@
 <?php
 
 $header = <<<EOF
-This file is part of the overtrue/laravel-follow.
+This file is part of the overtrue/laravel-follow
 
 (c) overtrue <[email protected]>
 
@@ -10,20 +10,27 @@ with this source code in the file LICENSE.
 EOF;
 
 return PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
-    ->setRules(array(
-        'header_comment' => array('header' => $header),
-        'array_syntax' => array('syntax' => 'short'),
-        'ordered_class_elements' => true,
-        'list_syntax' => array('syntax' => 'long'),
-        'ordered_imports' => true,
-        'php_unit_strict' => true,
-        'phpdoc_order' => true,
-        'strict_comparison' => true,
-        'strict_param' => true,
-    ))
+    ->setRules([
+        '@PSR2' => true,
+        'header_comment' => ['header' => $header],
+        'blank_line_after_opening_tag' => true,
+        'braces' => ['allow_single_line_closure' => true],
+        'compact_nullable_typehint' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => ['space' => 'none'],
+        'function_typehint_space' => true,
+        'new_with_braces' => true,
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
+        'no_empty_statement' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_whitespace_in_blank_line' => true,
+        'return_type_declaration' => ['space_before' => 'none'],
+        'single_trait_insert_per_statement' => true,
+    ])
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__.'/src')
+            ->exclude('vendor')
+            ->in([__DIR__.'/src/'])
     )
-;
+;