Merge branch 'main' into howl

1 files changed, 31 insertions, 9 deletions

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 6e89bee..45421de 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,18 +1,40 @@
 <?php
 
-# php84Packages.php-cs-fixer is currently installed.
-# The commented out options are because they don't work with 84.
-# I tried to install 85 but that installs an old version of cs that is not compatible with php85
-# At some point I can install CS 85.
+declare(strict_types=1);
 
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__);
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
 
-return (new PhpCsFixer\Config())
+$finder = Finder::create()
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+        __DIR__ . '/public',
+    ])
+    ->name('*.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return (new Config())
     ->setRules([
         '@PSR12' => true,
-#        'strict_param' => true,
+        'declare_strict_types' => true,
         'array_syntax' => ['syntax' => 'short'],
-#        'declare_strict_types' => true,
+        'single_quote' => true,
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
+        'no_unused_imports' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => ['arrays', 'arguments', 'parameters'],
+        ],
+        'no_superfluous_phpdoc_tags' => [
+            'remove_inheritdoc' => true,
+            'allow_mixed' => true,
+        ],
+        'strict_param' => true,
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline',
+        ],
+        'type_declaration_spaces' => true,
     ])
+    ->setRiskyAllowed(true)
     ->setFinder($finder);