Use kubawerlos/php-cs-fixer-config

kubawerlos · May 3, 2020 · e462418 · e462418
1 parent 259af3a
commit e462418
Show file tree

Hide file tree

Showing 16 changed files with 168 additions and 143 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# types checker
+# Types checker
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/kubawerlos/types-checker.svg)](https://packagist.org/packages/kubawerlos/types-checker)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/types-checker.svg)](https://php.net)

diff --git a/dev-tools/.php_cs b/dev-tools/.php_cs
@@ -2,9 +2,16 @@
 
 declare(strict_types=1);
 
-return PhpCsFixer\Config::create()
-    ->registerCustomFixers(new PhpCsFixerCustomFixers\Fixers())
-    ->setRiskyAllowed(true)
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+return PhpCsFixerConfig\Factory::createForLibrary('Types checker')
     ->setUsingCache(false)
     ->setFinder(
         PhpCsFixer\Finder::create()
@@ -16,138 +23,4 @@ return PhpCsFixer\Config::create()
                 __FILE__,
                 __DIR__ . '/../types-checker',
             ])
-    )
-    ->setRules([
-        '@PHP71Migration' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHPUnit60Migration:risky' => true,
-        '@Symfony' => true,
-        '@Symfony:risky' => true,
-        'align_multiline_comment' => [
-            'comment_type' => 'all_multiline',
-        ],
-        'array_indentation' => true,
-        'array_syntax' => [
-            'syntax' => 'short',
-        ],
-        'binary_operator_spaces' => true,
-        'class_attributes_separation' => ['elements' => ['method', 'property']],
-        'class_definition' => [
-            'multiLineExtendsEachSingleLine' => true,
-            'singleItemSingleLine' => true,
-        ],
-        'combine_consecutive_issets' => true,
-        'combine_consecutive_unsets' => true,
-        'comment_to_phpdoc' => true,
-        'compact_nullable_typehint' => true,
-        'concat_space' => [
-            'spacing' => 'one',
-        ],
-        'explicit_indirect_variable' => true,
-        'explicit_string_variable' => true,
-        'final_class' => true,
-        'final_internal_class' => true,
-        'final_public_method_for_abstract_class' => true,
-        'final_static_access' => true,
-        'fully_qualified_strict_types' => true,
-        'function_to_constant' => [
-            'functions' => ['get_class', 'get_called_class', 'php_sapi_name', 'phpversion', 'pi'],
-        ],
-        'heredoc_to_nowdoc' => true,
-        'increment_style' => [
-            'style' => 'post',
-        ],
-        'linebreak_after_opening_tag' => true,
-        'list_syntax' => [
-            'syntax' => 'long',
-        ],
-        'logical_operators' => true,
-        'method_argument_space' => [
-            'on_multiline' => 'ensure_fully_multiline',
-        ],
-        'method_chaining_indentation' => true,
-        'multiline_comment_opening_closing' => true,
-        'multiline_whitespace_before_semicolons' => true,
-        'native_function_invocation' => [
-            'include' => ['@all'],
-        ],
-        'no_alternative_syntax' => true,
-        'no_binary_string' => true,
-        'no_extra_blank_lines' => [
-            'tokens' => [
-                'continue',
-                'curly_brace_block',
-                'extra',
-                'parenthesis_brace_block',
-                'return',
-                'square_brace_block',
-                'throw',
-                'use',
-                'use_trait',
-            ],
-        ],
-        'no_null_property_initialization' => true,
-        'no_php4_constructor' => true,
-        'no_superfluous_elseif' => true,
-        'no_unreachable_default_argument_value' => true,
-        'no_unset_on_property' => true,
-        'no_useless_else' => true,
-        'no_useless_return' => true,
-        'ordered_class_elements' => true,
-        'ordered_imports' => [
-            'sortAlgorithm' => 'alpha',
-        ],
-        'php_unit_internal_class' => true,
-        'php_unit_ordered_covers' => true,
-        'php_unit_set_up_tear_down_visibility' => true,
-        'php_unit_strict' => true,
-        'php_unit_test_annotation' => true,
-        'php_unit_test_case_static_method_calls' => true,
-        'php_unit_test_class_requires_covers' => true,
-        'phpdoc_line_span' => ['property' => 'single'],
-        'phpdoc_order' => true,
-        'phpdoc_trim_consecutive_blank_line_separation' => true,
-        'phpdoc_types_order' => true,
-        'return_assignment' => true,
-        'static_lambda' => true,
-        'strict_comparison' => true,
-        'strict_param' => true,
-        'string_line_ending' => true,
-        'unary_operator_spaces' => false,
-        'visibility_required' => [
-            'elements' => [
-                'const',
-                'property',
-                'method',
-            ],
-        ],
-        'yoda_style' => [
-            'equal' => false,
-            'identical' => false,
-            'less_and_greater' => false,
-        ],
-    ] + \array_reduce(
-        \iterator_to_array(new PhpCsFixerCustomFixers\Fixers()),
-        static function (array $carry, PhpCsFixer\Fixer\DefinedFixerInterface $fixer): array {
-            if (!$fixer instanceof PhpCsFixer\Fixer\DeprecatedFixerInterface) {
-                $carry[$fixer->getName()] = true;
-            }
-
-            if ($fixer instanceof PhpCsFixerCustomFixers\Fixer\PhpdocOnlyAllowedAnnotationsFixer) {
-                $carry[$fixer->getName()] = ['elements' => [
-                    'covers',
-                    'coversNothing',
-                    'dataProvider',
-                    'deprecated',
-                    'internal',
-                    'param',
-                    'requires',
-                    'return',
-                    'var',
-                ]];
-            }
-
-            return $carry;
-        },
-        []
-    ));
+    );
diff --git a/dev-tools/composer.json b/dev-tools/composer.json
@@ -9,7 +9,8 @@
         "phpstan/phpstan": "^0.12.19",
         "phpstan/phpstan-strict-rules": "^0.12.2",
         "squizlabs/php_codesniffer": "^3.5.5",
-        "vimeo/psalm": "^3.11.2"
+        "vimeo/psalm": "^3.11.2",
+        "kubawerlos/php-cs-fixer-config": "dev-master"
     },
     "scripts": {
         "analyse": [

diff --git a/dev-tools/composer.lock b/dev-tools/composer.lock
diff --git a/src/Checker.php b/src/Checker.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace TypesChecker;
 
 use TypesChecker\Report\Report;

diff --git a/src/ClassCollector.php b/src/ClassCollector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace TypesChecker;
 
 use Symfony\Component\Finder\Finder;

diff --git a/src/Command/CheckCommand.php b/src/Command/CheckCommand.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace TypesChecker\Command;
 
 use Symfony\Component\Console\Command\Command as BaseCommand;

diff --git a/src/Report/ClassReport.php b/src/Report/ClassReport.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace TypesChecker\Report;
 
 final class ClassReport

diff --git a/src/Report/MethodReport.php b/src/Report/MethodReport.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace TypesChecker\Report;
 
 final class MethodReport

diff --git a/src/Report/Report.php b/src/Report/Report.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace TypesChecker\Report;
 
 final class Report

diff --git a/tests/CheckerTest.php b/tests/CheckerTest.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests;
 
 use PHPUnit\Framework\TestCase;

diff --git a/tests/ClassCollectorTest.php b/tests/ClassCollectorTest.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests;
 
 use PHPUnit\Framework\TestCase;

diff --git a/tests/Command/CheckCommandTest.php b/tests/Command/CheckCommandTest.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Types checker.
+ *
+ * (c) Kuba Werłos <werlos@gmail.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Command;
 
 use PHPUnit\Framework\TestCase;
@@ -51,7 +60,7 @@ public function testRunWithInvalidAutoloader(): void
     public function testRunWithUnknownClass(): void
     {
         $this->expectException(\Error::class);
-        $this->expectErrorMessage("Class 'HiddenPlace\UnknownClass' not found");
+        $this->expectErrorMessage("Class 'HiddenPlace\\UnknownClass' not found");
 
         $this->tester->run([
             'path' => [__DIR__ . '/../_stubs/ExtendingUnknownClass.php'],